summaryrefslogtreecommitdiff
path: root/src/being/playerinfo.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-15 22:03:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-16 13:50:43 +0300
commit23034a47937c109590eb60e4ee0efa32a8c9e45e (patch)
tree844c716da20752dcbb0aead649011f54d8062635 /src/being/playerinfo.cpp
parent4638f969d4206ba8dd857eb6d2758106cc5268df (diff)
downloadmanaplus-23034a47937c109590eb60e4ee0efa32a8c9e45e.tar.gz
manaplus-23034a47937c109590eb60e4ee0efa32a8c9e45e.tar.bz2
manaplus-23034a47937c109590eb60e4ee0efa32a8c9e45e.tar.xz
manaplus-23034a47937c109590eb60e4ee0efa32a8c9e45e.zip
Remove useless includes from cpp files
Diffstat (limited to 'src/being/playerinfo.cpp')
-rw-r--r--src/being/playerinfo.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index dc7eb3732..ff4efb79d 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -21,17 +21,16 @@
#include "being/playerinfo.h"
-#include "client.h"
#include "configuration.h"
-#include "inventory.h"
#include "itemsoundmanager.h"
-#include "being/homunculusinfo.h"
#include "being/localplayer.h"
+
+#ifdef EATHENA_SUPPORT
+#include "being/homunculusinfo.h"
#include "being/mercenaryinfo.h"
#include "being/petinfo.h"
-
-#include "enums/inventorytype.h"
+#endif
#include "enums/being/attributes.h"
@@ -46,8 +45,6 @@
#include "utils/delete2.h"
-#include "listeners/statlistener.h"
-
#include "debug.h"
namespace PlayerInfo
@@ -59,11 +56,11 @@ int mCharId = 0;
Inventory *mInventory = nullptr;
#ifdef EATHENA_SUPPORT
Inventory *mCartInventory = nullptr;
-#endif
-Equipment *mEquipment = nullptr;
MercenaryInfo *mMercenary = nullptr;
HomunculusInfo *mHomunculus = nullptr;
PetInfo *mPet = nullptr;
+#endif
+Equipment *mEquipment = nullptr;
int mPetBeingId = 0;
GuildPositionFlags::Type mGuildPositionFlags = GuildPositionFlags::None;
@@ -394,7 +391,9 @@ void init()
void deinit()
{
clearInventory();
+#ifdef EATHENA_SUPPORT
delete2(mMercenary);
+#endif
mPetBeingId = 0;
}
@@ -477,6 +476,7 @@ bool isItemProtected(const int id)
return mProtectedItems.find(id) != mProtectedItems.end();
}
+#ifdef EATHENA_SUPPORT
void setMercenary(MercenaryInfo *const info)
{
if (mMercenary)
@@ -559,7 +559,6 @@ int getMercenaryId()
return mMercenary ? mMercenary->id : 0;
}
-#ifdef EATHENA_SUPPORT
void updateMoveAI()
{
if (mMercenary)