diff options
| author | Paul Gilbert | 2015-05-24 23:15:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-24 23:15:33 -0400 |
| commit | ef4d8be853cf681f3c58db6daec78209982e5f5a (patch) | |
| tree | 52d8290e55db9d1a803df15d75a7897b7d868fc1 | |
| parent | 8331fa886f4fa9031de17652632b3a12e1f84f06 (diff) | |
| download | scummvm-rg350-ef4d8be853cf681f3c58db6daec78209982e5f5a.tar.gz scummvm-rg350-ef4d8be853cf681f3c58db6daec78209982e5f5a.tar.bz2 scummvm-rg350-ef4d8be853cf681f3c58db6daec78209982e5f5a.zip | |
SHERLOCK: Fix display of first RT scene background
| -rw-r--r-- | engines/sherlock/scene.cpp | 8 | ||||
| -rw-r--r-- | engines/sherlock/screen.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/sherlock.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/user_interface.cpp | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 0f679d732f..0b4cd4edda 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -615,8 +615,12 @@ bool Scene::loadScene(const Common::String &filename) { if (!_vm->isDemo()) { // Reset the previous map location and position on overhead map map._oldCharPoint = _currentScene; - map._overPos.x = map[_currentScene].x * 100 - 600; - map._overPos.y = map[_currentScene].y * 100 + 900; + + if (IS_SERRATED_SCALPEL) { + map._overPos.x = map[_currentScene].x * 100 - 600; + map._overPos.y = map[_currentScene].y * 100 + 900; + + } } events.clearEvents(); diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp index bb9dbd7ec4..4dd91cfa78 100644 --- a/engines/sherlock/screen.cpp +++ b/engines/sherlock/screen.cpp @@ -182,6 +182,7 @@ void Screen::randomTransition() { Events &events = *_vm->_events; const int TRANSITION_MULTIPLIER = 0x15a4e35; _dirtyRects.clear(); + assert(IS_SERRATED_SCALPEL); for (int idx = 0; idx <= 65535 && !_vm->shouldQuit(); ++idx) { _transitionSeed = _transitionSeed * TRANSITION_MULTIPLIER + 1; diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp index 14f24333e0..497841faac 100644 --- a/engines/sherlock/sherlock.cpp +++ b/engines/sherlock/sherlock.cpp @@ -207,7 +207,9 @@ void SherlockEngine::loadConfig() { ConfMan.registerDefault("font", 1); _screen->setFont(ConfMan.getInt("font")); - _screen->_fadeStyle = ConfMan.getBool("fade_style"); + if (getGameID() == GType_SerratedScalpel) + _screen->_fadeStyle = ConfMan.getBool("fade_style"); + _ui->_helpStyle = ConfMan.getBool("help_style"); _ui->_slideWindows = ConfMan.getBool("window_style"); _people->_portraitsOn = ConfMan.getBool("portraits_on"); diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp index 7a6722a218..4f83e9151a 100644 --- a/engines/sherlock/user_interface.cpp +++ b/engines/sherlock/user_interface.cpp @@ -2304,6 +2304,7 @@ TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm) void TattooUserInterface::handleInput() { // TODO + _vm->_events->pollEventsAndWait(); } } // End of namespace Sherlock |