From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 14 Sep 2010 20:59:01 +0000 (+0000)
Subject: Follow through on a command name change.
X-Git-Tag: 2.0~34
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=6e10945fffe610c696959c102ca4ee0344e50df4;p=super-star-trek.git

Follow through on a command name change.
---

diff --git a/src/battle.c b/src/battle.c
index 78baae9..223a981 100644
--- 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 64dcd3d..8739ab8 100644
--- 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 8c0203a..c8515ef 100644
--- 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 cfdfe38..a3455bf 100644
--- 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