From f2043c4e3def9894bb76981eeea4b2d4dd279f48 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 11 Feb 2020 19:29:05 +0100 Subject: [PATCH] - fixed palette in 3D Realms screen and first end-of-episode animation in Duke3D. --- source/duke3d/src/screens.cpp | 14 +------------- source/rr/src/screens.cpp | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp index 5e7894625..40d2f8347 100644 --- a/source/duke3d/src/screens.cpp +++ b/source/duke3d/src/screens.cpp @@ -1179,12 +1179,6 @@ void gameDisplay3DRScreen() videoClearScreen(0); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, DREALMS, 0, 0, 2 + 8 + 64 + BGSTRETCH); gameHandleEvents(); - - if (g_restorePalette) - { - P_SetGamePalette(g_player[myconnectindex].ps, g_player[myconnectindex].ps->palette, 0); - g_restorePalette = 0; - } videoNextPage(); } } @@ -1285,12 +1279,6 @@ void gameDisplayTitleScreen(void) #endif VM_OnEvent(EVENT_LOGO, -1, screenpeek); - if (g_restorePalette) - { - P_SetGamePalette(g_player[myconnectindex].ps, g_player[myconnectindex].ps->palette, 0); - g_restorePalette = 0; - } - videoNextPage(); #ifdef LUNATIC @@ -1436,7 +1424,7 @@ static void G_BonusCutscenes(void) 350, 380, VICTORY1+8, 86, 59 // duplicate row to alleviate overflow in the for loop below "boss" }; - P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, Pal_2D); // JBF 20040308 + P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, Pal_Fullscreen); // JBF 20040308 videoClearScreen(0L); rotatesprite_fs(0, 50<<16, 65536L, 0, VICTORY1, 0, 0, 2+8+16+64+128+BGSTRETCH); videoNextPage(); diff --git a/source/rr/src/screens.cpp b/source/rr/src/screens.cpp index a9202920b..323c1b926 100644 --- a/source/rr/src/screens.cpp +++ b/source/rr/src/screens.cpp @@ -1269,12 +1269,6 @@ void G_DisplayLogo(void) videoClearScreen(0); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, DREALMS, 0, 0, 2 + 8 + 64 + BGSTRETCH); G_HandleAsync(); - - if (g_restorePalette) - { - P_SetGamePalette(g_player[myconnectindex].ps, g_player[myconnectindex].ps->palette, 0); - g_restorePalette = 0; - } videoNextPage(); } } @@ -1361,12 +1355,6 @@ void G_DisplayLogo(void) } } - if (g_restorePalette) - { - P_SetGamePalette(g_player[myconnectindex].ps, g_player[myconnectindex].ps->palette, 0); - g_restorePalette = 0; - } - videoNextPage(); } @@ -1492,7 +1480,7 @@ static void G_BonusCutscenes(void) 350, 380, VICTORY1+8, 86, 59 // duplicate row to alleviate overflow in the for loop below "boss" }; - P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, Pal_2D); // JBF 20040308 + P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, Pal_Fullscreen); // JBF 20040308 videoClearScreen(0L); rotatesprite_fs(0, 50<<16, 65536L, 0, VICTORY1, 0, 0, 2+8+16+64+128+BGSTRETCH); videoNextPage();