From ef8adcc51f60fbadc87f1dee18bc264bc0068cce Mon Sep 17 00:00:00 2001 From: helixhorned Date: Wed, 22 Aug 2012 22:47:16 +0000 Subject: [PATCH] Don't clear loogie tint transiently on changing palette. git-svn-id: https://svn.eduke32.com/eduke32@2953 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 8ced48743..8babb27ec 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -2619,6 +2619,19 @@ void G_DisplayRest(int32_t smoothratio) Bmemcpy(&tempFade, &pp2->pals, sizeof(palette_t)); applyTint = 1; } + // loogies courtesy of being snotted on + else if (pp->pals.f==0 && pp->loogcnt > 0) + { + palette_t lp = { 0, 64, 0, pp->loogcnt>>1 }; + Bmemcpy(&tempFade, &lp, sizeof(palette_t)); + applyTint = 1; + } + else if (pp2 && pp2->pals.f==0 && pp2->loogcnt > 0) + { + palette_t lp = { 0, 64, 0, pp2->loogcnt>>1 }; + Bmemcpy(&tempFade, &lp, sizeof(palette_t)); + applyTint = 1; + } if (g_restorePalette) { @@ -2637,19 +2650,6 @@ void G_DisplayRest(int32_t smoothratio) omovethingscnt = g_moveThingsCount; } } - // loogies courtesy of being snotted on - else if (pp->pals.f==0 && pp->loogcnt > 0) - { - palette_t lp = { 0, 64, 0, pp->loogcnt>>1 }; - Bmemcpy(&tempFade, &lp, sizeof(palette_t)); - applyTint = 1; - } - else if (pp2 && pp2->pals.f==0 && pp2->loogcnt > 0) - { - palette_t lp = { 0, 64, 0, pp2->loogcnt>>1 }; - Bmemcpy(&tempFade, &lp, sizeof(palette_t)); - applyTint = 1; - } if (tempFade.f > 0 /*tempTint.f*/) Bmemcpy(&tempTint, &tempFade, sizeof(palette_t));