diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp index 565ed36c9..f801b4dd2 100644 --- a/source/exhumed/src/exhumed.cpp +++ b/source/exhumed/src/exhumed.cpp @@ -2669,7 +2669,7 @@ int app_main(int argc, char const* const* argv) } MENU: SavePosition = -1; - nMenu = menu_Menu(1); // TODO: Revert to 0 after fixing demo playback + nMenu = menu_Menu(0); switch (nMenu) { case -1: diff --git a/source/exhumed/src/light.cpp b/source/exhumed/src/light.cpp index 890602ba7..cb9634468 100644 --- a/source/exhumed/src/light.cpp +++ b/source/exhumed/src/light.cpp @@ -232,6 +232,7 @@ void BlackOut() curpalettefaded[i].b = 0; } videoUpdatePalette(0, 256); + g_lastpalettesum = -1; #ifdef USE_OPENGL videoTintBlood(0, 0, 0); #endif @@ -290,6 +291,7 @@ void DoFadeToRed() } videoUpdatePalette(0, 256); + g_lastpalettesum = -1; } void FadeToWhite() @@ -336,6 +338,7 @@ void FadeToWhite() } videoUpdatePalette(0, 256); + g_lastpalettesum = -1; WaitTicks(2); // need to page flip in each iteration of the loop for non DOS version @@ -394,6 +397,7 @@ void FadeOut(int bFadeMusic) } videoUpdatePalette(0, 256); + g_lastpalettesum = -1; WaitTicks(2); // need to page flip in each iteration of the loop for non DOS version @@ -466,6 +470,7 @@ int DoFadeIn() } videoUpdatePalette(0, 256); + g_lastpalettesum = -1; return v2; } @@ -580,7 +585,10 @@ void FixPalette() if (videoGetRenderMode() >= REND_POLYMOST) videoTintBlood(rtint, gtint, btint); else #endif - videoUpdatePalette(0, 256); + { + videoUpdatePalette(0, 256); + g_lastpalettesum = -1; + } } void TintPalette(int r, int g, int b) diff --git a/source/exhumed/src/menu.cpp b/source/exhumed/src/menu.cpp index febf638a4..abd94315b 100644 --- a/source/exhumed/src/menu.cpp +++ b/source/exhumed/src/menu.cpp @@ -1543,10 +1543,11 @@ int menu_Menu(int nVal) } } + // TODO: Uncomment after fixing demo playback // menu idle timer - if (!nVal && (int)totalclock > keytimer) { - return 9; - } + // if (!nVal && (int)totalclock > keytimer) { + // return 9; + // } // loc_39F54: menu_DoPlasma();