diff options
author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-01 17:00:26 +0000 |
---|---|---|
committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-07-01 17:00:26 +0000 |
commit | d44476beb6736faafe6480cfbe527aef7e88427a (patch) | |
tree | 1a92c517d9bdd064aa6999bb5841ab8e4952913b /src/game-server/character.hpp | |
parent | d7e84be1d3dc935f47cefc0f600ced74f37e46fb (diff) | |
download | manaserv-d44476beb6736faafe6480cfbe527aef7e88427a.tar.gz manaserv-d44476beb6736faafe6480cfbe527aef7e88427a.tar.bz2 manaserv-d44476beb6736faafe6480cfbe527aef7e88427a.tar.xz manaserv-d44476beb6736faafe6480cfbe527aef7e88427a.zip |
Reverted inventory handling code to the last known working state. Simplified serialization interface along the way.
Diffstat (limited to 'src/game-server/character.hpp')
-rw-r--r-- | src/game-server/character.hpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp index 4931624c..275b5e67 100644 --- a/src/game-server/character.hpp +++ b/src/game-server/character.hpp @@ -23,27 +23,21 @@ #ifndef _TMWSERV_CHARACTER_HPP_ #define _TMWSERV_CHARACTER_HPP_ -#include "abstractcharacterdata.hpp" -#include "game-server/being.hpp" - #include <string> #include <vector> +#include "game-server/being.hpp" +#include "common/inventorydata.hpp" + class GameClient; class MessageIn; +class MessageOut; class Point; - -struct Possessions -{ - unsigned short equipment[EQUIPMENT_SLOTS]; - std::vector< InventoryItem > inventory; -}; - /** * The representation of a player's character in the game world. */ -class Character : public Being, public AbstractCharacterData +class Character : public Being { public: @@ -71,8 +65,13 @@ class Character : public Being, public AbstractCharacterData { mClient = c; } /** - * Gets a reference on the possession. - * Used in the current Inventory class + * Gets a reference on the possessions. + */ + Possessions const &getPossessions() const + { return mPossessions; } + + /** + * Gets a reference on the possessions. */ Possessions &getPossessions() { return mPossessions; } |