# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1283589494 -7200
# Node ID b10dae40dc3281252ae61a6c1161df053a7f1542
# Parent  93ddcac0b7725e32b221be7843719fff1553f03f
Fix items.

diff -r 93ddcac0b772 -r b10dae40dc32 gamelib/gamescreen.py
--- 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])
diff -r 93ddcac0b772 -r b10dae40dc32 gamelib/scenes/machine.py
--- a/gamelib/scenes/machine.py	Sat Sep 04 09:53:00 2010 +0200
+++ b/gamelib/scenes/machine.py	Sat Sep 04 10:38:14 2010 +0200
@@ -286,7 +286,7 @@
     INVENTORY_IMAGE = "manual.png"
     CURSOR = None
 
-    def interact_without(self, state):
+    def interact_without(self):
         return Result(detail_view='manual_detail')
 
 
diff -r 93ddcac0b772 -r b10dae40dc32 gamelib/state.py
--- a/gamelib/state.py	Sat Sep 04 09:53:00 2010 +0200
+++ b/gamelib/state.py	Sat Sep 04 10:38:14 2010 +0200
@@ -544,6 +544,9 @@
     def get_inverse_interact(self, tool):
         return getattr(tool, 'interact_with_' + self.tool_name, None)
 
+    def is_interactive(self):
+        return False
+
 
 class CloneableItem(Item):
     _counter = 0