From 4f0083f24f608bf4627fdf0fd8629833116691db Mon Sep 17 00:00:00 2001
From: Alex Levenson <alexlevenson@laptop.org>
Date: Wed, 16 Jul 2008 19:50:38 +0000
Subject: Improved toolbar automation

---
(limited to 'tools.py')

diff --git a/tools.py b/tools.py
index 38b3cd6..01f3d83 100644
--- a/tools.py
+++ b/tools.py
@@ -45,7 +45,7 @@ class Tool(object):
             #    self.game.setTool("gear")
         elif event.type == USEREVENT:
             if hasattr(event,"action"):
-                if self.game.tools.has_key(event.action): self.game.setTool(event.action)
+                if self.game.toolList.has_key(event.action): self.game.setTool(event.action)
         elif event.type == MOUSEBUTTONDOWN and event.button == 1:
             self.game.canvas.grab_focus()
             handled = False
@@ -371,7 +371,7 @@ class JoystickTool(Tool):
         self.game = gameInstance
         self.name = "Joystick"
         self.vertices = None
-        self.joystickobject
+        #self.joystickobject
     def handleEvents(self,event):
         #look for default events, and if none are handled then try the custom events 
         if not super(JoystickTool,self).handleEvents(event):
--
cgit v0.9.1