prout(_("You must first leave standard orbit."));
return;
}
- if (game.base.x==0 || abs(game.sector.x-game.base.x) > 1 || abs(game.sector.y-game.base.y) > 1) {
+ if (!is_valid(game.base) || abs(game.sector.x-game.base.x) > 1 || abs(game.sector.y-game.base.y) > 1) {
crmshp();
prout(_(" not adjacent to base."));
return;
game.isatb = 0;
unschedule(FCDBAS);
unschedule(FSCDBAS);
- game.battle.x = game.battle.y = 0;
+ invalidate(game.battle);
/* Make sure Galileo is consistant -- Snapshot may have been taken
when on planet, which would give us two Galileos! */
/* dematerialize starship */
game.quad[game.sector.x][game.sector.y]=IHDOT;
proutn(_("Starbase in %s responds--"), cramlc(quadrant, game.quadrant));
- proutn("");
crmshp();
prout(_(" dematerializes."));
game.sector.x=0;
break;
}
}
- if (game.sector.x==0){
+ if (!is_valid(game.sector)){
prout(_("You have been lost in space..."));
finish(FMATERIALIZE);
return;
return;
}
if (game.landed) {
- prout(_("You must be aboard the Enterprise."));
+ prout(_("You must be aboard the ship."));
return;
}
if (game.iscraft != onship) {
prout(_("Remainder of ship's complement beam down"));
prout(_("to %s."), systnames[q->planet]);
} else {
- prout(_("Entire crew of %d left to die in outer space."));
+ prout(_("Entire crew of %d left to die in outer space."),
+ game.state.crew);
game.casual += game.state.crew;
game.abandoned += game.state.crew;
}