summaryrefslogtreecommitdiff
path: root/src/game-server/character.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-12 14:51:10 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-12 15:08:02 +0200
commitf04f62249ae52e256cb889dfa17eed1f02efcbce (patch)
tree9e056215c6e9595b4ed7bf0c1254b8b7c489ecbb /src/game-server/character.cpp
parent9e6a0f98ecb52e04ab5afce817cb1d7fe2076450 (diff)
downloadmanaserv-f04f62249ae52e256cb889dfa17eed1f02efcbce.tar.gz
manaserv-f04f62249ae52e256cb889dfa17eed1f02efcbce.tar.bz2
manaserv-f04f62249ae52e256cb889dfa17eed1f02efcbce.tar.xz
manaserv-f04f62249ae52e256cb889dfa17eed1f02efcbce.zip
Removed CharacterData member from CharacterComponent
It is only needed temporarily while serializing and deserializing.
Diffstat (limited to 'src/game-server/character.cpp')
-rw-r--r--src/game-server/character.cpp5
1 files changed, 2 insertions, 3 deletions
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);;