diff options
| author | Paul Gilbert | 2018-03-31 18:39:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-03-31 18:39:42 -0400 |
| commit | b6fc3fd99195f2cbc1e17ea6827175855df8f8cc (patch) | |
| tree | bcfde66f5491df48d4c241ef69618f197133882f /engines/xeen/combat.cpp | |
| parent | 263df996b60ea9b505be18f5eeeb3ce4c27d0fd2 (diff) | |
| download | scummvm-rg350-b6fc3fd99195f2cbc1e17ea6827175855df8f8cc.tar.gz scummvm-rg350-b6fc3fd99195f2cbc1e17ea6827175855df8f8cc.tar.bz2 scummvm-rg350-b6fc3fd99195f2cbc1e17ea6827175855df8f8cc.zip | |
XEEN: Change many item Id checks to use empty() function
Diffstat (limited to 'engines/xeen/combat.cpp')
| -rw-r--r-- | engines/xeen/combat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index bec9942767..b1ecd7776d 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -1527,7 +1527,7 @@ void Combat::attack2(int damage, RangeType rangeType) { switch (category) { case CATEGORY_WEAPON: for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { - if (party._treasure._weapons[idx]._id == 0) { + if (party._treasure._weapons[idx].empty()) { party._treasure._weapons[idx] = tempChar._weapons[0]; party._treasure._hasItems = true; break; @@ -1536,7 +1536,7 @@ void Combat::attack2(int damage, RangeType rangeType) { break; case CATEGORY_ARMOR: for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { - if (party._treasure._armor[idx]._id == 0) { + if (party._treasure._armor[idx].empty()) { party._treasure._armor[idx] = tempChar._armor[0]; party._treasure._hasItems = true; break; @@ -1545,7 +1545,7 @@ void Combat::attack2(int damage, RangeType rangeType) { break; case CATEGORY_ACCESSORY: for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { - if (party._treasure._accessories[idx]._id == 0) { + if (party._treasure._accessories[idx].empty()) { party._treasure._accessories[idx] = tempChar._accessories[0]; party._treasure._hasItems = true; break; @@ -1554,7 +1554,7 @@ void Combat::attack2(int damage, RangeType rangeType) { break; case CATEGORY_MISC: for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { - if (party._treasure._accessories[idx]._id == 0) { + if (party._treasure._accessories[idx].empty()) { party._treasure._accessories[idx] = tempChar._accessories[0]; party._treasure._hasItems = true; break; |