Mercurial > pyntnclick

changeset 472:cab67fd696b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix crash bug on the bridge. (JIM's panel really doesn't like items.)
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 29 Aug 2010 03:51:23 +0200
parents ee10f8300290
children 3032cfe783cf
files gamelib/scenes/bridge.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/scenes/bridge.py	Sun Aug 29 02:07:37 2010 +0200
+++ b/gamelib/scenes/bridge.py	Sun Aug 29 03:51:23 2010 +0200
@@ -323,7 +323,7 @@
 
     def interact_without(self):
         if self.scene.get_data('ai status') == 'online':
-            return self.interact_default()
+            return self.interact_default(None)
         elif self.scene.get_data('ai panel') == 'closed':
             return Result("You are unable to open the panel with your bare hands.")
         elif self.scene.get_data('ai panel') == 'open':
@@ -335,7 +335,7 @@
 
     def interact_with_machete(self, item):
         if self.scene.get_data('ai status') == 'online':
-            return self.interact_default()
+            return self.interact_default(item)
         elif self.scene.get_data('ai panel') == 'closed':
             self.scene.set_data('ai panel', 'open')
             self.set_interact('open')
@@ -346,7 +346,7 @@
             self.set_interact('broken')
             return Result("You smash various delicate components with the machete.")
 
-    def interact_default(self):
+    def interact_default(self, item):
         if self.scene.get_data('ai status') == 'online':
             return (Result('You feel a shock from the panel.'),
                     make_jim_dialog("Prisoner %s. Please step away from the panel. "