Follow through on a command name change.

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

diff --git a/src/battle.c b/src/battle.c
index 7068553602ed88833a498e3fd0a89af1aa886aa2..223a981b094037ef038a5584f44999b1b7f12f73 100644 (file)
--- a/src/battle.c
+++ b/src/battle.c
@@ -240,7 +240,7 @@ void ram(bool ibumpd, feature ienm, coord w)
     game.shldup = false;
     prout(_("***Shields are down."));
     if (game.state.remkl + game.state.remcom + game.state.nscrem) {
-       pause_game(true);
+       announce();
        damagereport();
     }
     else
@@ -792,7 +792,8 @@ void deadkl(coord w, feature type, coord mv)
     if ((game.state.remkl + game.state.remcom + game.state.nscrem)==0)
        return;
 
-    game.state.remtime = game.state.remres/(game.state.remkl + 4*game.state.remcom);
+    game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+           game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;
 
     /* Remove enemy ship from arrays describing local conditions */
     if (is_scheduled(FCDBAS) && same(game.battle, game.quadrant) && type==IHC)
@@ -838,8 +839,8 @@ static bool targetcheck(double x, double y, double *course)
     return false;
 }
 
-void photon(void) 
-/* launch photon torpedo */
+void torps(void) 
+/* launch photon torpedo salvo */
 {
     double targ[4][3], course[4];
     double r, dummy;