Lunatic: on palfrom from CON or C, set palsfade{speed,next} and regard prio.

git-svn-id: https://svn.eduke32.com/eduke32@3927 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/source/lunatic/defs.ilua

@@ -1291,8 +1291,12 @@ local player_mt = {
         -- INTERNAL and CON-only.
         _palfrom = function(p, f, r,g,b)
             local pals = p._pals
+            -- Assume that CON's palfrom starts with prio 0 and speed 0.
+            if (pals.f == 0 or p._palsfadeprio <= 0) then
                 pals.f = f
                 pals.r, pals.g, pals.b = r, g, b
+                p._palsfadespeed, p._palsfadenext = 0, 0
+            end
         end,
     },
 

polymer/eduke32/source/lunatic/test.elua

@@ -588,7 +588,7 @@ gameevent
 
         local r, g, b = testbit(neww, 1), testbit(neww, 2), testbit(neww, 4)
         local speed = FADE_SPEED[neww] or 1
-        player[pli]:fadecol(0.5, r, g, b, speed, neww)
+        player[pli]:fadecol(0.5, r, g, b, speed, neww-5)
     end
 }
 

polymer/eduke32/source/player.h

@@ -346,11 +346,20 @@ static inline int32_t A_Shoot(int32_t i, int32_t atwith)
 }
 
 static inline void P_PalFrom(DukePlayer_t *p, uint8_t f, uint8_t r, uint8_t g, uint8_t b)
+{
+#ifdef LUNATIC
+    // Compare with defs.ilua: player[]:_palfrom().
+    if (p->pals.f == 0 || p->palsfadeprio <= 0)
+#endif
     {
         p->pals.f = f;
         p->pals.r = r;
         p->pals.g = g;
         p->pals.b = b;
+#ifdef LUNATIC
+        p->palsfadespeed = p->palsfadenext = 0;
+#endif
+    }
 }
 
 int32_t     A_GetHitscanRange(int32_t i);