diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-06-02 00:32:53 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-06-02 16:41:47 +0200 |
| commit | 4e27937924766948d7ff9200f04a37fe4d59018c (patch) | |
| tree | c1f5c255192c85a82c77c2f8f916984e2b863c44 /src/inventory.cpp | |
| parent | c2eab288ecc7d7c5e26d02ccecf285cbc0c218ed (diff) | |
| download | mana-4e27937924766948d7ff9200f04a37fe4d59018c.tar.gz mana-4e27937924766948d7ff9200f04a37fe4d59018c.tar.bz2 mana-4e27937924766948d7ff9200f04a37fe4d59018c.tar.xz mana-4e27937924766948d7ff9200f04a37fe4d59018c.zip | |
Arbitrary code cleanups
Just some stuff that piles up while "looking" at the code, which
eventually gets annoying to ignore while staging real changes.
* Replaced a few NULL occurrences with 0
* Rely on default parameter for std::vector::resize.
* Replaced a few "" with std::string()
* Prefer .empty() to == ""
* Removed a few comparisons with NULL
* Don't check pointers before deleting them
* Removed a bunch of redundant semicolons
* Made some global variables static (local to their compilation unit)
* Prefer prefix ++/-- operators to postfix versions when possible
* Corrected location of a comment
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 25c1ebf7..683251ed 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -119,11 +119,10 @@ void Inventory::removeItemAt(int index) { delete mItems[index]; mItems[index] = 0; - mUsed--; - if (mUsed < 0) // Already at 0, no need to distribute event - mUsed = 0; - else + if (mUsed > 0) { + mUsed--; distributeSlotsChangedEvent(); + } } bool Inventory::contains(Item *item) const |