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/inventory.cpp | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | mv-stripped1.1.11.12.tar.gz mv-stripped1.1.11.12.tar.bz2 mv-stripped1.1.11.12.tar.xz mv-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/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index f907b2cc2..4521613ba 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -51,7 +51,7 @@ Inventory::Inventory(int type, int size): mUsed(0) { mItems = new Item*[mSize]; - std::fill_n(mItems, mSize, static_cast<Item*>(0)); + std::fill_n(mItems, mSize, static_cast<Item*>(nullptr)); } Inventory::~Inventory() @@ -60,7 +60,7 @@ Inventory::~Inventory() delete mItems[i]; delete [] mItems; - mItems = 0; + mItems = nullptr; } Item *Inventory::getItem(int index) const @@ -68,7 +68,7 @@ Item *Inventory::getItem(int index) const if (index < 0 || index >= static_cast<int>(mSize) || !mItems[index] || mItems[index]->getQuantity() <= 0) { - return 0; + return nullptr; } return mItems[index]; @@ -88,7 +88,7 @@ Item *Inventory::findItem(int itemId, unsigned char color) const } } - return 0; + return nullptr; } void Inventory::addItem(int id, int quantity, int refine, @@ -145,7 +145,7 @@ void Inventory::removeItem(int id) void Inventory::removeItemAt(int index) { delete mItems[index]; - mItems[index] = 0; + mItems[index] = nullptr; mUsed--; if (mUsed < 0) // Already at 0, no need to distribute event mUsed = 0; @@ -237,7 +237,7 @@ Item *Inventory::findItemBySprite(std::string spritePath, Gender gender) if (partialIndex != -1) return mItems[partialIndex]; - return 0; + return nullptr; } std::string Inventory::getName() |