X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=erdslangetjie%2F__main__.py;h=e408ac8204851dcb0ee40209e4a7c5adea5ab8be;hb=e17843c40a9493dc608961089ee70e75d515dcf7;hp=bc64f000d61c3b3177d48feaf389ccc16b19b3c3;hpb=2859fd8320d12da71ef1296fe9cf8e6e55598949;p=erdslangetjie.git

diff --git a/erdslangetjie/__main__.py b/erdslangetjie/__main__.py
index bc64f00..e408ac8 100644
--- a/erdslangetjie/__main__.py
+++ b/erdslangetjie/__main__.py
@@ -126,15 +126,28 @@ class GameWindow(RelativeLayout):
                 if true_point[0] >= self.view.size[0]:
                     self.view.scroll_x += self.x_scroll_margin
                     true_point = self.to_parent(*check_point)
+                    # Avoid an infinite loop that can happen we
+                    # changing screens
+                    if self.view.scroll_x > 0.99:
+                        return
                 elif true_point[0] < 0:
                     self.view.scroll_x -= self.x_scroll_margin
                     true_point = self.to_parent(*check_point)
+                    # See above
+                    if self.view.scroll_x < 0.01:
+                        return
                 elif true_point[1] >= self.view.size[1]:
                     self.view.scroll_y += self.y_scroll_margin
                     true_point = self.to_parent(*check_point)
+                    # See above
+                    if self.view.scroll_y > 0.99:
+                        return
                 elif true_point[1] < 0:
                     self.view.scroll_y -= self.y_scroll_margin
                     true_point = self.to_parent(*check_point)
+                    # See above
+                    if self.view.scroll_y < 0.01:
+                        return
 
     def included(self, point, margin):
         if point[0] < margin:
@@ -186,17 +199,20 @@ class GameWindow(RelativeLayout):
         # Do nothing on null moves
         if not self.player.move(direction, self.level_obj):
             return
-        self.check_state()
+        if self.check_state():
+            return
         self.do_nemesis_move()
 
     def do_nemesis_move(self):
         self.nemesis.move(self.level_obj, self.player.pos)
-        self.check_state()
+        if self.check_state():
+            return
         if self.move_counter > 4:
             self.move_counter = 0
             self.draw_nemesis()
             self.nemesis.move(self.level_obj, self.player.pos)
-            self.check_state()
+            if self.check_state():
+                return
         else:
             self.move_counter += 1
         self.draw_nemesis()
@@ -249,7 +265,7 @@ class GameWindow(RelativeLayout):
 
     def check_state(self):
         if not self.level_obj:
-            return
+            return True
         if self.level_obj.at_exit(self.player.pos):
             self.reset_level()
             # Jump to next level
@@ -257,7 +273,7 @@ class GameWindow(RelativeLayout):
             if not self.load_level():
                 self._closed()
                 self.app.game_over(True)
-            return
+            return True
         elif self.check_caught():
             # Caught
             if self.app.config.getdefault('bane', 'sound', '0') != '0':
@@ -265,7 +281,7 @@ class GameWindow(RelativeLayout):
             self.reset_level()
             self._closed()
             self.app.game_over(False)
-            return
+            return True
         elif self.level_obj.is_button(self.player.pos):
             self.level_obj.trigger_button(self.player.pos)
         elif self.level_obj.is_button(self.nemesis.pos):
@@ -273,6 +289,7 @@ class GameWindow(RelativeLayout):
         for map_pos, new_tile in self.level_obj.get_changed_tiles():
             pos = (map_pos[0] * TILE_SIZE, map_pos[1] * TILE_SIZE)
             self.draw_tile(pos, new_tile)
+        return False
 
     def _calc_mouse_pos(self, pos):
         pos = self.to_local(*pos)