From 11639f15f78cc19cb11d95713ef5d6454c391afc Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 16 Oct 2006 12:39:48 +0000
Subject: [PATCH] Prevent torpedo wraparound.

---
 src/sst.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/sst.py b/src/sst.py
index d635983..87a057d 100644
--- a/src/sst.py
+++ b/src/sst.py
@@ -1276,7 +1276,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
     # Loop to move a single torpedo 
     setwnd(message_window)
     for step in range(1, QUADSIZE*2):
-	track.next()
+        if not track.next(): break
         w = track.sector()
 	if not w.valid_sector():
 	    break
@@ -2449,7 +2449,7 @@ def events():
 		supercommander()
 	elif evcode == FDSPROB: # Move deep space probe 
 	    schedule(FDSPROB, 0.01)
-            if game.probe.next(grain=QUADSIZE):
+            if not game.probe.next():
 		if not game.probe.quadrant().valid_quadrant() or \
 		    game.state.galaxy[game.probe.quadrant().i][game.probe.quadrant().j].supernova:
 		    # Left galaxy or ran into supernova
@@ -3927,17 +3927,13 @@ class course:
         self.step = 0
     def arrived(self):
         return self.location.roundtogrid() == self.final
-    def next(self, grain=1):
+    def next(self):
         "Next step on course."
         self.step += 1
         self.nextlocation = self.location + self.increment
-        oldloc = (self.location/grain).roundtogrid()
-        newloc = (self.nextlocation/grain).roundtogrid()
+        samequad = (self.location.quadrant() == self.nextlocation.quadrant())
         self.location = self.nextlocation
-        if newloc != oldloc:
-            return True
-        else:
-            return False
+        return samequad
     def quadrant(self):
         return self.location.quadrant()
     def sector(self):
-- 
2.31.1