comparison gamelib/state.py @ 340:185eca15a42a

Don't crash if the item doesn't exist
author Neil Muller <neil@dip.sun.ac.za>
date Sat, 28 Aug 2010 14:36:05 +0200
parents 72e4d0c5dfe9
children 4e939b3c73f8
comparison
equal deleted inserted replaced
339:e8791e2fbd26 340:185eca15a42a
130 130
131 def add_inventory_item(self, name): 131 def add_inventory_item(self, name):
132 self.inventory.append(self.items[name]) 132 self.inventory.append(self.items[name])
133 133
134 def is_in_inventory(self, name): 134 def is_in_inventory(self, name):
135 return self.items[name] in self.inventory 135 if name in self.items:
136 return self.items[name] in self.inventory
137 return False
136 138
137 def remove_inventory_item(self, name): 139 def remove_inventory_item(self, name):
138 self.inventory.remove(self.items[name]) 140 self.inventory.remove(self.items[name])
139 # Unselect tool if it's removed 141 # Unselect tool if it's removed
140 if self.tool == self.items[name]: 142 if self.tool == self.items[name]: