# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1329228133 -7200
# Node ID b773e9f42ba3fc03bcbaa7cbdd46688e25fc302c
# Parent  20f65f716048961201946bc12a7c28c4a7f3eb9a
Better tool/detail canceling.

diff -r 20f65f716048 -r b773e9f42ba3 pyntnclick/gamescreen.py
--- a/pyntnclick/gamescreen.py	Tue Feb 14 16:27:49 2012 +0200
+++ b/pyntnclick/gamescreen.py	Tue Feb 14 16:02:13 2012 +0200
@@ -132,7 +132,7 @@
 
     def mouse_down(self, event, widget):
         if event.button != 1:
-            self.game.cancel_doodah(self.screen)
+            self.game.set_tool(None)
 
     def select(self, tool):
         self.game.set_tool(tool)
@@ -175,7 +175,10 @@
     def mouse_down(self, event, widget):
         self.mouse_move(event, widget)
         if event.button != 1:  # We have a right/middle click
-            self.game.cancel_doodah(self.screen)
+            if self.game.tool:
+                self.game.set_tool(None)
+            elif self.is_detail:
+                self.close(event, widget)
         else:
             pos = self.global_to_local(event.pos)
             result = self.scene.interact(self.game.tool, pos)
@@ -275,7 +278,6 @@
             ToolBar((0, rect.height), self.gd, self))
         self.inventory = self.toolbar.inventory
 
-        self.game.change_scene
         self.gd.running = True
 
     def game_event_inventory(self, data):
diff -r 20f65f716048 -r b773e9f42ba3 pyntnclick/state.py
--- a/pyntnclick/state.py	Tue Feb 14 16:27:49 2012 +0200
+++ b/pyntnclick/state.py	Tue Feb 14 16:02:13 2012 +0200
@@ -173,15 +173,6 @@
     def set_tool(self, item):
         self.tool = item
 
-    def cancel_doodah(self, screen):
-        if self.tool:
-            self.set_tool(None)
-        
-        # XXX: Needs to be tweaked to work with the new
-        # scene stuff
-        #elif self.current_detail:
-        #    screen.state_widget.clear_detail()
-
     def animate(self):
         if not self.do_check:
             return self.current_scene.animate()