Almost done the player code

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

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ItemGO.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ItemGO.h
index dd14980d4a991e426d9903da7140b7627761597c..7c48fcbb42b259ad1180b6fa178bdfe682889fb0 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ItemGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ItemGO.h
@@ -2,6 +2,8 @@
 #define __GS__ITEM_H__\r
 #include <GameServ/GameLayer/GameObjects/GameObject.h>\r
 using GameServ::GameLayer::GameObjects::GameObject;\r
+#include <GameServ/Types.h>\r
+using GameServ::Types::ItemTypes;\r
 \r
 #include <string>\r
 using std::string;\r
@@ -10,8 +12,6 @@ using std::vector;
 \r
 namespace GameServ { namespace GameLayer { namespace GameObjects {\r
 \r
-       enum ItemType { NOTYPE, WEAPON, ARMOR, POTION };\r
-\r
        class ItemGO : public GameObject\r
        {\r
        public:\r
@@ -35,10 +35,10 @@ namespace GameServ { namespace GameLayer { namespace GameObjects {
                void Uses(const int &value);\r
 \r
                //! Property get - Item Type\r
-               ItemType Type(void) const;\r
+               ItemTypes::ItemType Type(void) const;\r
 \r
                //! Property set - Item Type\r
-               void Type(const ItemType &value);\r
+               void Type(const ItemTypes::ItemType &value);\r
 \r
                //! Property get - Modifiers\r
                vector<string> Modifiers(void) const;\r
@@ -51,7 +51,7 @@ namespace GameServ { namespace GameLayer { namespace GameObjects {
                string mName;\r
                unsigned long int mPrice;\r
                int mUses;\r
-               ItemType mType;\r
+               ItemTypes::ItemType mType;\r
                vector<string> mModifiers;\r
        };\r
 }}}\r