diff options
| author | Strangerke | 2016-06-27 23:07:18 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 703fd8aca2e15edc03aa854365e20bfdcf524add (patch) | |
| tree | a25da8c2fdef1fc487f4149023369327ab2d43be | |
| parent | 5859ff8aaf63772a19e3576f24cec24286d98dff (diff) | |
| download | scummvm-rg350-703fd8aca2e15edc03aa854365e20bfdcf524add.tar.gz scummvm-rg350-703fd8aca2e15edc03aa854365e20bfdcf524add.tar.bz2 scummvm-rg350-703fd8aca2e15edc03aa854365e20bfdcf524add.zip | |
DM: Fix bug in getIconIndex
| -rw-r--r-- | engines/dm/objectman.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index d20c235aa0..c92427bf4b 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -108,9 +108,9 @@ IconIndice ObjectMan::getIconIndex(Thing thing) { IconIndice iconIndex = getObjectType(thing); if ((iconIndex != kIconIndiceNone) && - ((iconIndex < kIconIndiceWeaponDagger) && (iconIndex >= kIconIndiceJunkCompassNorth)) || // < instead of <= is no error - ((iconIndex >= kIconIndicePotionMaPotionMonPotion) && (iconIndex <= kIconIndicePotionWaterFlask)) || - (iconIndex == kIconIndicePotionEmptyFlask) + (((iconIndex < kIconIndiceWeaponDagger) && (iconIndex >= kIconIndiceJunkCompassNorth)) || // < instead of <= is no error + ((iconIndex >= kIconIndicePotionMaPotionMonPotion) && (iconIndex <= kIconIndicePotionWaterFlask)) || + (iconIndex == kIconIndicePotionEmptyFlask)) ) { uint16 *rawType = _vm->_dungeonMan->getThingData(thing); switch (iconIndex) { |