From 75436815c31d973e492983fbd862a723bb6e0369 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 9 Feb 2012 22:43:06 +0000
Subject: [PATCH] Revert r2303 functionality ("Don't wait for pain tinting to
 subside...")

It was causing update issues when many tints were applied simultaneously,
like being shot and spit at by enforcers while being on rails barefeet.
Also, the GL modes were calling gltexinvalidate8() when picking up goodies
or being hurt with that change, so it needs much more thought.

git-svn-id: https://svn.eduke32.com/eduke32@2322 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/game.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 2155d6748..4153012d9 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -2636,29 +2636,27 @@ void G_DisplayRest(int32_t smoothratio)
     }
 #endif  // USE_OPENGL
 
-    {
-        static int32_t lastpalsf;  // HACK
+//    {
+//        static int32_t lastpalsf;  // HACK
 
         // this does pain tinting etc from the CON
-        if ((pp->pals.f > 0 && pp->loogcnt == 0) || (lastpalsf>0 && pp->pals.f==0)) // JBF 20040101: pals.f > 0 now >= 0
-        {
-            Bmemcpy(&tempFade, &pp->pals, sizeof(palette_t));
-            g_restorePalette = 1;     // JBF 20040101
-            applyTint = 1;
-        }
-
-        lastpalsf = pp->pals.f;
+    if ((pp->pals.f > 0 && pp->loogcnt == 0) /*|| (lastpalsf>0 && pp->pals.f==0)*/) // JBF 20040101: pals.f > 0 now >= 0
+    {
+        Bmemcpy(&tempFade, &pp->pals, sizeof(palette_t));
+        g_restorePalette = 1;     // JBF 20040101
+        applyTint = 1;
     }
-
+//        lastpalsf = pp->pals.f;
+//    }
     // reset a normal palette
-    if (g_restorePalette)
+    else if (g_restorePalette)
     {
         static uint32_t omovethingscnt;
 
         if (g_restorePalette < 2 || omovethingscnt+1 == g_moveThingsCount)
         {
             // g_restorePalette < 0: reset tinting, too (e.g. when loading new game)
-            P_SetGamePalette(pp,pp->palette, 2 + (g_restorePalette>0)*16);
+            P_SetGamePalette(pp,pp->palette, 2 /*+ (g_restorePalette>0)*16*/);
             g_restorePalette = 0;
         }
         else