diff gamelib/state.py @ 491:9f488671c02e engine_refactor

No more state in Item interacts.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 29 Aug 2010 19:58:35 +0200
parents 2e784f978d1a
children c1f4f9149349
line wrap: on
line diff
--- a/gamelib/state.py	Sun Aug 29 15:15:59 2010 +0200
+++ b/gamelib/state.py	Sun Aug 29 19:58:35 2010 +0200
@@ -532,20 +532,17 @@
     def get_inventory_image(self):
         return self.inventory_image
 
-    def interact(self, tool, state):
+    def interact(self, tool):
         if tool is None:
             return self.interact_without(state)
         handler = getattr(self, 'interact_with_' + tool.name, None)
         inverse_handler = getattr(tool, 'interact_with_' + self.tool_name, None)
         if handler is not None:
-            return handler(tool, state)
+            return handler(tool)
         elif inverse_handler is not None:
-            return inverse_handler(self, state)
+            return inverse_handler(self)
         else:
-            return self.interact_default(tool, state)
-
-    def interact_default(self, tool, state):
-        return Result("That doesn't do anything useful")
+            return self.interact_default(tool)
 
 
 class CloneableItem(Item):