# HG changeset patch # User Neil Muller # Date 1282951705 -7200 # Node ID 75783238f73d2ad056dea87fbf9ff0c4237397ae # Parent 3caf7c9bcafc6d68af9e007fa618db841f3dda96 Make replace_inventory_item use names for consisency diff -r 3caf7c9bcafc -r 75783238f73d gamelib/state.py --- a/gamelib/state.py Sat Aug 28 01:35:39 2010 +0200 +++ b/gamelib/state.py Sat Aug 28 01:28:25 2010 +0200 @@ -133,13 +133,13 @@ if self.tool == self.items[name]: self.set_tool(None) - def replace_inventory_item(self, old_item, new_item): + def replace_inventory_item(self, old_item_name, new_item_name): """Try to replace an item in the inventory with a new one""" try: - index = self.inventory.index(old_item) - self.inventory[index] = new_item - if self.tool == old_item: - self.set_tool(new_item) + index = self.inventory.index(self.items[old_item_name]) + self.inventory[index] = self.items[new_item_name] + if self.tool == self.items[old_item_name]: + self.set_tool(self.items[new_item_name]) except ValueError: return False return True