From 6bf6ac5b34c4d0f005672395545f2dacca9bc967 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 21 Oct 2021 10:55:16 +0200
Subject: [PATCH] - Flashes

---
 source/games/exhumed/src/lighting.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/source/games/exhumed/src/lighting.cpp b/source/games/exhumed/src/lighting.cpp
index d76aea75a..931359681 100644
--- a/source/games/exhumed/src/lighting.cpp
+++ b/source/games/exhumed/src/lighting.cpp
@@ -40,7 +40,8 @@ struct Flash
 {
     int8_t nType;
     int8_t shade;
-    short nIndex;
+    DExhumedActor* pActor;
+    int nIndex;
     int next;
 };
 
@@ -359,7 +360,8 @@ void AddFlash(short nSector, int x, int y, int z, int val)
                 {
                     sFlash[nFlash3].nType = var_20 | 4;
                     sFlash[nFlash3].shade = pSprite->shade;
-                    sFlash[nFlash3].nIndex = pActor->GetSpriteIndex();
+                    sFlash[nFlash3].nIndex = -1;
+                    sFlash[nFlash3].pActor = pActor;
 
                     pSprite->pal += 7;
 
@@ -443,11 +445,12 @@ void UndoFlashes()
 
                 case 3:
                 {
-                    assert(nIndex >= 0 && nIndex < kMaxSprites);
-
-                    if (sprite[nIndex].pal >= 7)
+                    auto ac = sFlash[nFlash].pActor;
+                    if (!ac) continue;
+                    auto sp = &ac->s();
+                    if (sp->pal >= 7)
                     {
-                        pShade = &sprite[nIndex].shade;
+                        pShade = &sp->shade;
                     }
                     else {
                         goto loc_1868A;
@@ -505,10 +508,12 @@ void UndoFlashes()
 
             case 3:
             {
-                if (sprite[nIndex].pal >= 7)
+                auto ac = sFlash[nFlash].pActor;
+                auto sp = &ac->s();
+                if (sp->pal >= 7)
                 {
-                    sprite[nIndex].pal -= 7;
-                    sprite[nIndex].shade = sFlash[nFlash].shade;
+                    sp->pal -= 7;
+                    sp->shade = sFlash[nFlash].shade;
                 }
 
                 break;