thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DM: Rename some enums in DungeonMan

Browse source
This commit is contained in:
Strangerke 2016-09-12 22:20:31 +02:00
parent 668142e905
commit 4e28542029
8 changed files with 69 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/dm/dungeonman.cpp
View file

@ -1257,7 +1257,7 @@ uint16 DungeonMan::getObjectWeight(Thing thing) {
break;
case kDMThingTypeJunk:
weight = junkInfo[junk->getType()];
if (junk->getType() == k1_JunkTypeWaterskin)
if (junk->getType() == kDMJunkTypeWaterskin)
weight += junk->getChargeCount() << 1;
break;
@ -1270,7 +1270,7 @@ uint16 DungeonMan::getObjectWeight(Thing thing) {
}
break;
case kDMThingTypePotion:
if (((Potion *)junk)->getType() == k20_PotionTypeEmptyFlask)
if (((Potion *)junk)->getType() == kDMPotionTypeEmptyFlask)
weight = 1;
else
weight = 3;
@ -1627,7 +1627,7 @@ Thing DungeonMan::getObjForProjectileLaucherOrObjGen(uint16 iconIndex) {
junkType = kDMWeaponRock;
break;
case kDMIconIndiceJunkBoulder:
junkType = k25_JunkTypeBoulder;
junkType = kDMJunkTypeBoulder;
thingType = kDMThingTypeJunk;
break;
case kDMIconIndiceWeaponArrow: