X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.py;h=a3455bfbf20e076b7c6439e1ecf5422cefadd0ec;hp=fe29b948d11870230dff7c043789bc50e9474b44;hb=4d9c5a57b2a16c3c4bc54ab3f897f79101337eb5;hpb=8daf76bb73f4194657e8c215f542a14ea162eeda

diff --git a/src/sst.py b/src/sst.py
index fe29b94..a3455bf 100644
--- a/src/sst.py
+++ b/src/sst.py
@@ -13,8 +13,7 @@ ion how to modify (and how not to modify!) this code.
 """
 import os, sys, math, curses, time, readline, cPickle, random, copy, gettext, getpass
 
-SSTDOC  	= "/usr/share/doc/sst/sst.doc"
-DOC_NAME	= "sst.doc"
+docpath  	= (".", "../doc", "/usr/share/doc/sst")
 
 def _(str): return gettext.gettext(str)
 
@@ -1483,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):
@@ -5812,7 +5811,7 @@ def helpme():
 	setwnd(message_window)
 	if key == "IHEOL":
 	    return
-        if scanner.token in commands or scanner.token == "ABBREV":
+        if scanner.token.upper() in commands or scanner.token == "ABBREV":
 	    break
 	skip(1)
 	listCommands()
@@ -5820,22 +5819,20 @@ def helpme():
 	scanner.chew()
 	skip(1)
     cmd = scanner.token.upper()
-    try:
-        fp = open(SSTDOC, "r")
-    except IOError:
+    for directory in docpath:
         try:
-            fp = open(DOC_NAME, "r")
+            fp = open(os.path.join(directory, "sst.doc"), "r")
+            break
         except IOError:
-            prout(_("Spock-  \"Captain, that information is missing from the"))
-            proutn(_("   computer. You need to find "))
-            proutn(DOC_NAME)
-            prout(_(" and put it in the"))
-            proutn(_("   current directory or to "))
-            proutn(SSTDOC)
-            prout(".\"")
-            # This used to continue: "You need to find SST.DOC and put 
-            # it in the current directory."
-            return
+            pass
+    else:
+        prout(_("Spock-  \"Captain, that information is missing from the"))
+        prout(_("   computer. You need to find sst.doc and put it somewhere"))
+        proutn(_("   in these directories: %s") % ":".join(docpath))
+        prout(".\"")
+        # This used to continue: "You need to find SST.DOC and put 
+        # it in the current directory."
+        return
     while True:
         linebuf = fp.readline()
 	if linebuf == '':
@@ -5844,12 +5841,13 @@ def helpme():
 	    return
 	if linebuf[0] == '%' and linebuf[1] == '%' and linebuf[2] == ' ':
             linebuf = linebuf[3:].strip()
-            if cmd == linebuf:
+            if cmd.upper() == linebuf:
 		break
     skip(1)
     prout(_("Spock- \"Captain, I've found the following information:\""))
     skip(1)
-    while linebuf in fp:
+    while True:
+        linebuf = fp.readline()
         if "******" in linebuf:
 	    break
 	proutn(linebuf)
@@ -5900,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