Follow through on a command name change.

diff --git a/src/battle.c b/src/battle.c
index 78baae9eab970dbf4a127991fbf873c154c63937..223a981b094037ef038a5584f44999b1b7f12f73 100644 (file)
--- a/src/battle.c
+++ b/src/battle.c
@@ -839,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;

diff --git a/src/sst.c b/src/sst.c
index 64dcd3d0c1b093a7f593173c558d0adf723d8f34..8739ab8e52cc9db852fd4b47aae8e95d2cb51319 100644 (file)
--- a/src/sst.c
+++ b/src/sst.c
@@ -451,8 +451,8 @@ static void makemoves(void)
            if (game.ididit)
                hitme = true;
            break;
-       case TORPEDO:                   // photons
-           photon();
+       case TORPEDO:                   // photon torpedoes
+           torps();
            if (game.ididit)
                hitme = true;
            break;

diff --git a/src/sst.h b/src/sst.h
index 8c0203a495ad0b023171d7bc174c37097953051e..c8515efc5030cce48aaa6d966e2f1617ca29480c 100644 (file)
--- a/src/sst.h
+++ b/src/sst.h
@@ -335,7 +335,7 @@ extern void atover(bool);
 extern void srscan(void);
 extern void lrscan(void);
 extern void phasers(void);
-extern void photon(void);
+extern void torps(void);
 extern void warp(bool);
 extern void doshield(bool);
 extern void dock(bool);

diff --git a/src/sst.py b/src/sst.py
index cfdfe383e254b43119b4b57a5a74f9b2b407969d..a3455bfbf20e076b7c6439e1ecf5422cefadd0ec 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -1482,8 +1482,8 @@ def targetcheck(w):
        return None
     return delta.bearing()
 
-def photon():
-    "Launch photon torpedo."
+def torps():
+    "Launch photon torpedo salvo."
     course = []
     game.ididit = False
     if damaged(DPHOTON):
@@ -5898,8 +5898,8 @@ def makemoves():
            phasers()
            if game.ididit:
                hitme = True
-       elif cmd == "TORPEDO":          # photon torpedos
-           photon()
+       elif cmd in ("TORPEDO", "PHOTONS"):     # photon torpedos
+           torps()
            if game.ididit:
                hitme = True
        elif cmd == "MOVE":             # move under warp