Fix a rather basic error in vector comparisons.

diff --git a/src/sst.py b/src/sst.py
index df17ca7375165187c51d6df557c9e433c80bfef1..47c50d9d8191cc5d0037c67ecb15ab12db2b1646 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -240,7 +240,7 @@ class coord:
     def is_valid(self):
         return self.x != None and self.y != None
     def __eq__(self, other):
     def is_valid(self):
         return self.x != None and self.y != None
     def __eq__(self, other):

-        return other != None and self.x == other.y and self.x == other.y
+        return other != None and self.x == other.y and self.y == other.y

     def __add__(self, other):
         return coord(self.x+other.x, self.y+other.y)
     def __sub__(self, other):
     def __add__(self, other):
         return coord(self.x+other.x, self.y+other.y)
     def __sub__(self, other):


@@ -1734,8 +1734,8 @@ def targetcheck(w):
        return None
     delta = coord()
     # FIXME: C code this was translated from is wacky -- why the sign reversal?
        return None
     delta = coord()
     # FIXME: C code this was translated from is wacky -- why the sign reversal?

-    delta.y = 0.1*(w.y - game.sector.y);
-    delta.x = 0.1*(game.sector.x - w.x);
+    delta.y = (w.y - game.sector.y);
+    delta.x = (game.sector.x - w.x);

     if delta == coord(0, 0):
        skip(1)
        prout(_("Spock-  \"Bridge to sickbay.  Dr. McCoy,"))
     if delta == coord(0, 0):
        skip(1)
        prout(_("Spock-  \"Bridge to sickbay.  Dr. McCoy,"))