Merge branch 'master' of ctpug.org.za:tabakrolletjie

[tabakrolletjie.git] / tabakrolletjie / scenes / day.py

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index aff92a61507cf45dec0191c6ca14bc635fc50b0a..017675432ce71828a012c7e015cd1f10c6125978 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -18,7 +18,7 @@ from ..utils import debug_timer, shadowed_text
 from ..loader import loader
 from ..transforms import Overlay, Alpha, ColourWedges
 
-from ..constants import SCREEN_SIZE, FONTS
+from ..constants import SCREEN_SIZE, FONTS, DEBUG
 from ..widgets import ImageButton
 from ..turnip import Turnip, TurnipInvalidPosition
 
@@ -81,11 +81,9 @@ class DayScene(BaseScene):
 
     def create_tools(self, gamestate):
         tools = []
-        x, y, step = 0, SCREEN_SIZE[1] - 40, 50
 
-        tools.append(ImageButton(
-            '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
-        x += step
+        x, y, step = 50, SCREEN_SIZE[1] - 40, 50
+
         tools.append(ImageButton('32', 'seed.png', name='seed', pos=(x, y)))
         x += step
 
@@ -97,6 +95,9 @@ class DayScene(BaseScene):
             tools.append(tool)
             x += step
 
+        tools.append(ImageButton(
+            '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
+
         tools.append(ImageButton(
             '32', 'night.png', name='start night',
             pos=(SCREEN_SIZE[0] - 100, y)))
@@ -211,7 +212,7 @@ class DayScene(BaseScene):
                 SceneChangeEvent.post(scene=MenuScene())
             elif ev.key == pgl.K_e:
                 self.end_day(gamestate)
-            elif ev.key == pgl.K_SPACE:
+            elif ev.key == pgl.K_SPACE and DEBUG:
                 self._paused = not self._paused
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if ev.button == 1: