summaryrefslogtreecommitdiff
path: root/src/game-server/inventory.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-06 21:36:50 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-11 13:43:00 +0200
commitaa04597c5f8bb806996d604699fc8ebff6d53bdd (patch)
tree20e6a79a873605b62c80011fd5c80351f60df6fb /src/game-server/inventory.cpp
parentd95fccfca8575d8fb06988e558a338e37776961a (diff)
downloadmanaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.tar.gz
manaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.tar.bz2
manaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.tar.xz
manaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.zip
Converted the Character class into a component
A CharacterData was created as a proxy class in order to allow using the old serialization method.
Diffstat (limited to 'src/game-server/inventory.cpp')
-rw-r--r--src/game-server/inventory.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp
index e14a36af..2219ada1 100644
--- a/src/game-server/inventory.cpp
+++ b/src/game-server/inventory.cpp
@@ -29,8 +29,15 @@
#include "net/messageout.h"
#include "utils/logger.h"
-Inventory::Inventory(Character *p):
- mPoss(&p->getPossessions()), mCharacter(p)
+Inventory::Inventory(Being *p):
+ mPoss(&p->getComponent<CharacterComponent>()->getPossessions()),
+ mCharacter(p)
+{
+}
+
+Inventory::Inventory(Being *p, Possessions &possessions):
+ mPoss(&possessions),
+ mCharacter(p)
{
}