zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix black screen issue after training level

Browse source
This commit is contained in:
nukeykt 2019-11-22 17:13:27 +09:00 committed by Christoph Oelckers
parent 3977c3e3bd
commit a55ea9a55c
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/exhumed/src/exhumed.cpp
View file

@ -2669,7 +2669,7 @@ int app_main(int argc, char const* const* argv)
} }
MENU: MENU:
SavePosition = -1; SavePosition = -1;
nMenu = menu_Menu(1); // TODO: Revert to 0 after fixing demo playback nMenu = menu_Menu(0);
switch (nMenu) switch (nMenu)
{ {
case -1: case -1:

8
source/exhumed/src/light.cpp
View file

@ -232,6 +232,7 @@ void BlackOut()
curpalettefaded[i].b = 0; curpalettefaded[i].b = 0;
} }
videoUpdatePalette(0, 256); videoUpdatePalette(0, 256);
g_lastpalettesum = -1;
#ifdef USE_OPENGL #ifdef USE_OPENGL
videoTintBlood(0, 0, 0); videoTintBlood(0, 0, 0);
#endif #endif
@ -290,6 +291,7 @@ void DoFadeToRed()
} }
videoUpdatePalette(0, 256); videoUpdatePalette(0, 256);
g_lastpalettesum = -1;
} }
void FadeToWhite() void FadeToWhite()
@ -336,6 +338,7 @@ void FadeToWhite()
} }
videoUpdatePalette(0, 256); videoUpdatePalette(0, 256);
g_lastpalettesum = -1;
WaitTicks(2); WaitTicks(2);
// need to page flip in each iteration of the loop for non DOS version // 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); videoUpdatePalette(0, 256);
g_lastpalettesum = -1;
WaitTicks(2); WaitTicks(2);
// need to page flip in each iteration of the loop for non DOS version // need to page flip in each iteration of the loop for non DOS version
@ -466,6 +470,7 @@ int DoFadeIn()
} }
videoUpdatePalette(0, 256); videoUpdatePalette(0, 256);
g_lastpalettesum = -1;
return v2; return v2;
} }
@ -580,7 +585,10 @@ void FixPalette()
if (videoGetRenderMode() >= REND_POLYMOST) videoTintBlood(rtint, gtint, btint); if (videoGetRenderMode() >= REND_POLYMOST) videoTintBlood(rtint, gtint, btint);
else else
#endif #endif
{
videoUpdatePalette(0, 256); videoUpdatePalette(0, 256);
g_lastpalettesum = -1;
}
} }
void TintPalette(int r, int g, int b) void TintPalette(int r, int g, int b)

7
source/exhumed/src/menu.cpp
View file

@ -1543,10 +1543,11 @@ int menu_Menu(int nVal)
} }
} }
// TODO: Uncomment after fixing demo playback
// menu idle timer // menu idle timer
if (!nVal && (int)totalclock > keytimer) { // if (!nVal && (int)totalclock > keytimer) {
return 9; // return 9;
} // }
// loc_39F54: // loc_39F54:
menu_DoPlasma(); menu_DoPlasma();