From fd78cb57c1c5e18dcf84c55a1c1c5c31c27de6eb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 23 Dec 2021 22:51:26 +0100
Subject: [PATCH] - fixed some bad flag replacements.

0x7fff is not ~CSTAT_SPRITE_BLOCK but ~CSTAT_SPRITE_INVISIBLE.
---
 source/games/exhumed/src/grenade.cpp | 2 +-
 source/games/exhumed/src/lion.cpp    | 2 +-
 source/games/exhumed/src/player.cpp  | 6 +++---
 source/games/exhumed/src/ra.cpp      | 2 +-
 source/games/exhumed/src/ramses.cpp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/games/exhumed/src/grenade.cpp b/source/games/exhumed/src/grenade.cpp
index fa80afe66..2a75a49a8 100644
--- a/source/games/exhumed/src/grenade.cpp
+++ b/source/games/exhumed/src/grenade.cpp
@@ -67,7 +67,7 @@ void ThrowGrenade(int nPlayer, int, int, int ecx, int push1)
         nAngle = pPlayerActor->spr.ang;
     }
 
-    pActor->spr.cstat &= ~CSTAT_SPRITE_BLOCK;
+    pActor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
     pActor->spr.ang = nAngle;
 
     if (push1 >= -3000)
diff --git a/source/games/exhumed/src/lion.cpp b/source/games/exhumed/src/lion.cpp
index 54205fd6f..11f558de0 100644
--- a/source/games/exhumed/src/lion.cpp
+++ b/source/games/exhumed/src/lion.cpp
@@ -307,7 +307,7 @@ void AILion::Tick(RunListEvent* ev)
                 if (pActor->spr.cstat & CSTAT_SPRITE_INVISIBLE)
                 {
                     pActor->nAction = 9;
-                    pActor->spr.cstat &= ~CSTAT_SPRITE_BLOCK;
+                    pActor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
                     pActor->spr.xvel = 0;
                     pActor->spr.yvel = 0;
                 }
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index b5f0b1d6f..4db075315 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -480,7 +480,7 @@ void StartDeathSeq(int nPlayer, int nVal)
     PlayerList[nPlayer].nInvisible = 0;
     dVertPan[nPlayer] = 15;
 
-    pActor->spr.cstat &= ~CSTAT_SPRITE_BLOCK;
+    pActor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
 
     SetNewWeaponImmediate(nPlayer, -2);
 
@@ -803,11 +803,11 @@ void AIPlayer::Tick(RunListEvent* ev)
         PlayerList[nPlayer].nInvisible--;
         if (PlayerList[nPlayer].nInvisible == 0)
         {
-            pPlayerActor->spr.cstat &= ~CSTAT_SPRITE_BLOCK; // set visible
+            pPlayerActor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE; // set visible
             DExhumedActor* pFloorSprite = PlayerList[nPlayer].pPlayerFloorSprite;
 
             if (pFloorSprite != nullptr) {
-                pFloorSprite->spr.cstat &= ~CSTAT_SPRITE_BLOCK; // set visible
+                pFloorSprite->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE; // set visible
             }
         }
         else if (PlayerList[nPlayer].nInvisible == 150 && nPlayer == nLocalPlayer)
diff --git a/source/games/exhumed/src/ra.cpp b/source/games/exhumed/src/ra.cpp
index e359f7795..190c95cad 100644
--- a/source/games/exhumed/src/ra.cpp
+++ b/source/games/exhumed/src/ra.cpp
@@ -210,7 +210,7 @@ void AIRa::Tick(RunListEvent* ev)
         }
         else
         {
-            pActor->spr.cstat &= ~CSTAT_SPRITE_BLOCK;
+            pActor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
             Ra[nPlayer].nAction = 1;
             Ra[nPlayer].nFrame = 0;
         }
diff --git a/source/games/exhumed/src/ramses.cpp b/source/games/exhumed/src/ramses.cpp
index 3239e2e4d..f433ef241 100644
--- a/source/games/exhumed/src/ramses.cpp
+++ b/source/games/exhumed/src/ramses.cpp
@@ -126,7 +126,7 @@ void InitSpiritHead()
     // work tile is twice as big as the normal head size
 	Worktile = TileFiles.tileCreate(kTileRamsesWorkTile, kSpiritY * 2, kSpiritX * 2);
 
-    pSpiritSpr->spr.cstat &= ~CSTAT_SPRITE_BLOCK;
+    pSpiritSpr->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
 
     nHeadTimeStart = PlayClock;