Compute final member in course object.

[super-star-trek.git] / src / sst.py

diff --git a/src/sst.py b/src/sst.py
index 28203dd85152e9157e7ef95926f4bfe9aadba03c..6d2d8f56d9b4f9a70c3d76f90a082603d92c0476 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -3641,12 +3641,8 @@ def imove(course=None, novapush=False):
                     attack(torps_ok=False)
                 if game.alldone:
                     return
-            # compute final position -- new quadrant and sector 
-            x = (QUADSIZE*game.quadrant.i)+game.sector.i
-            y = (QUADSIZE*game.quadrant.j)+game.sector.j
-            w.i = int(round(x+QUADSIZE*course.distance*bigger*deltax))
-            w.j = int(round(y+QUADSIZE*course.distance*bigger*deltay))
             # check for edge of galaxy 
+            w = course.final
             kinks = 0
             while True:
                 kink = False
@@ -3940,7 +3936,7 @@ class course:
         bigger = max(abs(self.increment.i), abs(self.increment.j))
         self.increment /= bigger
         self.moves = int(round(10*self.distance*bigger))
-        self.final = self.location + distance*bigger*self.increment
+        self.final = (self.location + self.moves*self.increment).roundtogrid()
     def next(self, grain=1):
         "Next step on course."
         self.moves -=1