From f04f62249ae52e256cb889dfa17eed1f02efcbce Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Fri, 12 Apr 2013 14:51:10 +0200
Subject: Removed CharacterData member from CharacterComponent

It is only needed temporarily while serializing and deserializing.
---
 src/game-server/character.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/game-server/character.cpp')

diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index ab13e008..d0bcf467 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -90,8 +90,6 @@ CharacterComponent::CharacterComponent(Entity &entity, MessageIn &msg):
     mKnuckleAttackInfo(0),
     mBaseEntity(&entity)
 {
-    mCharacterData = new CharacterData(&entity, this);
-
     auto *beingComponent = entity.getComponent<BeingComponent>();
 
     const AttributeManager::AttributeScope &attributes =
@@ -134,7 +132,8 @@ CharacterComponent::CharacterComponent(Entity &entity, MessageIn &msg):
     mDatabaseID = msg.readInt32();
     beingComponent->setName(msg.readString());
 
-    deserializeCharacterData(*mCharacterData, msg);
+    CharacterData characterData(&entity, this);
+    deserializeCharacterData(characterData, msg);
 
     Inventory(&entity, mPossessions).initialize();
     modifiedAllAttributes(entity);;
-- 
cgit v1.2.3-60-g2f50