Mercurial > boomslang

diff gamelib/gamescreen.py @ 512:b10dae40dc32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix items.
author Jeremy Thurgood <firxen@gmail.com>
date Sat, 04 Sep 2010 10:38:14 +0200
parents c72946d3a59a
children fda2b3a2f2e9
line wrap: on
line diff
--- a/gamelib/gamescreen.py	Sat Sep 04 09:53:00 2010 +0200
+++ b/gamelib/gamescreen.py	Sat Sep 04 10:38:14 2010 +0200
@@ -39,8 +39,8 @@
         item = self.state.inventory[item_no]
         if self.item_is_selected(item_no):
             self.unselect()
-        elif self.state.tool or hasattr(item, 'interact_without'):
-            result = item.interact(self.state.tool, self.state)
+        elif self.state.tool or item.is_interactive():
+            result = item.interact(self.state.tool)
             handle_result(result, self.state_widget)
         else:
             self.state.set_tool(self.state.inventory[item_no])