diff options
| author | Le Philousophe | 2019-05-20 21:19:53 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-06-01 22:43:48 +0200 |
| commit | 0e0cdbee245dba78d35fab497ba16489fc9e561f (patch) | |
| tree | b928f0c2761374d1061c80928f503363ab2c2259 /engines | |
| parent | 4e955c4776e3a4a8a73704fb04c90674bdac001f (diff) | |
| download | scummvm-rg350-0e0cdbee245dba78d35fab497ba16489fc9e561f.tar.gz scummvm-rg350-0e0cdbee245dba78d35fab497ba16489fc9e561f.tar.bz2 scummvm-rg350-0e0cdbee245dba78d35fab497ba16489fc9e561f.zip | |
CRYOMNI3D: Fix cursor shown too soon in transitions
It had then invalid colors.
Using previous palette in videos improved the situation but it's not
perfect though.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cryomni3d/versailles/engine.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp index 07fcd9c7cf..4088749c9c 100644 --- a/engines/cryomni3d/versailles/engine.cpp +++ b/engines/cryomni3d/versailles/engine.cpp @@ -1000,6 +1000,7 @@ void CryOmni3DEngine_Versailles::executeTransition(unsigned int nextPlaceId) { Common::String warpFile = nextPlace->warps[nextState]; warpFile.toUppercase(); if (warpFile.hasPrefix("NOT_STOP")) { + debug("Got not stop"); unsigned int transitionNum; // Determine transition to take if (nextPlace->getNumTransitions() == 1) { @@ -1015,8 +1016,9 @@ void CryOmni3DEngine_Versailles::executeTransition(unsigned int nextPlaceId) { animationId = determineTransitionAnimation(nextPlaceId, nextNextPlaceId, &transition); animation = animationId == -1u ? "" : transition->animations[animationId]; - animation.toUppercase(); + + debug("Transition animation: %s", animation.c_str()); if (animation.hasPrefix("NOT_FLI")) { return; } @@ -1544,7 +1546,10 @@ void CryOmni3DEngine_Versailles::playInGameVideo(const Common::String &filename, return; } - g_system->showMouse(false); + if (restoreCursorPalette) { + // WORKAROUND: Don't mess with mouse when not restoring cursors palette + g_system->showMouse(false); + } lockPalette(0, 241); // Videos are like music because if you mute music in game it will mute videos soundtracks playHNM(filename, Audio::Mixer::kMusicSoundType, nullptr, @@ -1554,8 +1559,9 @@ void CryOmni3DEngine_Versailles::playInGameVideo(const Common::String &filename, if (restoreCursorPalette) { // Restore cursors colors as 2 first ones may have been erased by the video setPalette(&_cursorPalette[3 * 240], 240, 248); + // WORKAROUND: Don't mess with mouse when not restoring cursors palette + g_system->showMouse(true); } - g_system->showMouse(true); } void CryOmni3DEngine_Versailles::loadBMPs(const char *pattern, Graphics::Surface *bmps, |