diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-01-23 13:15:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-01-23 23:49:41 +0300 |
commit | b7bb27910303ef1538e2cbb4093e452c77567739 (patch) | |
tree | 4ec28548195cb257218a4bcea5fab07f19a2d36a /src/being | |
parent | 4604b1e450ba9335c58745e9e8041f7e89fb5da5 (diff) | |
download | manaplus-b7bb27910303ef1538e2cbb4093e452c77567739.tar.gz manaplus-b7bb27910303ef1538e2cbb4093e452c77567739.tar.bz2 manaplus-b7bb27910303ef1538e2cbb4093e452c77567739.tar.xz manaplus-b7bb27910303ef1538e2cbb4093e452c77567739.zip |
Add variable for cart window.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/playerinfo.cpp | 16 | ||||
-rw-r--r-- | src/being/playerinfo.h | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index 8d8d20071..2016454da 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -56,6 +56,9 @@ PlayerInfoBackend mData; int mCharId = 0; Inventory *mInventory = nullptr; +#ifdef EATHENA_SUPPORT +Inventory *mCartInventory = nullptr; +#endif Equipment *mEquipment = nullptr; MercenaryInfo *mMercenary = nullptr; HomunculusInfo *mHomunculus = nullptr; @@ -199,6 +202,13 @@ Inventory *getStorageInventory() return inventoryHandler->getStorage(); } +#ifdef EATHENA_SUPPORT +Inventory *getCartInventory() +{ + return mCartInventory; +} +#endif + void clearInventory() { if (mEquipment) @@ -406,6 +416,9 @@ void gameDestroyed() { delete2(mInventory); delete2(mEquipment); +#ifdef EATHENA_SUPPORT + delete2(mCartInventory); +#endif } void stateChange(const State state) @@ -416,6 +429,9 @@ void stateChange(const State state) { mInventory = new Inventory(Inventory::INVENTORY); mEquipment = new Equipment(); +#ifdef EATHENA_SUPPORT + mCartInventory = new Inventory(Inventory::CART); +#endif } } } diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index c49326bb4..807d9d03d 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -148,6 +148,10 @@ namespace PlayerInfo Inventory *getStorageInventory() A_WARN_UNUSED; +#ifdef EATHENA_SUPPORT + Inventory *getCartInventory() A_WARN_UNUSED; +#endif + /** * Clears the player's inventory and equipment. */ |