From 576a473ec8fd9b9cfb22ae86cdad979679e036a4 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 19 Nov 2021 16:59:37 +0100
Subject: [PATCH] -XWALL::references is not needed anymore.

---
 source/games/blood/src/db.cpp       | 8 +-------
 source/games/blood/src/db.h         | 1 -
 source/games/blood/src/loadsave.cpp | 1 -
 source/games/blood/src/nnexts.h     | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/source/games/blood/src/db.cpp b/source/games/blood/src/db.cpp
index e83b22710..71dd61b05 100644
--- a/source/games/blood/src/db.cpp
+++ b/source/games/blood/src/db.cpp
@@ -260,7 +260,6 @@ unsigned short dbInsertXWall(int nWall)
         I_Error("Out of free XWalls");
     }
     memset(&xwall[nXWall], 0, sizeof(XWALL));
-    xwall[nXWall].reference = nWall;
     wall[nWall].extra = nXWall;
     return nXWall;
 }
@@ -281,10 +280,6 @@ unsigned short dbInsertXSector(int nSector)
 void dbInit(void)
 {
     XWallsUsed = XSectorsUsed = 1;  // 0 is not usable because it's the default for 'extra' and some code actually uses it to clobber the contents in here. :(
-    for (int i = 1; i < kMaxXWalls; i++)
-    {
-        xwall[i].reference = -1;
-    }
     for (int i = 1; i < kMaxXSectors; i++)
     {
         xsector[i].reference = -1;
@@ -744,7 +739,7 @@ void dbLoadMap(const char *pPath, int *pX, int *pY, int *pZ, short *pAngle, int
             assert(nCount <= nXWallSize);
             fr.Read(pBuffer, nCount);
             BitReader bitReader(pBuffer, nCount);
-            pXWall->reference = bitReader.readSigned(14);
+            /*pXWall->reference =*/ bitReader.readSigned(14);
             pXWall->state = bitReader.readUnsigned(1);
             pXWall->busy = bitReader.readUnsigned(17);
             pXWall->data = bitReader.readSigned(16);
@@ -775,7 +770,6 @@ void dbLoadMap(const char *pPath, int *pX, int *pY, int *pZ, short *pAngle, int
             pXWall->dudeLockout = bitReader.readUnsigned(1);
             bitReader.readUnsigned(4);
             bitReader.readUnsigned(32);
-            xwall[wall[i].extra].reference = i;
             xwall[wall[i].extra].busy = IntToFixed(xwall[wall[i].extra].state);
 
         }
diff --git a/source/games/blood/src/db.h b/source/games/blood/src/db.h
index 7cc7da907..1d202a910 100644
--- a/source/games/blood/src/db.h
+++ b/source/games/blood/src/db.h
@@ -244,7 +244,6 @@ struct XWALL {
     };
     uint32_t busy;
 
-    int16_t reference;
     int16_t data;               // Data
     uint16_t txID;             // TX ID
     uint16_t rxID;             // RX ID
diff --git a/source/games/blood/src/loadsave.cpp b/source/games/blood/src/loadsave.cpp
index ca28c6ca8..d422b8e1d 100644
--- a/source/games/blood/src/loadsave.cpp
+++ b/source/games/blood/src/loadsave.cpp
@@ -533,7 +533,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, XWALL& w, XWALL* d
 	{
 		arc("flags", w.flags, def->flags)
 			("busy", w.busy, def->busy)
-			("reference", w.reference, def->reference)
 			("data", w.data, def->data)
 			("txid", w.txID, def->txID)
 			("rxid", w.rxID, def->rxID)
diff --git a/source/games/blood/src/nnexts.h b/source/games/blood/src/nnexts.h
index 7bde4b985..20e1afafe 100644
--- a/source/games/blood/src/nnexts.h
+++ b/source/games/blood/src/nnexts.h
@@ -371,7 +371,7 @@ bool condCmp(int val, int arg1, int arg2, int comOp);
 bool condCmpne(int arg1, int arg2, int comOp);
 void condError(DBloodActor* pXCond, const char* pzFormat, ...);
 void condUpdateObjectIndex(DBloodActor* oldplayer, DBloodActor* newplayer);
-DBloodActor* evrListRedirectors(int objType, int objXIndex, DBloodActor* objActor, DBloodActor* pXRedir, int* tx);
+DBloodActor* evrListRedirectors(int objType, int objIndex, DBloodActor* objActor, DBloodActor* pXRedir, int* tx);
 void seqSpawnerOffSameTx(DBloodActor* actor);
 //  -------------------------------------------------------------------------   //
 void aiPatrolSetMarker(DBloodActor* actor);