# HG changeset patch # User Neil Muller # Date 1358337482 -7200 # Node ID b9504e6ecde145197b90bc6e3e124a7c3a54b86e # Parent adbcf84b7b1fde5a1a23eb51e0da96fcc90c1bb2 Make a couple of interactions less dependent on current_scene, so the 'mad clicker' test works diff -r adbcf84b7b1f -r b9504e6ecde1 gamelib/scenes/bridge.py --- a/gamelib/scenes/bridge.py Wed Jan 16 13:57:24 2013 +0200 +++ b/gamelib/scenes/bridge.py Wed Jan 16 13:58:02 2013 +0200 @@ -234,7 +234,7 @@ def interact_without(self): self.game.add_inventory_item('superconductor') - self.game.current_scene.things['bridge.massagechair_base'] \ + self.game.scenes['bridge'].things['bridge.massagechair_base'] \ .set_data('contains_superconductor', False) self.scene.remove_thing(self) return (Result("The superconductor module unclips easily."), diff -r adbcf84b7b1f -r b9504e6ecde1 gamelib/scenes/cryo.py --- a/gamelib/scenes/cryo.py Wed Jan 16 13:57:24 2013 +0200 +++ b/gamelib/scenes/cryo.py Wed Jan 16 13:58:02 2013 +0200 @@ -421,7 +421,7 @@ def interact_without(self): self.game.add_inventory_item('titanium_leg') - self.game.current_scene.things['cryo.unit.1'].set_data( + self.game.scenes['cryo'].things['cryo.unit.1'].set_data( 'contains_titanium_leg', False) self.scene.remove_thing(self) return Result("The skeletal occupant of this cryo unit has an"