Mercurial > boomslang
comparison gamelib/state.py @ 484:a7ed199f69d5
Call thing.leave not scene.leave when removing things
author | Neil Muller <neil@dip.sun.ac.za> |
---|---|
date | Sun, 29 Aug 2010 19:40:06 +0200 |
parents | af2a23b9787d |
children | efb34a6cd2a1 168e9424fe91 |
comparison
equal
deleted
inserted
replaced
483:dd42f75297ba | 484:a7ed199f69d5 |
---|---|
283 self.things[thing.name] = thing | 283 self.things[thing.name] = thing |
284 thing.set_scene(self) | 284 thing.set_scene(self) |
285 | 285 |
286 def remove_thing(self, thing): | 286 def remove_thing(self, thing): |
287 del self.things[thing.name] | 287 del self.things[thing.name] |
288 self.leave() | 288 if thing is self.state.current_thing: |
289 self.state.current_thing.leave() | |
290 self.state.current_thing = None | |
289 | 291 |
290 def _get_description(self): | 292 def _get_description(self): |
291 text = (self.state.current_thing and | 293 text = (self.state.current_thing and |
292 self.state.current_thing.get_description()) | 294 self.state.current_thing.get_description()) |
293 if text is None: | 295 if text is None: |