diff src/parpg/gamemodel.py @ 106:f3ace79da781

Removed image field from the equipable component.
author KarstenBock@gmx.net
date Fri, 23 Sep 2011 12:58:32 +0200
parents 7829eb185d6f
children 2f928c913c78
line wrap: on
line diff
--- a/src/parpg/gamemodel.py	Thu Sep 22 16:18:07 2011 +0200
+++ b/src/parpg/gamemodel.py	Fri Sep 23 12:58:32 2011 +0200
@@ -458,10 +458,6 @@
                 item_data = {}
                 item_data = self.checkAttributes(item_data, data["type"])
                 if item_data.has_key("containable") and item_data.has_key("equipable"):
-                    if not item_data["equipable"].has_key("image"):
-                        item_data["equipable"]["image"]=item_data["containable"]["image"]
-                    if not item_data["containable"].has_key("image"):
-                        item_data["containable"]["image"]=item_data["equipable"]["image"]
                     item = createEntity(item_data, world, None)
                     self.game_state.addObject(self.createUniqueID(data["ID"]), None, item)
                     equip.equip(obj.equip, item.equipable, slot)