Still creating all the classes.. does not compile

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@499 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv-2.0/GameServ.suo b/gameserv-2.0/GameServ.suo
index 8eea787349c1bbdfbbcb4624c57c56744697283b..4ed2d5fe882de51104151288083d9b0175e269c8 100644 (file)
Binary files a/gameserv-2.0/GameServ.suo and b/gameserv-2.0/GameServ.suo differ

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ArmorGO.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ArmorGO.h
index 9726586fa99f00c8a43b337707517df64230d217..3cc91f7a05e06085fa8c9a3845bb5d7346e59223 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ArmorGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ArmorGO.h
@@ -1,13 +1,21 @@
 #ifndef __GS__ARMOR_H__\r
 #define __GS__ARMOR_H__\r
 \r
+#include <GameServ/GameLayer/GameObjects/GameObject.h>\r
+using GameServ::GameLayer::GameObjects::GameObject;\r
 #include <GameServ/GameLayer/GameObjects/ItemGO.h>\r
 using GameServ::GameLayer::GameObjects::ItemGO;\r
 \r
-namespace GameServ { namespace GameLayer { namespace GameObjects\r
+\r
+namespace GameServ { namespace GameLayer { namespace GameObjects {\r
 \r
 class ArmorBO : public ItemGO\r
 {\r
+public:\r
+       ArmorBO();\r
+       virtual ~ArmorBO();\r
+\r
+private:\r
 };\r
 \r
 }}}\r

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..ba634ad4ff20242f196728273c3afc0c23ba7ff3 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/GameObject.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/GameObject.h
@@ -32,7 +32,7 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                bool operator==(const GameObject &right) const;\r
                bool operator!=(const GameObject &right) const;\r
 \r
-       private:\r
+       protected:\r
                string mId;\r
                friend class GameObjectIds_Eq;\r
        };\r

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 95e2c7eec5d94454c512ba59f358c51d1d86fb20..dd14980d4a991e426d9903da7140b7627761597c 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ItemGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/ItemGO.h
@@ -8,8 +8,8 @@ using std::string;
 #include <vector>\r
 using std::vector;\r
 \r
-namespace GameServ { namespace GameLayer { namespace GameObjects\r
-{\r
+namespace GameServ { namespace GameLayer { namespace GameObjects {\r
+\r
        enum ItemType { NOTYPE, WEAPON, ARMOR, POTION };\r
 \r
        class ItemGO : public GameObject\r
@@ -47,7 +47,7 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
 \r
                virtual ItemGO *Clone(void) const;\r
 \r
-       private:\r
+       protected:\r
                string mName;\r
                unsigned long int mPrice;\r
                int mUses;\r

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 e266ce34574b8d52734d401010e3f0c8cf087ba6..ca1d56a2dc2a04a5b16f47ae35a1e5ad00b51b7d 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
@@ -3,19 +3,29 @@
 #include <GameServ/GameLayer/GameObjects/GameObject.h>\r
 using GameServ::GameLayer::GameObjects::GameObject;\r
 \r
+#include <GameServ/GameLayer/GameObjects/ItemGO.h>\r
+using GameServ::GameLayer::GameObjects::ItemGO;\r
+\r
+#include <GameServ/GameLayer/GameObjects/ArmorGO.h>\r
+#include <GameServ/GameLayer/GameObjects/WeaponGO.h>\r
+using GameServ::GameLayer::GameObjects::ArmorGO;\r
+using GameServ::GameLayer::GameObjects::WeaponGO;\r
+\r
 #include <boost/shared_ptr.hpp>\r
 using boost::shared_ptr;\r
 \r
 #include <string>\r
 using std::string;\r
+#include <vector>\r
+using std::vector;\r
 \r
 namespace GameServ { namespace GameLayer { namespace GameObjects\r
 {\r
        class PlayerGO : public GameObject\r
        {\r
        public:\r
-               Player();\r
-               ~Player();\r
+               PlayerGO();\r
+               ~PlayerGO();\r
 \r
                //! Property get - Name\r
                string Name(void) const;\r
@@ -70,8 +80,15 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                //! Property get - Weapon\r
                shared_ptr<WeaponGO> Weapon(void) const;\r
                //! Property set - Weapon\r
-               void Weapon(const shared_ptr<WeaponGO> spWeapon);\r
+               void Weapon(shared_ptr<WeaponGO> spWeapon);\r
+\r
+               //! Property get - Armor\r
+               shared_ptr<ArmorGO> Armor(void) const;\r
+               //! Property set - Armor\r
+               void Armor(shared_ptr<ArmorGO> spArmor);\r
 \r
+               //! Use an Item\r
+               void Use(shared_ptr<ItemGO> spItem);\r
 \r
        private:\r
                string mName;\r
@@ -87,6 +104,7 @@ 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
 \r
        };\r
 }}} // GameServ::GameLayer::GameObjects\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/WeaponGO.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/WeaponGO.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d196f4ac13c3e7438542550bcd7be7963aaf0dfe 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/WeaponGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/WeaponGO.h
@@ -0,0 +1,17 @@
+#ifndef __GS__WEAPON_H__\r
+#define __GS__WEAPON_H__\r
+\r
+namespace GameServ { namespace GameLayer { namespace GameObjects {\r
+\r
+       class WeaponGO : public ItemGO\r
+       {\r
+       public:\r
+               WeaponGO();\r
+               WeaponGO(const string &name, const int &price, const int &uses, const int &strength, const int &defense, const int &maxhp);\r
+               ~WeaponGO();\r
+\r
+       private:\r
+       };\r
+\r
+}}}\r
+#endif
\ No newline at end of file

diff --git a/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj b/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
index 2e0a62e095bfcce04efbe95734aede525d8cdb36..1ca0b951f165392bc560b04f2787f0d1a8e6ef05 100644 (file)
--- a/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
+++ b/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
@@ -162,11 +162,11 @@
                                Name="GameObjects"\r
                                >\r
                                <File\r
-                                       RelativePath=".\include\GameServ\GameLayer\GameObjects\Armor.h"\r
+                                       RelativePath=".\src\GameLayer\GameObjects\ArmorGO.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\src\GameLayer\GameObjects\ArmorGO.cpp"\r
+                                       RelativePath=".\include\GameServ\GameLayer\GameObjects\ArmorGO.h"\r
                                        >\r
                                </File>\r
                                <File\r

diff --git a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/ItemGO.cpp b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/ItemGO.cpp
index 2fcafa882c5add84febaeceea9d74e577849d2c4..1a764a5d4f8df258a00f9e7676e8a1e862f0c843 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/ItemGO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/ItemGO.cpp
@@ -6,6 +6,9 @@ using std::string;
 #include <vector>\r
 using std::vector;\r
 \r
+#include <boost/shared_ptr.hpp>\r
+using boost::shared_ptr;\r
+\r
 ItemGO::ItemGO() : GameObject(), mName(""), mPrice(0), mUses(1), mType(NOTYPE)\r
 {\r
        mModifiers.resize(8);\r

diff --git a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a2b37a1755e422a0b4d4f501449fd194e79a72db 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
@@ -0,0 +1,151 @@
+#include <GameServ/GameLayer/GameObjects/PlayerGO.h>\r
+using GameServ::GameLayer::GameObjects::PlayerGO;\r
+\r
+#include <boost/shared_ptr.hpp>\r
+using boost::shared_ptr;\r
+\r
+PlayerGO::PlayerGO() : GameObject(), mName(""), mLevel(1), mExperience(0), mGold(0), mHealth(0), mMaxHealth(0), mStrength(1),\r
+mDefense(1), mForestFights(0), mPlayerFights(0), mPassword("")\r
+{\r
+}\r
+\r
+PlayerGO::~PlayerGO()\r
+{\r
+}\r
+\r
+string PlayerGO::Name(void) const\r
+{\r
+       return mName;\r
+}\r
+\r
+void PlayerGO::Name(const string &value)\r
+{\r
+       assert(!value.empty());\r
+       mName = value;\r
+}\r
+\r
+int PlayerGO::Level(void) const\r
+{\r
+       return mLevel;\r
+}\r
+\r
+void PlayerGO::Level(const int &value)\r
+{\r
+       assert(value > 0);\r
+       mLevel = value;\r
+}\r
+\r
+unsigned long int PlayerGO::Experience(void) const\r
+{\r
+       return mLevel;\r
+}\r
+\r
+void PlayerGO::Experience(const unsigned long int &value)\r
+{\r
+       mExperience = value;\r
+}\r
+\r
+unsigned long int PlayerGO::Gold(void) const\r
+{\r
+       return mGold;\r
+}\r
+\r
+void PlayerGO::Gold(const unsigned long int &value)\r
+{\r
+       mGold = value;\r
+}\r
+\r
+int PlayerGO::Health(void) const\r
+{\r
+       return mHealth;\r
+}\r
+\r
+void PlayerGO::Health(const int &value)\r
+{\r
+       assert(value >= 0);\r
+       mHealth = value;\r
+}\r
+\r
+int PlayerGO::MaxHealth(void) const\r
+{\r
+       return mMaxHealth;\r
+}\r
+\r
+void PlayerGO::MaxHealth(const int &value)\r
+{\r
+       assert (value >= 0);\r
+       mMaxHealth = value;\r
+}\r
+\r
+int PlayerGO::Strength(void) const\r
+{\r
+       return mStrength;\r
+}\r
+\r
+void PlayerGO::Strength(const int &value)\r
+{\r
+       assert (value > 0);\r
+       mStrength = value;\r
+}\r
+\r
+int PlayerGO::Defense(void) const\r
+{\r
+       return mDefense;\r
+}\r
+\r
+void PlayerGO::Defense(const int &value)\r
+{\r
+       assert(value > 0);\r
+       mDefense = value;\r
+}\r
+\r
+int PlayerGO::ForestFights(void) const\r
+{\r
+       return mForestFights;\r
+}\r
+\r
+void PlayerGO::ForestFights(const int &value)\r
+{\r
+       assert (value >= 0);\r
+       mForestFights = value;\r
+}\r
+\r
+int PlayerGO::PlayerFights(void) const\r
+{\r
+       return mPlayerFights;\r
+}\r
+\r
+void PlayerGO::PlayerFights(const int &value)\r
+{\r
+       assert (value >= 0);\r
+       mPlayerFights = value;\r
+}\r
+\r
+shared_ptr<WeaponGO> PlayerGO::Weapon(void) const\r
+{\r
+       return mWeapon;\r
+}\r
+\r
+void PlayerGO::Weapon(shared_ptr<WeaponGO> spWeapon)\r
+{\r
+       mWeapon = spWeapon;\r
+}\r
+\r
+shared_ptr<WeaponGO> PlayerGO::Armor(void) const\r
+{\r
+       return mArmor;\r
+}\r
+\r
+void PlayerGO::Armor(shared_ptr<ArmorGO> spArmor)\r
+{\r
+       mArmor = spArmor;\r
+}\r
+\r
+void PlayerGO::Use(shared_ptr<ItemGO> spItem)\r
+{\r
+       throw Exception("Undefined function");\r
+}\r
+\r
+\r
+\r
+\r

diff --git a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/WeaponGO.cpp b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/WeaponGO.cpp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..018aa37f9c551867e4dc10ae69027a5512cfc78e 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/WeaponGO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/WeaponGO.cpp
@@ -0,0 +1,32 @@
+#include <GameServ/GameLayer/GameObjects/WeaponGO.h>\r
+using GameServ::GameLayer::GameObjects::WeaponGO;\r
+\r
+#include <string>\r
+using std::string;\r
+#include <vector>\r
+using std::vector;\r
+\r
+#include <boost/format.hpp>\r
+#include <boost/algorithm/string.hpp>\r
+using boost::format;\r
+using boost::str;\r
+\r
+WeaponGO::WeaponGO() : ItemGO()\r
+{\r
+}\r
+\r
+WeaponGO::WeaponGO(const string &name, const int &price, const int &uses, const int &strength, const int &defense, const int &maxhp) :\r
+ItemGO(), mName(name), mPrice(price), mUses(uses)\r
+{\r
+       mModifiers.clear();\r
+       mModifiers.push_back(str(format("STRENGTH + %d") % strength));\r
+       mModifiers.push_back(str(format("DEFENSE + %d") % defense));\r
+       mModifiers.push_back(str(format("MAXHP + %d") maxhp));\r
+}\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r