From 008c93636c706475bccab9fe04bf37657bf16767 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Thu, 16 Aug 2012 21:48:52 +0000 Subject: [PATCH] Clear the screen first in some non-in-game places, also in classic. Compare with revision 2584. git-svn-id: https://svn.eduke32.com/eduke32@2912 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/anim.c | 3 +-- polymer/eduke32/source/game.c | 21 +++++++-------------- polymer/eduke32/source/premap.c | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/polymer/eduke32/source/anim.c b/polymer/eduke32/source/anim.c index 1e86f247a..8baa384c2 100644 --- a/polymer/eduke32/source/anim.c +++ b/polymer/eduke32/source/anim.c @@ -416,8 +416,7 @@ void G_PlayAnim(const char *fn,char t) g_restorePalette = 0; } - if (getrendermode() >= 3) - clearview(0); + clearview(0); rotatesprite_fs(0<<16,0<<16,65536L,512,TILE_ANIM,0,0,2+4+8+16+64+(ud.bgstretch?1024:0)); nextpage(); diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 1782072b3..1aed2be93 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -1926,8 +1926,7 @@ void fadepal(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_ // STEP must evenly divide END-START, i.e. abs(end-start)%step == 0 static void fadepaltile(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t tile) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); // (end-start)/step + 1 iterations do @@ -3010,8 +3009,7 @@ void G_DrawBackground(void) { int32_t bgtile; - if (getrendermode() >= 3) - clearview(0); + clearview(0); // when not rendering a game, fullscreen wipe #define MENUTILE (!getrendermode()?MENUSCREEN:LOADSCREEN) @@ -9131,8 +9129,7 @@ static void G_DisplayLogo(void) //G_FadePalette(0,0,0,63); if (logoflags & LOGO_3DRSCREEN) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); P_SetGamePalette(g_player[myconnectindex].ps, DREALMSPAL, 8+2/*+1*/); // JBF 20040308 fadepal(0,0,0, 0,63,7); @@ -9143,8 +9140,7 @@ static void G_DisplayLogo(void) totalclock = 0; while (totalclock < (120*7) && !I_CheckInputWaiting()) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); rotatesprite_fs(0,0,65536L,0,DREALMS,0,0,2+8+16+64+(ud.bgstretch?1024:0)); @@ -9167,8 +9163,7 @@ static void G_DisplayLogo(void) if (logoflags & LOGO_TITLESCREEN) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); //g_player[myconnectindex].ps->palette = titlepal; P_SetGamePalette(g_player[myconnectindex].ps, TITLEPAL, 8+2/*+1*/); // JBF 20040308 @@ -9180,8 +9175,7 @@ static void G_DisplayLogo(void) while (totalclock < (860+120) && !I_CheckInputWaiting()) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); rotatesprite_fs(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64+(ud.bgstretch?1024:0)); if (logoflags & LOGO_DUKENUKEM) @@ -11269,8 +11263,7 @@ FRAGBONUS: if (g_player[myconnectindex].ps->gm&MODE_EOL) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); rotatesprite_fs(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0)); diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index 2d37a9aa6..740aae7d1 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -359,8 +359,8 @@ static void G_DoLoadScreen(const char *statustext, int32_t percent) if ((uint32_t)j < 2*MAXTILES) { - if (getrendermode() >= 3) - clearview(0); + clearview(0); + rotatesprite_fs(320<<15,200<<15,65536L,0, j > MAXTILES-1?j-MAXTILES:j,0,0, 2+8+64+(ud.bgstretch?1024:0)); }