aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/dm.cpp
diff options
context:
space:
mode:
authorStrangerke2016-08-25 22:19:34 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit52170d39aef8f0a844831cdb6bd8572210a9bb29 (patch)
treedc256943061bb2aeafe0543857f143a9d69c4659 /engines/dm/dm.cpp
parent938b38a66a87e11bdb6719a22023c0dcede1b5bb (diff)
downloadscummvm-rg350-52170d39aef8f0a844831cdb6bd8572210a9bb29.tar.gz
scummvm-rg350-52170d39aef8f0a844831cdb6bd8572210a9bb29.tar.bz2
scummvm-rg350-52170d39aef8f0a844831cdb6bd8572210a9bb29.zip
DM: Rename ObjectMan and ProjExpl members
Diffstat (limited to 'engines/dm/dm.cpp')
-rw-r--r--engines/dm/dm.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index c82246de38..eb592edc97 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -456,7 +456,7 @@ void DMEngine::gameloop() {
if (_setMousePointerToObjectInMainLoop) {
_setMousePointerToObjectInMainLoop = false;
_eventMan->showMouse();
- _eventMan->setPointerToObject(_objectMan->_g412_objectIconForMousePointer);
+ _eventMan->setPointerToObject(_objectMan->_objectIconForMousePointer);
_eventMan->hideMouse();
}
@@ -1002,14 +1002,14 @@ T0446002:
fuseSequenceUpdate();
for (AL1424_i_Attack = 55; AL1424_i_Attack <= 255; AL1424_i_Attack += 40) {
- _projexpl->f213_explosionCreate(Thing::_explFireBall, AL1424_i_Attack, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
+ _projexpl->createExplosion(Thing::_explFireBall, AL1424_i_Attack, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
fuseSequenceUpdate();
}
_sound->f064_SOUND_RequestPlay_CPSD(k17_soundBUZZ, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k1_soundModePlayIfPrioritized);
L1428_ps_Group->_type = k25_CreatureTypeLordOrder;
fuseSequenceUpdate();
for (AL1424_i_Attack = 55; AL1424_i_Attack <= 255; AL1424_i_Attack += 40) {
- _projexpl->f213_explosionCreate(Thing::_explHarmNonMaterial, AL1424_i_Attack, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
+ _projexpl->createExplosion(Thing::_explHarmNonMaterial, AL1424_i_Attack, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
fuseSequenceUpdate();
}
for (AL1425_i_CycleCount = 4; --AL1425_i_CycleCount; ) {
@@ -1019,8 +1019,8 @@ T0446002:
for (AL1426_i_FuseSequenceUpdateCount = AL1425_i_CycleCount; AL1426_i_FuseSequenceUpdateCount--; fuseSequenceUpdate());
}
}
- _projexpl->f213_explosionCreate(Thing::_explFireBall, 255, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
- _projexpl->f213_explosionCreate(Thing::_explHarmNonMaterial, 255, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
+ _projexpl->createExplosion(Thing::_explFireBall, 255, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
+ _projexpl->createExplosion(Thing::_explHarmNonMaterial, 255, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
fuseSequenceUpdate();
L1428_ps_Group->_type = k26_CreatureTypeGreyLord;
fuseSequenceUpdate();
@@ -1061,7 +1061,7 @@ T0446002:
}
for (AL1424_i_Attack = 55; AL1424_i_Attack <= 255; AL1424_i_Attack += 40) {
- _projexpl->f213_explosionCreate(Thing::_explHarmNonMaterial, AL1424_i_Attack, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
+ _projexpl->createExplosion(Thing::_explHarmNonMaterial, AL1424_i_Attack, L1431_i_LordChaosMapX, L1432_i_LordChaosMapY, k255_CreatureTypeSingleCenteredCreature);
fuseSequenceUpdate();
}