# HG changeset patch
# User KarstenBock@gmx.net
# Date 1316781786 -7200
# Node ID 7b084602541218fc0075c52485360f63681e0324
# Parent  c1a6ea47b838f49444f6b38dafec37ba03b21e6f
Fixed bug in checkAttributes that caused that values where not correctly set from the Template.

diff -r c1a6ea47b838 -r 7b0846025412 src/parpg/gamemodel.py
--- a/src/parpg/gamemodel.py	Fri Sep 23 14:24:22 2011 +0200
+++ b/src/parpg/gamemodel.py	Fri Sep 23 14:43:06 2011 +0200
@@ -108,8 +108,10 @@
         if self.object_db.has_key(template):
             db_attributes = deepcopy(self.object_db[template])
             for key in db_attributes.keys():
-                if attributes.has_key(key):
-                    attributes[key] = attributes[key] or db_attributes[key]
+                if attributes.has_key(key):                    
+                    tmp_attributes = db_attributes[key]
+                    tmp_attributes.update(attributes[key])
+                    attributes[key] = tmp_attributes
                 else:
                     attributes[key] = db_attributes[key]
         return attributes