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/net/ea/inventoryhandler.cpp | |
parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
download | plus-stripped1.1.11.12.tar.gz plus-stripped1.1.11.12.tar.bz2 plus-stripped1.1.11.12.tar.xz plus-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/net/ea/inventoryhandler.cpp')
-rw-r--r-- | src/net/ea/inventoryhandler.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 788b7f0fc..d2a1fb4f0 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -78,8 +78,8 @@ namespace Ea InventoryHandler::InventoryHandler() { - mStorage = 0; - mStorageWindow = 0; + mStorage = nullptr; + mStorageWindow = nullptr; mDebugInventory = true; } @@ -88,11 +88,11 @@ InventoryHandler::~InventoryHandler() if (mStorageWindow) { mStorageWindow->close(); - mStorageWindow = 0; + mStorageWindow = nullptr; } delete mStorage; - mStorage = 0; + mStorage = nullptr; } bool InventoryHandler::canSplit(const Item *item A_UNUSED) const @@ -164,7 +164,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg, int index, amount, itemId, arrow; int cards[4], itemType; unsigned char identified; - Inventory *inventory = 0; + Inventory *inventory = nullptr; if (player_node) inventory = PlayerInfo::getInventory(); @@ -279,7 +279,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) unsigned char identified; int floorId; - Inventory *inventory = 0; + Inventory *inventory = nullptr; if (player_node) inventory = PlayerInfo::getInventory(); @@ -345,7 +345,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) void InventoryHandler::processPlayerInventoryRemove(Net::MessageIn &msg) { int index, amount; - Inventory *inventory = 0; + Inventory *inventory = nullptr; if (player_node) inventory = PlayerInfo::getInventory(); @@ -367,7 +367,7 @@ void InventoryHandler::processPlayerInventoryRemove(Net::MessageIn &msg) void InventoryHandler::processPlayerInventoryUse(Net::MessageIn &msg) { int index, amount; - Inventory *inventory = 0; + Inventory *inventory = nullptr; if (player_node) inventory = PlayerInfo::getInventory(); @@ -392,7 +392,7 @@ void InventoryHandler::processPlayerInventoryUse(Net::MessageIn &msg) void InventoryHandler::processItemUseResponse(Net::MessageIn &msg) { int index, amount; - Inventory *inventory = 0; + Inventory *inventory = nullptr; if (player_node) inventory = PlayerInfo::getInventory(); @@ -499,13 +499,13 @@ void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED) { // Storage access has been closed // Storage window deletes itself - mStorageWindow = 0; + mStorageWindow = nullptr; if (mStorage) mStorage->clear(); delete mStorage; - mStorage = 0; + mStorage = nullptr; } void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) @@ -514,7 +514,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) int number; unsigned char identified; - Inventory *inventory = 0; + Inventory *inventory = nullptr; if (player_node) inventory = PlayerInfo::getInventory(); |