Allow names instead of ids for attributes + cleanup

I did not adapt the scripts yet since we need some special handling for
the attributes which are required by the server directly. So you still
have to use the ids for those. I will change that later.

In the future I want to use the AttributeInfo class instead of the int
id everywhere possible. So I did a small start on that too.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index a40c24a4..30be1201 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -53,7 +53,7 @@ MonsterComponent::MonsterComponent(Entity &entity, MonsterClass *specy):
 
     for (auto attrInfo : attributeManager->getAttributeScope(MonsterScope))
     {
-        beingComponent->createAttribute(attrInfo.first, *attrInfo.second);
+        beingComponent->createAttribute(attrInfo.first, attrInfo.second);
     }
 
     /*
@@ -71,7 +71,8 @@ MonsterComponent::MonsterComponent(Entity &entity, MonsterClass *specy):
             double factor = 100 + (rand() % (mutation * 2)) - mutation;
             attributeValue = attributeValue * factor / 100.0;
         }
-        beingComponent->setAttribute(entity, attribute.first, attributeValue);
+        beingComponent->setAttribute(entity, attribute.first->id,
+                                     attributeValue);
     }
 
     beingComponent->setGender(specy->getGender());