From 81ecdf4b51d24153df4e7cad1154f2b80e57759b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 23 Aug 2015 17:00:05 -0400 Subject: SHERLOCK: SS: Rename mirror-related methods --- engines/sherlock/scalpel/scalpel.cpp | 6 +++--- engines/sherlock/scalpel/scalpel.h | 6 +++--- engines/sherlock/scalpel/scalpel_scene.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index af9d613cce..fc8b1e609a 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -1062,7 +1062,7 @@ void ScalpelEngine::startScene() { _mapResult = _scene->_goToScene; } -void ScalpelEngine::eraseMirror12() { +void ScalpelEngine::eraseBrumwellMirror() { Common::Point pt((*_people)[HOLMES]._position.x / FIXED_INT_MULTIPLIER, (*_people)[HOLMES]._position.y / FIXED_INT_MULTIPLIER); // If player is in range of the mirror, then restore background from the secondary back buffer @@ -1072,7 +1072,7 @@ void ScalpelEngine::eraseMirror12() { } } -void ScalpelEngine::doMirror12() { +void ScalpelEngine::doBrumwellMirror() { People &people = *_people; Person &player = people[HOLMES]; @@ -1147,7 +1147,7 @@ void ScalpelEngine::doMirror12() { } } -void ScalpelEngine::flushMirror12() { +void ScalpelEngine::flushBrumwellMirror() { Common::Point pt((*_people)[HOLMES]._position.x / FIXED_INT_MULTIPLIER, (*_people)[HOLMES]._position.y / FIXED_INT_MULTIPLIER); // If player is in range of the mirror, then draw the entire mirror area to the screen diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h index 2635c2ee51..cb1cb20492 100644 --- a/engines/sherlock/scalpel/scalpel.h +++ b/engines/sherlock/scalpel/scalpel.h @@ -113,17 +113,17 @@ public: /** * Takes care of clearing the mirror in scene 12 (mansion drawing room), in case anything drew over it */ - void eraseMirror12(); + void eraseBrumwellMirror(); /** * Takes care of drawing Holme's reflection onto the mirror in scene 12 (mansion drawing room) */ - void doMirror12(); + void doBrumwellMirror(); /** * This clears the mirror in scene 12 (mansion drawing room) in case anything messed draw over it */ - void flushMirror12(); + void flushBrumwellMirror(); }; } // End of namespace Scalpel diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp index e4c938f56c..999393fdcb 100644 --- a/engines/sherlock/scalpel/scalpel_scene.cpp +++ b/engines/sherlock/scalpel/scalpel_scene.cpp @@ -226,7 +226,7 @@ void ScalpelScene::doBgAnim() { } if (_currentScene == DRAWING_ROOM) - vm.eraseMirror12(); + vm.eraseBrumwellMirror(); // Restore the back buffer from the back buffer 2 in the changed area Common::Rect bounds(people[HOLMES]._oldPosition.x, people[HOLMES]._oldPosition.y, @@ -298,7 +298,7 @@ void ScalpelScene::doBgAnim() { checkBgShapes(); if (_currentScene == DRAWING_ROOM) - vm.doMirror12(); + vm.doBrumwellMirror(); // Draw all active shapes which are behind the person for (uint idx = 0; idx < _bgShapes.size(); ++idx) { @@ -408,7 +408,7 @@ void ScalpelScene::doBgAnim() { } if (_currentScene == DRAWING_ROOM) - vm.flushMirror12(); + vm.flushBrumwellMirror(); for (uint idx = 0; idx < _bgShapes.size(); ++idx) { Object &o = _bgShapes[idx]; -- cgit v1.2.3