diff options
| author | Strangerke | 2016-07-10 12:23:27 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | af42277a93bfb9286c6487f0820d45899547f55f (patch) | |
| tree | 3cfdee7017e6eb064b281498f9e7eb0ba15ccc92 /engines/dm/objectman.cpp | |
| parent | 2c860f106977677f59c3843312ea19b24bfe5d31 (diff) | |
| download | scummvm-rg350-af42277a93bfb9286c6487f0820d45899547f55f.tar.gz scummvm-rg350-af42277a93bfb9286c6487f0820d45899547f55f.tar.bz2 scummvm-rg350-af42277a93bfb9286c6487f0820d45899547f55f.zip | |
DM: Reduce some variable scopes, silent CppCheck warnings
Diffstat (limited to 'engines/dm/objectman.cpp')
| -rw-r--r-- | engines/dm/objectman.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index 05a86de66a..ea07c582bf 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -138,15 +138,12 @@ IconIndice ObjectMan::f32_getObjectType(Thing thing) { byte g29_ChargeCountToTorchType[16] = {0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3}; // @ G0029_auc_Graphic562_ChargeCountToTorchType IconIndice ObjectMan::f33_getIconIndex(Thing thing) { - int16 L0005_i_IconIndex; - Junk* L0006_ps_Junk; - - - if ((L0005_i_IconIndex = _vm->_objectMan->f32_getObjectType(thing)) != kM1_IconIndiceNone) { + int16 L0005_i_IconIndex = _vm->_objectMan->f32_getObjectType(thing); + if (L0005_i_IconIndex != kM1_IconIndiceNone) { if (((L0005_i_IconIndex < k32_IconIndiceWeaponDagger) && (L0005_i_IconIndex >= k0_IconIndiceJunkCompassNorth)) || ((L0005_i_IconIndex >= k148_IconIndicePotionMaPotionMonPotion) && (L0005_i_IconIndex <= k163_IconIndicePotionWaterFlask)) || (L0005_i_IconIndex == k195_IconIndicePotionEmptyFlask)) { - L0006_ps_Junk = (Junk*)_vm->_dungeonMan->f156_getThingData(thing); + Junk *L0006_ps_Junk = (Junk*)_vm->_dungeonMan->f156_getThingData(thing); switch (L0005_i_IconIndex) { case k0_IconIndiceJunkCompassNorth: L0005_i_IconIndex += _vm->_dungeonMan->_g308_partyDir; |