diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/playerinfo.cpp | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | manaverse-stripped1.1.11.12.tar.gz manaverse-stripped1.1.11.12.tar.bz2 manaverse-stripped1.1.11.12.tar.xz manaverse-stripped1.1.11.12.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/playerinfo.cpp')
| -rw-r--r-- | src/playerinfo.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index e0f8aa494..93e704302 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -41,13 +41,13 @@ namespace PlayerInfo class PlayerInfoListener; -PlayerInfoListener *mListener = 0; +PlayerInfoListener *mListener = nullptr; PlayerInfoBackend mData; int mCharId = 0; -Inventory *mInventory = 0; -Equipment *mEquipment = 0; +Inventory *mInventory = nullptr; +Equipment *mEquipment = nullptr; std::map<int, Special> mSpecials; char mSpecialRechargeUpdateNeeded = 0; @@ -210,7 +210,7 @@ Item *getEquipment(unsigned int slot) if (mEquipment) return mEquipment->getEquipment(slot); else - return 0; + return nullptr; } void setEquipmentBackend(Equipment::Backend *backend) @@ -322,7 +322,7 @@ public: if (newState == STATE_GAME) { - if (mInventory == 0) + if (!mInventory) { mInventory = new Inventory(Inventory::INVENTORY); mEquipment = new Equipment(); @@ -335,10 +335,9 @@ public: if (event.getName() == Mana::EVENT_DESTRUCTED) { delete mInventory; + mInventory = nullptr; delete mEquipment; - - mInventory = 0; - mEquipment = 0; + mEquipment = nullptr; } } } @@ -356,7 +355,7 @@ void init() void deinit() { delete mListener; - mListener = 0; + mListener = nullptr; } } // namespace PlayerInfo |