# HG changeset patch
# User KarstenBock@gmx.net
# Date 1316775512 -7200
# Node ID 4cf150131139ea56a72e0cee1fc4042dfb1bbb0d
# Parent  9e03f7816061532ae855dca00281e22ee41d6e36
Removed image field from the equipable component.

diff -r 9e03f7816061 -r 4cf150131139 components/equipable.py
--- a/components/equipable.py	Thu Sep 22 16:18:07 2011 +0200
+++ b/components/equipable.py	Fri Sep 23 12:58:32 2011 +0200
@@ -19,4 +19,4 @@
     """
     
     def __init__(self):
-        Component.__init__(self, image=str, possible_slots=list, wearer=object, in_slot=str)
\ No newline at end of file
+        Component.__init__(self, possible_slots=list, wearer=object, in_slot=str)
\ No newline at end of file
diff -r 9e03f7816061 -r 4cf150131139 gamemodel.py
--- a/gamemodel.py	Thu Sep 22 16:18:07 2011 +0200
+++ b/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)