Another rollup patch.

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

diff --git a/src/moving.c b/src/moving.c
index 63a51c7e485dd2f9519fe9960e1916f0fed48735..f8965c2d05d2da94afaeb6407784ef23dedf1a7d 100644 (file)
--- a/src/moving.c
+++ b/src/moving.c
@@ -325,7 +325,7 @@ static void getcd(bool isprobe, int akey)
                prout(_("(Manual navigation assumed.)"));
            else
                prout(_("(Manual movement assumed.)"));
-           navmode = automatic;
+           navmode = manual;
            break;
        }
     }
@@ -793,7 +793,7 @@ void atover(bool igrab)
     } while 
        /* Repeat if another snova */
        (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova);
-    if (KLINGREM==0) 
+    if ((game.state.remkl + game.state.remcom + game.state.nscrem)==0) 
        finish(FWON); /* Snova killed remaining enemy. */
 }
 
@@ -1139,8 +1139,8 @@ void abandon(void)
            prout(_("Remainder of ship's complement beam down"));
            prout(_("to nearest habitable planet."));
        } else if (q->planet != NOPLANET && !damaged(DTRANSP)) {
-           prout(_("Remainder of ship's complement beam down"));
-           prout(_("to %s."), systnames[q->planet]);
+           prout(_("Remainder of ship's complement beam down to %s."),
+                   systnames[q->planet]);
        } else {
            prout(_("Entire crew of %d left to die in outer space."),
                    game.state.crew);