Finally figured out how to do the Item cloning properly... no more ItemCloner class...

[irc/gameservirc.git] / gameserv-2.0 / libgameservgldl / src / GameLayer / GameObjects / PlayerGO.cpp

diff --git a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
index 417c1304fec4d0cf62865e43a8fdd179c6c9dbc7..73f3f9b1691bf3f850639ee2af4d6a5d835d7234 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
@@ -4,16 +4,35 @@ using GameServ::GameLayer::GameObjects::PlayerGO;
 using GameServ::GameLayer::GameObjects::ArmorGO;\r
 #include <GameServ/GameLayer/GameObjects/WeaponGO.h>\r
 using GameServ::GameLayer::GameObjects::WeaponGO;\r
-\r
-#include <boost/shared_ptr.hpp>\r
-using boost::shared_ptr;\r
+#include <GameServ/GameLayer/GameObjects/PotionGO.h>\r
+using GameServ::GameLayer::GameObjects::PotionGO;\r
 \r
 #include <GameServ/GameServException.h>\r
 using GameServ::Exceptions::GameServException;\r
 \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
+using boost::shared_static_cast;\r
+\r
+#include <boost/algorithm/string.hpp>\r
+#include <boost/format.hpp>\r
+using boost::str;\r
+using boost::format;\r
+\r
 #include <boost/date_time/posix_time/posix_time.hpp>\r
 using boost::posix_time::ptime;\r
 \r
+#include <vector>\r
+using std::vector;\r
+#include <string>\r
+using std::string;\r
+#include <algorithm>\r
+using std::find;\r
+using std::sort;\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
@@ -146,6 +165,26 @@ void PlayerGO::PlayerFights(const int &value)
        mPlayerFights = value;\r
 }\r
 \r
+bool PlayerGO::Alive(void) const\r
+{\r
+       return mAlive;\r
+}\r
+\r
+void PlayerGO::Alive(const bool &value)\r
+{\r
+       mAlive = value;\r
+}\r
+\r
+bool PlayerGO::FoughtMaster(void) const\r
+{\r
+       return mFoughtMaster;\r
+}\r
+\r
+void PlayerGO::FoughtMaster(const bool &value)\r
+{\r
+       mFoughtMaster = value;\r
+}\r
+\r
 shared_ptr<WeaponGO> PlayerGO::Weapon(void) const\r
 {\r
        return mWeapon;\r
@@ -166,16 +205,6 @@ void PlayerGO::Armor(shared_ptr<ArmorGO> spArmor)
        mArmor = spArmor;\r
 }\r
 \r
-void PlayerGO::Use(shared_ptr<ItemGO> spItem)\r
-{\r
-       throw GameServException("Undefined function.", __FILE__, __LINE__);\r
-}\r
-\r
-void PlayerGO::Undo(shared_ptr<ItemGO> spItem)\r
-{\r
-       throw GameServException("Undefined function.", __FILE__, __LINE__);\r
-}\r
-\r
 void PlayerGO::Password(const string &value)\r
 {\r
        mPassword = value;\r
@@ -196,6 +225,33 @@ ptime PlayerGO::LastLogin(void) const
        return mLastLogin;\r
 }\r
 \r
+void PlayerGO::Inventory(const vector< shared_ptr<ItemGO> > &items)\r
+{\r
+       mItems.clear();\r
+       mItems.insert(mItems.begin(), items.begin(), items.end());\r
+}\r
+\r
+vector< shared_ptr<ItemGO> > PlayerGO::Inventory(void) const\r
+{\r
+       return mItems;\r
+}\r
+\r
+void PlayerGO::AddItemToInventory(shared_ptr<ItemGO> spItem)\r
+{\r
+       mItems.push_back(spItem);\r
+}\r
+\r
+void PlayerGO::RemoveItemFromInventory(shared_ptr<ItemGO> spItem)\r
+{\r
+       vector< shared_ptr<ItemGO> >::iterator iter;\r
+       iter = find(mItems.begin(), mItems.end(), spItem);\r
+       if (iter != mItems.end())\r
+       {\r
+               mItems.erase(iter);\r
+       }\r
+}\r
+\r
+\r
 bool PlayerGO::operator !=(const PlayerGO &right) const\r
 {\r
        return !(*this == right);\r
@@ -207,9 +263,9 @@ bool PlayerGO::operator ==(const PlayerGO &right) const
                mName == right.mName && right.mArmor == mArmor &&\r
                right.mDefense == mDefense && right.mExperience == mExperience &&\r
                right.mForestFights == mForestFights && right.mGold == mGold &&\r
-               right.mHealth == mHealth && right.mInventory == mInventory &&\r
-               right.mLevel == mLevel && right.mMaxHealth == mMaxHealth &&\r
-               right.mPassword == mPassword && right.mPlayerFights == mPlayerFights &&\r
+               right.mHealth == mHealth && right.mMaxHealth == mMaxHealth &&\r
+               right.mLevel == mLevel && right.mPassword == mPassword && \r
+               right.mPlayerFights == mPlayerFights && \r
                right.mStrength == mStrength && right.mWeapon == mWeapon;\r
 }\r
 \r
@@ -218,3 +274,7 @@ PlayerGO *PlayerGO::Clone(void) const
        return new PlayerGO(*this);\r
 }\r
 \r
+ObjectTypes::ObjectType PlayerGO::ObjectType(void) const\r
+{\r
+       return ObjectTypes::Player;\r
+}\r