X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/317ce8de6f998a5e20c57f7fe5c8c02375c33729..142e3ca57516e0389800ff9bf3fd1b21310c4275:/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h?ds=sidebyside

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 47c8301..4313669 100644
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
@@ -11,6 +11,9 @@ using GameServ::GameLayer::GameObjects::ArmorGO;
 #include <GameServ/GameLayer/GameObjects/WeaponGO.h>
 using GameServ::GameLayer::GameObjects::WeaponGO;
 
+#include <GameServ/Types.h>
+using GameServ::Types::ObjectTypes;
+
 #include <boost/smart_ptr/shared_ptr.hpp>
 using boost::shared_ptr;
 
@@ -19,7 +22,6 @@ using std::string;
 #include <vector>
 using std::vector;
 
-
 #include <boost/date_time/posix_time/posix_time.hpp>
 using boost::posix_time::ptime;
 
@@ -99,11 +101,6 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
 		//! Property set - Armor
 		void Armor(shared_ptr<ArmorGO> spArmor);
 
-		//! Use an Item
-		void Use(shared_ptr<ItemGO> spItem);
-		//! Undo the effects of an item
-		void Undo(shared_ptr<ItemGO> spItem);
-
 		//! Property set - Password
 		void Password(const string &value);
 		//! Property get - Password
@@ -126,22 +123,13 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
 		//! Property set - Alive
 		void Alive(const bool &value);
 
-		//! Property set - Inventory
-		void Inventory(const vector<string> &value);
-
-		//! Property get - Inventory
-		vector<string> Inventory(void) const;
-
-		//! Add item to inventory
-		void AddItemToInventory(const string &fkItemId, const int &Number=1);
-		//! Remove item from inventory
-		void RemoveItemFromInventory(const string &fkItemId, const int &Number=1);
-
 		bool operator==(const PlayerGO &right) const;
 		bool operator!=(const PlayerGO &right) const;
 
 		virtual PlayerGO *Clone(void) const;
 
+		virtual ObjectTypes::ObjectType ObjectType(void) const;
+
 	private:
 		string mName;
 		int mLevel;
@@ -161,8 +149,6 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
 
 		bool mFoughtMaster;
 		bool mAlive;
-
-		vector<string> mfkItemIds;
 	};
 }}} // GameServ::GameLayer::GameObjects
 #endif
\ No newline at end of file