aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise
diff options
context:
space:
mode:
authorVincent Hamm2007-12-25 19:32:51 +0000
committerVincent Hamm2007-12-25 19:32:51 +0000
commita3f1767009a692d1edaa3d1f0fd29c0de455a95c (patch)
tree08407b03498441ff864a15488eb50e4bc38ac901 /engines/cruise
parent7159cc26df94e5c75c58804c035d8649601d958b (diff)
downloadscummvm-rg350-a3f1767009a692d1edaa3d1f0fd29c0de455a95c.tar.gz
scummvm-rg350-a3f1767009a692d1edaa3d1f0fd29c0de455a95c.tar.bz2
scummvm-rg350-a3f1767009a692d1edaa3d1f0fd29c0de455a95c.zip
Fix title screen regression
svn-id: r29988
Diffstat (limited to 'engines/cruise')
-rw-r--r--engines/cruise/cruise_main.cpp2
-rw-r--r--engines/cruise/function.cpp3
-rw-r--r--engines/cruise/mainDraw.cpp12
3 files changed, 13 insertions, 4 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 9d00c5a543..61bfa3f2e0 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -1797,7 +1797,7 @@ void mainLoop(void) {
if (doFade)
PCFadeFlag = 0;
- if (!PCFadeFlag) {
+ /*if (!PCFadeFlag)*/ {
mainDraw(0);
flipScreen();
}
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 9960500ebf..d620092732 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -547,7 +547,8 @@ int16 Op_FadeOut(void) {
gfxModuleData_flipScreen();
}
- //gfxModuleData_gfxClearFrameBuffer(backgroundPtrtable[masterScreen]);
+ memset(globalScreen, 0, 320 * 200);
+ flip();
fadeFlag = 1;
PCFadeFlag = 1;
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index 943c7954e0..35785ae52a 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -124,6 +124,14 @@ void fadeIn() {
}
void flipScreen(void) {
+ if(switchPal) {
+ for(unsigned long int i=0; i<256*3; i++) {
+ workpal[i] = palScreen[masterScreen][i];
+ }
+ switchPal = 0;
+ gfxModuleData_setPal256(workpal);
+ }
+
SWAP(gfxModuleData.pPage00, gfxModuleData.pPage10);
gfxModuleData_flipScreen();
@@ -1388,9 +1396,9 @@ void mainDraw(int16 param) {
int16 objZ2 = 0;
int16 spriteHeight;
- if (PCFadeFlag) {
+ /*if (PCFadeFlag) {
return;
- }
+ }*/
bgPtr = backgroundPtrtable[masterScreen];