diff options
| author | Strangerke | 2016-09-19 07:05:37 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-19 07:06:55 +0200 |
| commit | 1670cb035ffef58af7dff4c87f5408736e10f8ff (patch) | |
| tree | 6d6924e9463e339fa0e4d9e35d6295fe3b1b31a7 /engines/dm/timeline.cpp | |
| parent | 1cf5c7f7c91559962ddd8c43af7bf4ce05deebc3 (diff) | |
| download | scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.tar.gz scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.tar.bz2 scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.zip | |
DM: Change the definition of setMapAndTime, move SoundIndex enum to SoundMan
Diffstat (limited to 'engines/dm/timeline.cpp')
| -rw-r--r-- | engines/dm/timeline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index aed99ac923..49f82892de 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -541,7 +541,7 @@ void Timeline::moveTeleporterOrPitSquareThings(uint16 mapX, uint16 mapY) { newEvent->_Cu._projectile.setMapY(_vm->_moveSens->_moveResultMapY); newEvent->_Cu._projectile.setDir((Direction)_vm->_moveSens->_moveResultDir); newEvent->_Bu._slot = _vm->thingWithNewCell(curThing, _vm->_moveSens->_moveResultCell).toUint16(); - M31_setMap(newEvent->_mapTime, _vm->_moveSens->_moveResultMapIndex); + _vm->setMap(newEvent->_mapTime, _vm->_moveSens->_moveResultMapIndex); } else if (curThingType == kDMThingTypeExplosion) { TimelineEvent *newEvent = _events; for (uint16 i = 0; i < _eventMaxCount; newEvent++, i++) { @@ -549,7 +549,7 @@ void Timeline::moveTeleporterOrPitSquareThings(uint16 mapX, uint16 mapY) { newEvent->_Bu._location._mapX = _vm->_moveSens->_moveResultMapX; newEvent->_Bu._location._mapY = _vm->_moveSens->_moveResultMapY; newEvent->_Cu._slot = _vm->thingWithNewCell(curThing, _vm->_moveSens->_moveResultCell).toUint16(); - M31_setMap(newEvent->_mapTime, _vm->_moveSens->_moveResultMapIndex); + _vm->setMap(newEvent->_mapTime, _vm->_moveSens->_moveResultMapIndex); } } } @@ -749,7 +749,7 @@ void Timeline::processEventSquareCorridor(TimelineEvent *event) { TimelineEvent newEvent; newEvent._type = k65_TMEventTypeEnableGroupGenerator; - _vm->setMapAndTime(newEvent._mapTime, _vm->_dungeonMan->_currMapIndex, _vm->_gameTime + actionTicks); + newEvent._mapTime = _vm->setMapAndTime(_vm->_dungeonMan->_currMapIndex, _vm->_gameTime + actionTicks); newEvent._priority = 0; newEvent._Bu._location._mapX = mapX; newEvent._Bu._location._mapY = mapY; @@ -900,7 +900,7 @@ void Timeline::processEventLight(TimelineEvent *event) { TimelineEvent newEvent; newEvent._type = k70_TMEventTypeLight; newEvent._Bu._lightPower = weakerLightPower; - _vm->setMapAndTime(newEvent._mapTime, _vm->_dungeonMan->_partyMapIndex, _vm->_gameTime + 4); + newEvent._mapTime = _vm->setMapAndTime(_vm->_dungeonMan->_partyMapIndex, _vm->_gameTime + 4); newEvent._priority = 0; addEventGetEventIndex(&newEvent); } |