Fixed data/monsters.dat

[irc/gameservirc.git] / gameserv-2.0 / libgameservgldl / include / GameServ / GameLayer / GameObjects / PlayerGO.h

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
index 2022f712169dac316f65d68c2f8a1767b5144aca..cd6db5cd1d9a6407f663846d723735da412ca249 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
@@ -11,7 +11,10 @@ using GameServ::GameLayer::GameObjects::ArmorGO;
 #include <GameServ/GameLayer/GameObjects/WeaponGO.h>\r
 using GameServ::GameLayer::GameObjects::WeaponGO;\r
 \r
-#include <boost/shared_ptr.hpp>\r
+#include <GameServ/Types.h>\r
+using GameServ::Types::ObjectTypes;\r
+\r
+#include <boost/smart_ptr/shared_ptr.hpp>\r
 using boost::shared_ptr;\r
 \r
 #include <string>\r
@@ -19,7 +22,6 @@ using std::string;
 #include <vector>\r
 using std::vector;\r
 \r
-\r
 #include <boost/date_time/posix_time/posix_time.hpp>\r
 using boost::posix_time::ptime;\r
 \r
@@ -28,6 +30,7 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
        class PlayerGO : public GameObject\r
        {\r
        public:\r
+\r
                PlayerGO();\r
                PlayerGO(const string &Id);\r
 \r
@@ -38,10 +41,15 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                //! Property set - Name\r
                void Name(const string &value);\r
 \r
-               //! Property get - Level\r
-               int Level(void) const;\r
-               //! Property set - Level\r
-               void Level(const int &value);\r
+               //! Property get - LevelId\r
+               string LevelId(void) const;\r
+               //! Property set - LevelId\r
+               void LevelId(const string &value);\r
+\r
+               //! Property get - LevelNumber\r
+               unsigned int LevelNumber(void) const;\r
+               //! Property set - LevelNumber\r
+               void LevelNumber(const unsigned int &value);\r
 \r
                //! Property get - Experience\r
                unsigned long int Experience(void) const;\r
@@ -98,11 +106,6 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                //! Property set - Armor\r
                void Armor(shared_ptr<ArmorGO> spArmor);\r
 \r
-               //! Use an Item\r
-               void Use(shared_ptr<ItemGO> spItem);\r
-               //! Undo the effects of an item\r
-               void Undo(shared_ptr<ItemGO> spItem);\r
-\r
                //! Property set - Password\r
                void Password(const string &value);\r
                //! Property get - Password\r
@@ -130,9 +133,12 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
 \r
                virtual PlayerGO *Clone(void) const;\r
 \r
+               virtual ObjectTypes::ObjectType ObjectType(void) const;\r
+\r
        private:\r
                string mName;\r
-               int mLevel;\r
+               string mfkLevelId;\r
+               unsigned int mLevelNumber;\r
                unsigned long int mExperience;\r
                unsigned long int mGold;\r
                unsigned long int mBank;\r
@@ -145,7 +151,6 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                string mPassword;\r
                shared_ptr<WeaponGO> mWeapon;\r
                shared_ptr<ArmorGO> mArmor;\r
-               vector< shared_ptr<ItemGO> > mInventory;\r
                ptime mLastLogin;\r
 \r
                bool mFoughtMaster;\r