Mercurial > parpg-source

diff components/equip.py @ 75:9e03f7816061

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Re)added setting of inventory and equipment in the object files.
author KarstenBock@gmx.net
date Thu, 22 Sep 2011 16:18:07 +0200
parents 783dc57eca7c
children 939984cff702
line wrap: on
line diff
--- a/components/equip.py	Thu Sep 22 14:39:00 2011 +0200
+++ b/components/equip.py	Thu Sep 22 16:18:07 2011 +0200
@@ -54,7 +54,7 @@
         raise AlreadyEquippedError
     if slot in equipable.possible_slots:
         try:
-            old_item = getattr(wearer, slot)
+            old_item = getattr(wearer, slot) if hasattr(wearer, slot) else None
             setattr(wearer, slot, equipable)
             equipable.in_slot = slot
             equipable.wearer = wearer