From a0ef54cb542554e68895c18fa9a603c2a58106c7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 19 Nov 2021 19:04:11 +0100 Subject: [PATCH] - remove XSECTOR::reference. --- source/games/blood/src/db.cpp | 8 +------- source/games/blood/src/db.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/source/games/blood/src/db.cpp b/source/games/blood/src/db.cpp index dd6d7ba29..018d0b71c 100644 --- a/source/games/blood/src/db.cpp +++ b/source/games/blood/src/db.cpp @@ -272,7 +272,6 @@ unsigned short dbInsertXSector(int nSector) I_Error("Out of free XSectors"); } memset(&xsector[nXSector], 0, sizeof(XSECTOR)); - xsector[nXSector].reference = nSector; sector[nSector].extra = nXSector; return nXSector; } @@ -280,10 +279,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 < kMaxXSectors; i++) - { - xsector[i].reference = -1; - } initspritelists(); for (int i = 0; i < kMaxSprites; i++) { @@ -689,8 +684,7 @@ void dbLoadMap(const char *pPath, int *pX, int *pY, int *pZ, short *pAngle, int pXSector->bobFloor = bitReader.readUnsigned(1); pXSector->bobCeiling = bitReader.readUnsigned(1); pXSector->bobRotate = bitReader.readUnsigned(1); - xsector[sector[i].extra].reference = i; - xsector[sector[i].extra].busy = IntToFixed(xsector[sector[i].extra].state); + pXSector->busy = IntToFixed(pXSector->state); } } diff --git a/source/games/blood/src/db.h b/source/games/blood/src/db.h index b2fb79cce..038936b4f 100644 --- a/source/games/blood/src/db.h +++ b/source/games/blood/src/db.h @@ -186,7 +186,6 @@ struct XSECTOR { int32_t onFloorZ; uint32_t windVel; // Wind vel (changed from 10 bit to use higher velocity values) - uint16_t reference; uint16_t data; // Data uint16_t txID; // TX ID uint16_t rxID; // RX ID