diff options
| author | Strangerke | 2016-09-12 22:20:31 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-12 22:37:51 +0200 |
| commit | 4e28542029792a495a4420e5feda6030c67365da (patch) | |
| tree | 5689fde78ee557989296917185c0447a316c2064 /engines/dm/dungeonman.cpp | |
| parent | 668142e9055f491159d552ae0df27fa5c752f4f3 (diff) | |
| download | scummvm-rg350-4e28542029792a495a4420e5feda6030c67365da.tar.gz scummvm-rg350-4e28542029792a495a4420e5feda6030c67365da.tar.bz2 scummvm-rg350-4e28542029792a495a4420e5feda6030c67365da.zip | |
DM: Rename some enums in DungeonMan
Diffstat (limited to 'engines/dm/dungeonman.cpp')
| -rw-r--r-- | engines/dm/dungeonman.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp index 74979850ef..a9658b8222 100644 --- a/engines/dm/dungeonman.cpp +++ b/engines/dm/dungeonman.cpp @@ -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: |