Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Levenson <alexlevenson@laptop.org>2008-07-16 18:20:45 (GMT)
committer Alex Levenson <alexlevenson@laptop.org>2008-07-16 18:20:45 (GMT)
commitf5a0989c9088be56c9384c2e896a0d2c184065ac (patch)
tree8eb7167555df9d571e2e5cad7b06ca72003e3c91
parent3ecb4b7ee5476681cdcc8c787fb89f78646b64bb (diff)
parentbab8c1c8d3cb68c03cd8e618811f32ea866bfcaa (diff)
Merge branch 'master' of git+ssh://alevenson@dev.laptop.org/git/activities/physics
-rw-r--r--tools.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools.py b/tools.py
index 7befaa6..6df93c7 100644
--- a/tools.py
+++ b/tools.py
@@ -40,8 +40,8 @@ class Tool(object):
self.game.setTool("destroy")
elif event.key == K_m:
self.game.setTool("magicpen")
- elif event.key == K_g:
- self.game.setTool("gear")
+ #elif event.key == K_g:
+ # 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)
@@ -399,4 +399,4 @@ def list_local_classes():
return [val for val in this_mod.__dict__.values()
if isinstance(val, type)]
-local_classes = list_local_classes() \ No newline at end of file
+local_classes = list_local_classes()