X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/e823e42acdae7dee401096b9a46b1982179fbb33..99c0151e0d0ad682e7ee58de89f2e11b18a7864c:/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 28206fa..73f3f9b 100644
--- a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
@@ -4,12 +4,23 @@ using GameServ::GameLayer::GameObjects::PlayerGO;
 using GameServ::GameLayer::GameObjects::ArmorGO;
 #include <GameServ/GameLayer/GameObjects/WeaponGO.h>
 using GameServ::GameLayer::GameObjects::WeaponGO;
+#include <GameServ/GameLayer/GameObjects/PotionGO.h>
+using GameServ::GameLayer::GameObjects::PotionGO;
+
+#include <GameServ/GameServException.h>
+using GameServ::Exceptions::GameServException;
+
+#include <GameServ/Types.h>
+using GameServ::Types::ObjectTypes;
 
 #include <boost/smart_ptr/shared_ptr.hpp>
 using boost::shared_ptr;
+using boost::shared_static_cast;
 
-#include <GameServ/GameServException.h>
-using GameServ::Exceptions::GameServException;
+#include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
+using boost::str;
+using boost::format;
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 using boost::posix_time::ptime;
@@ -194,16 +205,6 @@ void PlayerGO::Armor(shared_ptr<ArmorGO> spArmor)
 	mArmor = spArmor;
 }
 
-void PlayerGO::Use(shared_ptr<ItemGO> spItem)
-{
-	throw GameServException("Undefined function.", __FILE__, __LINE__);
-}
-
-void PlayerGO::Undo(shared_ptr<ItemGO> spItem)
-{
-	throw GameServException("Undefined function.", __FILE__, __LINE__);
-}
-
 void PlayerGO::Password(const string &value)
 {
 	mPassword = value;
@@ -235,29 +236,18 @@ vector< shared_ptr<ItemGO> > PlayerGO::Inventory(void) const
 	return mItems;
 }
 
-void PlayerGO::AddItemToInventory(shared_ptr<ItemGO> spItem, const int &Number)
+void PlayerGO::AddItemToInventory(shared_ptr<ItemGO> spItem)
 {
-	for (int x = 0; x < Number; ++x)
-	{
-		shared_ptr<ItemGO> item = shared_ptr<ItemGO>(new ItemGO(*spItem->Clone()));
-		mItems.push_back(item);
-	}
+	mItems.push_back(spItem);
 }
 
-void PlayerGO::RemoveItemFromInventory(shared_ptr<ItemGO> spItem, const int &Number)
+void PlayerGO::RemoveItemFromInventory(shared_ptr<ItemGO> spItem)
 {
 	vector< shared_ptr<ItemGO> >::iterator iter;
-	for (int x = 0; x < Number; ++x)
+	iter = find(mItems.begin(), mItems.end(), spItem);
+	if (iter != mItems.end())
 	{
-		iter = find(mItems.begin(), mItems.end(), spItem);
-		if (iter != mItems.end())
-		{
-			mItems.erase(iter);
-		}
-		else
-		{
-			break;
-		}
+		mItems.erase(iter);
 	}
 }
 
@@ -284,3 +274,7 @@ PlayerGO *PlayerGO::Clone(void) const
 	return new PlayerGO(*this);
 }
 
+ObjectTypes::ObjectType PlayerGO::ObjectType(void) const
+{
+	return ObjectTypes::Player;
+}