Mercurial > boomslang
comparison gamelib/gamescreen.py @ 519:8f3c82c685a4
Fix is_interactive() by adding tool param.
author | Jeremy Thurgood <firxen@gmail.com> |
---|---|
date | Tue, 07 Sep 2010 18:13:35 +0200 |
parents | 26f9b4d10e3e |
children | 92782d1ca7be |
comparison
equal
deleted
inserted
replaced
518:3e91c82c2240 | 519:8f3c82c685a4 |
---|---|
37 | 37 |
38 def click_item(self, item_no, event): | 38 def click_item(self, item_no, event): |
39 item = self.state.inventory[item_no] | 39 item = self.state.inventory[item_no] |
40 if self.item_is_selected(item_no): | 40 if self.item_is_selected(item_no): |
41 self.unselect() | 41 self.unselect() |
42 elif self.state.tool or item.is_interactive(): | 42 elif item.is_interactive(self.state.tool): |
43 result = item.interact(self.state.tool) | 43 result = item.interact(self.state.tool) |
44 handle_result(result, self.state_widget) | 44 handle_result(result, self.state_widget) |
45 else: | 45 else: |
46 self.state.set_tool(self.state.inventory[item_no]) | 46 self.state.set_tool(self.state.inventory[item_no]) |
47 | 47 |