diff options
| -rw-r--r-- | engines/mads/messages.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/scene.cpp | 2 | ||||
| -rw-r--r-- | engines/mads/scene_data.cpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp index 0e66626bbc..8bdbe72512 100644 --- a/engines/mads/messages.cpp +++ b/engines/mads/messages.cpp @@ -340,7 +340,7 @@ int TextDisplayList::add(int xp, int yp, uint fontColor, int charSpacing, void TextDisplayList::setDirtyAreas() { Scene &scene = _vm->_game->_scene; - for (uint idx = 0, dirtyIdx = DIRTY_AREAS_TEXT_DISPLAY_IDX; dirtyIdx < DIRTY_AREAS_SIZE; ++idx, ++dirtyIdx) { + for (uint idx = 0, dirtyIdx = DIRTY_AREAS_TEXT_DISPLAY_IDX; dirtyIdx < size(); ++idx, ++dirtyIdx) { if (((*this)[idx]._expire >= 0) || !(*this)[idx]._active) scene._dirtyAreas[dirtyIdx]._active = false; else { @@ -353,7 +353,7 @@ void TextDisplayList::setDirtyAreas() { void TextDisplayList::setDirtyAreas2() { Scene &scene = _vm->_game->_scene; - for (uint idx = 0, dirtyIdx = DIRTY_AREAS_TEXT_DISPLAY_IDX; dirtyIdx < DIRTY_AREAS_SIZE; ++idx, ++dirtyIdx) { + for (uint idx = 0, dirtyIdx = DIRTY_AREAS_TEXT_DISPLAY_IDX; idx < size(); ++idx, ++dirtyIdx) { if ((*this)[idx]._active && ((*this)[idx]._expire >= 0)) { scene._dirtyAreas[dirtyIdx].setTextDisplay(&(*this)[idx]); scene._dirtyAreas[dirtyIdx]._textActive = ((*this)[idx]._expire <= 0) ? 0 : 1; diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp index 8521c2e0b4..11a59356c0 100644 --- a/engines/mads/scene.cpp +++ b/engines/mads/scene.cpp @@ -422,7 +422,7 @@ void Scene::doFrame() { } // TODO: Verify correctness of frame wait - + _vm->_events->waitForNextFrame(); } void Scene::drawElements(bool transitionFlag, bool surfaceFlag) { diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp index ed53bca52a..36efcb31de 100644 --- a/engines/mads/scene_data.cpp +++ b/engines/mads/scene_data.cpp @@ -233,7 +233,6 @@ DirtyAreas::DirtyAreas(MADSEngine *vm) : _vm(vm) { } void DirtyAreas::merge(int startIndex, int count) { - error("TODO: DirtyAreas::merge"); if (startIndex >= count) return; |