aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-06-05 22:10:13 -0400
committerPaul Gilbert2013-06-05 22:10:13 -0400
commitf5ed290025ce2825fcdcc549ea6a1f651502bc44 (patch)
treec26c50129bdd5f4e8976816d450d136771044dd2
parent6bce04959b05805829abf3382e699391f165f0fa (diff)
downloadscummvm-rg350-f5ed290025ce2825fcdcc549ea6a1f651502bc44.tar.gz
scummvm-rg350-f5ed290025ce2825fcdcc549ea6a1f651502bc44.tar.bz2
scummvm-rg350-f5ed290025ce2825fcdcc549ea6a1f651502bc44.zip
VOYEUR: Minor palette load bugfixes. First screen is now partly showing
-rw-r--r--engines/voyeur/files.cpp3
-rw-r--r--engines/voyeur/voyeur.cpp6
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 4970fc2d24..9afbe79783 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -770,7 +770,8 @@ FontResource::FontResource(BoltFilesState &state, const byte *src) {
/*------------------------------------------------------------------------*/
CMapResource::CMapResource(BoltFilesState &state, const byte *src): _vm(state._vm) {
- _steps = READ_LE_UINT16(src);
+ _steps = src[0];
+ _fadeStatus = src[1];
_start = READ_LE_UINT16(src + 2);
_end = READ_LE_UINT16(src + 4);
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 18f3edfecc..325d696dd9 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -152,10 +152,10 @@ void VoyeurEngine::doHeadTitle() {
_graphicsManager.flipPage();
_eventsManager.sWaitFlip();
- // Fade in the screen
- CMapResource *cMap = _bVoy->getCMapResource(0x5010000);
+ // Immediate fade in to show the initial screen
+ CMapResource *cMap = _bVoy->getCMapResource(0x5030000);
assert(cMap);
- cMap->_steps = 60;
+ cMap->_steps = 0;
cMap->startFade();
_eventsManager.delay(150);