From 633fad1a9c38a92da32907e763e1dab42c0dcf8d Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Sun, 5 May 2013 14:20:12 +0200
Subject: Fixed setting name of monsters

---
 src/game-server/monster.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index d5de45e..a40c24a 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -40,8 +40,6 @@ MonsterComponent::MonsterComponent(Entity &entity, MonsterClass *specy):
 {
     LOG_DEBUG("Monster spawned! (id: " << mSpecy->getId() << ").");
 
-    auto *beingComponent = entity.getComponent<BeingComponent>();
-
     auto *actorComponent = entity.getComponent<ActorComponent>();
     actorComponent->setWalkMask(Map::BLOCKMASK_WALL |
                                 Map::BLOCKMASK_CHARACTER);
@@ -51,6 +49,7 @@ MonsterComponent::MonsterComponent(Entity &entity, MonsterClass *specy):
     /*
      * Initialise the attribute structures.
      */
+    auto *beingComponent = entity.getComponent<BeingComponent>();
 
     for (auto attrInfo : attributeManager->getAttributeScope(MonsterScope))
     {
@@ -76,6 +75,7 @@ MonsterComponent::MonsterComponent(Entity &entity, MonsterClass *specy):
     }
 
     beingComponent->setGender(specy->getGender());
+    beingComponent->setName(specy->getName());
 
     AbilityComponent *abilityComponent = new AbilityComponent(entity);
     entity.addComponent(abilityComponent);
-- 
cgit