Mercurial > parpg-source
changeset 76:4cf150131139
Removed image field from the equipable component.
| author | KarstenBock@gmx.net |
|---|---|
| date | Fri, 23 Sep 2011 12:58:32 +0200 |
| parents | 9e03f7816061 |
| children | 180cbd2b5da8 |
| files | components/equipable.py gamemodel.py |
| diffstat | 2 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)