Another rollup patch.

[super-star-trek.git] / src / moving.c

diff --git a/src/moving.c b/src/moving.c
index 948cdb40c73402a78f68940cda09899fae906876..8495cd0d1063b2576e1bc4905891327e038ba130 100644 (file)
--- a/src/moving.c
+++ b/src/moving.c
@@ -219,7 +219,7 @@ void dock(bool verbose)
        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;
@@ -793,7 +793,7 @@ void timwrp()
        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! */
@@ -973,7 +973,6 @@ void mayday(void)
     /* 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;
@@ -987,7 +986,7 @@ void mayday(void)
            break;
        }
     }
-    if (game.sector.x==0){
+    if (!is_valid(game.sector)){
        prout(_("You have been lost in space..."));
        finish(FMATERIALIZE);
        return;
@@ -1083,7 +1082,7 @@ void abandn(void)
            return;
        }
        if (game.landed) {
-           prout(_("You must be aboard the Enterprise."));
+           prout(_("You must be aboard the ship."));
            return;
        }
        if (game.iscraft != onship) {
@@ -1111,7 +1110,8 @@ void abandn(void)
            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;
        }