Consolidated all the individual level files into a single levels.dat file.

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

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/GameObject.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/GameObject.h
index ed6b5fc375a89feaeac36054dcdf20a507525282..f6d5335a4a9936d52a2458144c0fa72332954470 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/GameObject.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/GameObject.h
@@ -1,11 +1,15 @@
 #ifndef __GS__GAMEOBJECT_H__\r
 #define __GS__GAMEOBJECT_H__\r
+\r
+#include <GameServ/Types.h>\r
+using GameServ::Types::ObjectTypes;\r
+\r
 #include <functional>\r
 #include <string>\r
 using std::string;\r
 using std::unary_function;\r
 \r
-#include <boost/shared_ptr.hpp>\r
+#include <boost/smart_ptr/shared_ptr.hpp>\r
 using boost::shared_ptr;\r
 \r
 namespace GameServ { namespace GameLayer { namespace GameObjects\r
@@ -29,10 +33,13 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                */\r
                virtual GameObject *Clone(void) const = 0;\r
 \r
+               virtual ObjectTypes::ObjectType ObjectType(void) const = 0;\r
+\r
                bool operator==(const GameObject &right) const;\r
                bool operator!=(const GameObject &right) const;\r
 \r
-       private:\r
+\r
+       protected:\r
                string mId;\r
                friend class GameObjectIds_Eq;\r
        };\r