From 202bf42a120c2d1f89354fc58d77e5c25457af1c Mon Sep 17 00:00:00 2001 From: Lwmte Date: Mon, 13 Sep 2021 02:46:48 +0300 Subject: [PATCH] Rename box --- TR5Main/Game/box.cpp | 40 +++++++++---------- TR5Main/Game/control.cpp | 2 +- TR5Main/Game/floordata.h | 2 +- TR5Main/Game/items.cpp | 2 +- TR5Main/Game/lot.cpp | 2 +- .../Objects/Generic/Doors/generic_doors.cpp | 18 ++++----- TR5Main/Objects/TR3/Entity/tr3_shiva.cpp | 2 +- .../TR5/Object/tr5_expandingplatform.cpp | 2 +- .../Objects/TR5/Object/tr5_pushableblock.cpp | 22 +++++----- .../Objects/TR5/Object/tr5_raisingblock.cpp | 4 +- .../Objects/TR5/Shatter/tr5_smashobject.cpp | 4 +- TR5Main/Specific/level.cpp | 6 +-- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/TR5Main/Game/box.cpp b/TR5Main/Game/box.cpp index 7f5880db2..5d7674fb3 100644 --- a/TR5Main/Game/box.cpp +++ b/TR5Main/Game/box.cpp @@ -118,15 +118,15 @@ bool SameZone(CREATURE_INFO* creature, ITEM_INFO* target) ITEM_INFO* item = &g_Level.Items[creature->itemNum]; ROOM_INFO* room = &g_Level.Rooms[item->roomNumber]; FLOOR_INFO* floor = XZ_GET_SECTOR(room, item->pos.xPos - room->x, item->pos.zPos - room->z); - if (floor->box == NO_BOX) + if (floor->Box == NO_BOX) return false; - item->boxNumber = floor->box; + item->boxNumber = floor->Box; room = &g_Level.Rooms[target->roomNumber]; floor = XZ_GET_SECTOR(room, target->pos.xPos - room->x, target->pos.zPos - room->z); - if (floor->box == NO_BOX) + if (floor->Box == NO_BOX) return false; - target->boxNumber = floor->box; + target->boxNumber = floor->Box; return (zone[item->boxNumber] == zone[target->boxNumber]); } @@ -489,18 +489,18 @@ int CreatureAnimation(short itemNumber, short angle, short tilt) roomNumber = item->roomNumber; GetFloor(old.x, y, old.z, &roomNumber); floor = GetFloor(item->pos.xPos, y, item->pos.zPos, &roomNumber); - height = g_Level.Boxes[floor->box].height; + height = g_Level.Boxes[floor->Box].height; nextHeight = 0; if (!Objects[item->objectNumber].nonLot) { - nextBox = LOT->node[floor->box].exitBox; + nextBox = LOT->node[floor->Box].exitBox; } else { floor = GetFloor(item->pos.xPos, item->pos.yPos, item->pos.zPos, &roomNumber); - height = g_Level.Boxes[floor->box].height; - nextBox = floor->box; + height = g_Level.Boxes[floor->Box].height; + nextBox = floor->Box; } if (nextBox == NO_BOX) @@ -508,7 +508,7 @@ int CreatureAnimation(short itemNumber, short angle, short tilt) else nextHeight = g_Level.Boxes[nextBox].height; - if (floor->box == NO_BOX || !LOT->isJumping && (LOT->fly == NO_FLYING && item->boxNumber != NO_BOX && zone[item->boxNumber] != zone[floor->box] || boxHeight - height > LOT->step || boxHeight - height < LOT->drop)) + if (floor->Box == NO_BOX || !LOT->isJumping && (LOT->fly == NO_FLYING && item->boxNumber != NO_BOX && zone[item->boxNumber] != zone[floor->Box] || boxHeight - height > LOT->step || boxHeight - height < LOT->drop)) { xPos = item->pos.xPos / SECTOR(1); zPos = item->pos.zPos / SECTOR(1); @@ -526,16 +526,16 @@ int CreatureAnimation(short itemNumber, short angle, short tilt) item->pos.zPos = old.z | (WALL_SIZE - 1); floor = GetFloor(item->pos.xPos, y, item->pos.zPos, &roomNumber); - height = g_Level.Boxes[floor->box].height; + height = g_Level.Boxes[floor->Box].height; if (!Objects[item->objectNumber].nonLot) { - nextHeight = LOT->node[floor->box].exitBox; + nextHeight = LOT->node[floor->Box].exitBox; } else { floor = GetFloor(item->pos.xPos, item->pos.yPos, item->pos.zPos, &roomNumber); - height = g_Level.Boxes[floor->box].height; - nextBox = floor->box; + height = g_Level.Boxes[floor->Box].height; + nextBox = floor->Box; } if (nextBox == NO_BOX) @@ -837,16 +837,16 @@ int BadFloor(int x, int y, int z, int boxHeight, int nextHeight, short roomNumbe int height; floor = GetFloor(x, y, z, &roomNumber); - if (floor->box == NO_BOX) + if (floor->Box == NO_BOX) return true; if (LOT->isJumping) return false; - if (g_Level.Boxes[floor->box].flags & LOT->blockMask) + if (g_Level.Boxes[floor->Box].flags & LOT->blockMask) return true; - height = g_Level.Boxes[floor->box].height; + height = g_Level.Boxes[floor->Box].height; if (boxHeight - height > LOT->step || boxHeight - height < LOT->drop) return true; @@ -1423,10 +1423,10 @@ void FindAITargetObject(CREATURE_INFO* creature, short objectNumber) int* zone = g_Level.Zones[creature->LOT.zone][FlipStatus].data(); ROOM_INFO* r = &g_Level.Rooms[item->roomNumber]; - item->boxNumber = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z)->box; + item->boxNumber = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z)->Box; r = &g_Level.Rooms[aiObject->roomNumber]; - aiObject->boxNumber = XZ_GET_SECTOR(r, aiObject->x - r->x, aiObject->z - r->z)->box; + aiObject->boxNumber = XZ_GET_SECTOR(r, aiObject->x - r->x, aiObject->z - r->z)->Box; if (item->boxNumber == NO_BOX || aiObject->boxNumber == NO_BOX) { @@ -1495,7 +1495,7 @@ void CreatureAIInfo(ITEM_INFO* item, AI_INFO* info) item->boxNumber = NO_BOX; FLOOR_INFO* floor = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z); if(floor) - item->boxNumber = floor->box; + item->boxNumber = floor->Box; if (item->boxNumber != NO_BOX) info->zoneNumber = zone[item->boxNumber]; else @@ -1505,7 +1505,7 @@ void CreatureAIInfo(ITEM_INFO* item, AI_INFO* info) enemy->boxNumber = NO_BOX; floor = XZ_GET_SECTOR(r, enemy->pos.xPos - r->x, enemy->pos.zPos - r->z); if(floor) - enemy->boxNumber = floor->box; + enemy->boxNumber = floor->Box; if (enemy->boxNumber != NO_BOX) info->enemyZone = zone[enemy->boxNumber]; else diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control.cpp index 427b43f6d..d8c6df6bf 100644 --- a/TR5Main/Game/control.cpp +++ b/TR5Main/Game/control.cpp @@ -997,7 +997,7 @@ void AlterFloorHeight(ITEM_INFO *item, int height) floor->FloorCollision.Planes[0].z += height; floor->FloorCollision.Planes[1].z += height; - box = &g_Level.Boxes[floor->box]; + box = &g_Level.Boxes[floor->Box]; if (box->flags & BLOCKABLE) { if (height >= 0) diff --git a/TR5Main/Game/floordata.h b/TR5Main/Game/floordata.h index a06c8eacd..bccd623d0 100644 --- a/TR5Main/Game/floordata.h +++ b/TR5Main/Game/floordata.h @@ -28,7 +28,7 @@ class FLOOR_INFO { public: int TriggerIndex; - int box; + int Box; int Material; int Stopper; int floor; diff --git a/TR5Main/Game/items.cpp b/TR5Main/Game/items.cpp index faf3d2214..0ba0dcf87 100644 --- a/TR5Main/Game/items.cpp +++ b/TR5Main/Game/items.cpp @@ -408,7 +408,7 @@ void InitialiseItem(short itemNum) FLOOR_INFO* floor = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z); item->floor = floor->floor * 256; - item->boxNumber = floor->box; + item->boxNumber = floor->Box; if (Objects[item->objectNumber].initialise != NULL) { diff --git a/TR5Main/Game/lot.cpp b/TR5Main/Game/lot.cpp index 59a829f33..0c63b6dec 100644 --- a/TR5Main/Game/lot.cpp +++ b/TR5Main/Game/lot.cpp @@ -294,7 +294,7 @@ void CreateZone(ITEM_INFO* item) CREATURE_INFO* creature = (CREATURE_INFO*)item->data; ROOM_INFO* r = &g_Level.Rooms[item->roomNumber]; - item->boxNumber = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z)->box; + item->boxNumber = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z)->Box; if (creature->LOT.fly) { diff --git a/TR5Main/Objects/Generic/Doors/generic_doors.cpp b/TR5Main/Objects/Generic/Doors/generic_doors.cpp index 472fe8552..5a94dfcf8 100644 --- a/TR5Main/Objects/Generic/Doors/generic_doors.cpp +++ b/TR5Main/Objects/Generic/Doors/generic_doors.cpp @@ -75,11 +75,11 @@ namespace TEN::Entities::Doors door->d1.floor = &r->floor[(item->pos.zPos - r->z) / SECTOR(1) + dz + ((item->pos.xPos - r->x) / SECTOR(1) + dx) * r->xSize]; roomNumber = door->d1.floor->WallPortal; if (roomNumber == NO_ROOM) - boxNumber = door->d1.floor->box; + boxNumber = door->d1.floor->Box; else { b = &g_Level.Rooms[roomNumber]; - boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + dz + ((item->pos.xPos - b->x) / SECTOR(1) + dx) * b->xSize].box; + boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + dz + ((item->pos.xPos - b->x) / SECTOR(1) + dx) * b->xSize].Box; } door->d1.block = (boxNumber != NO_BOX && g_Level.Boxes[boxNumber].flags & BLOCKABLE) ? boxNumber : NO_BOX; @@ -92,11 +92,11 @@ namespace TEN::Entities::Doors door->d1flip.floor = &r->floor[(item->pos.zPos - r->z) / SECTOR(1) + dz + ((item->pos.xPos - r->x) / SECTOR(1) + dx) * r->xSize]; roomNumber = door->d1flip.floor->WallPortal; if (roomNumber == NO_ROOM) - boxNumber = door->d1flip.floor->box; + boxNumber = door->d1flip.floor->Box; else { b = &g_Level.Rooms[roomNumber]; - boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + dz + ((item->pos.xPos - b->x) / SECTOR(1) + dx) * b->xSize].box; + boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + dz + ((item->pos.xPos - b->x) / SECTOR(1) + dx) * b->xSize].Box; } door->d1flip.block = (boxNumber != NO_BOX && g_Level.Boxes[boxNumber].flags & BLOCKABLE) ? boxNumber : NO_BOX; @@ -122,11 +122,11 @@ namespace TEN::Entities::Doors door->d2.floor = &r->floor[(item->pos.zPos - r->z) / SECTOR(1) + (item->pos.xPos - r->x) / SECTOR(1) * r->xSize]; roomNumber = door->d2.floor->WallPortal; if (roomNumber == NO_ROOM) - boxNumber = door->d2.floor->box; + boxNumber = door->d2.floor->Box; else { b = &g_Level.Rooms[roomNumber]; - boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + (item->pos.xPos - b->x) / SECTOR(1) * b->xSize].box; + boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + (item->pos.xPos - b->x) / SECTOR(1) * b->xSize].Box; } door->d2.block = (boxNumber != NO_BOX && g_Level.Boxes[boxNumber].flags & BLOCKABLE) ? boxNumber : NO_BOX; @@ -139,11 +139,11 @@ namespace TEN::Entities::Doors door->d2flip.floor = &r->floor[(item->pos.zPos - r->z) / SECTOR(1) + (item->pos.xPos - r->x) / SECTOR(1) * r->xSize]; roomNumber = door->d2flip.floor->WallPortal; if (roomNumber == NO_ROOM) - boxNumber = door->d2flip.floor->box; + boxNumber = door->d2flip.floor->Box; else { b = &g_Level.Rooms[roomNumber]; - boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + (item->pos.xPos - b->x) / SECTOR(1) * b->xSize].box; + boxNumber = b->floor[(item->pos.zPos - b->z) / SECTOR(1) + (item->pos.xPos - b->x) / SECTOR(1) * b->xSize].Box; } door->d2flip.block = (boxNumber != NO_BOX && g_Level.Boxes[boxNumber].flags & BLOCKABLE) ? boxNumber : NO_BOX; @@ -437,7 +437,7 @@ namespace TEN::Entities::Doors if (floor) { - floor->box = NO_BOX; + floor->Box = NO_BOX; floor->TriggerIndex = 0; // FIXME: HACK!!!!!!! diff --git a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp index af657f987..e592a237b 100644 --- a/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp +++ b/TR5Main/Objects/TR3/Entity/tr3_shiva.cpp @@ -242,7 +242,7 @@ void ShivaControl(short itemNum) z = item->pos.zPos + WALL_SIZE * phd_cos(item->pos.yRot + 0x8000); floor = GetFloor(x, item->pos.yPos, z, &roomNumber); - if (!shiva->flags && floor->box != NO_BOX && !(g_Level.Boxes[floor->box].flags & BLOCKABLE)) + if (!shiva->flags && floor->Box != NO_BOX && !(g_Level.Boxes[floor->Box].flags & BLOCKABLE)) item->goalAnimState = 8; else item->goalAnimState = 2; diff --git a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp index afd278b00..c87c39ad9 100644 --- a/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp @@ -16,7 +16,7 @@ void InitialiseExpandingPlatform(short itemNumber) short roomNumber = item->roomNumber; FLOOR_INFO* floor = GetFloor(item->pos.xPos, item->pos.yPos, item->pos.zPos, &roomNumber); - g_Level.Boxes[floor->box].flags &= ~BLOCKED; + g_Level.Boxes[floor->Box].flags &= ~BLOCKED; if (item->triggerFlags < 0) { diff --git a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp index aa2e606e8..7c1aa4306 100644 --- a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp @@ -24,40 +24,40 @@ int DoPushPull = 0; void ClearMovableBlockSplitters(int x, int y, int z, short roomNumber) { FLOOR_INFO* floor = GetFloor(x, y, z, &roomNumber); - if (floor->box == NO_BOX) + if (floor->Box == NO_BOX) return; - g_Level.Boxes[floor->box].flags &= (~BLOCKED); - short height = g_Level.Boxes[floor->box].height; + g_Level.Boxes[floor->Box].flags &= (~BLOCKED); + short height = g_Level.Boxes[floor->Box].height; short baseRoomNumber = roomNumber; floor = GetFloor(x + 1024, y, z, &roomNumber); - if (floor->box != NO_BOX) + if (floor->Box != NO_BOX) { - if (g_Level.Boxes[floor->box].height == height && (g_Level.Boxes[floor->box].flags & BLOCKABLE) && (g_Level.Boxes[floor->box].flags & BLOCKED)) + if (g_Level.Boxes[floor->Box].height == height && (g_Level.Boxes[floor->Box].flags & BLOCKABLE) && (g_Level.Boxes[floor->Box].flags & BLOCKED)) ClearMovableBlockSplitters(x + 1024, y, z, roomNumber); } roomNumber = baseRoomNumber; floor = GetFloor(x - 1024, y, z, &roomNumber); - if (floor->box != NO_BOX) + if (floor->Box != NO_BOX) { - if (g_Level.Boxes[floor->box].height == height && (g_Level.Boxes[floor->box].flags & BLOCKABLE) && (g_Level.Boxes[floor->box].flags & BLOCKED)) + if (g_Level.Boxes[floor->Box].height == height && (g_Level.Boxes[floor->Box].flags & BLOCKABLE) && (g_Level.Boxes[floor->Box].flags & BLOCKED)) ClearMovableBlockSplitters(x - 1024, y, z, roomNumber); } roomNumber = baseRoomNumber; floor = GetFloor(x, y, z + 1024, &roomNumber); - if (floor->box != NO_BOX) + if (floor->Box != NO_BOX) { - if (g_Level.Boxes[floor->box].height == height && (g_Level.Boxes[floor->box].flags & BLOCKABLE) && (g_Level.Boxes[floor->box].flags & BLOCKED)) + if (g_Level.Boxes[floor->Box].height == height && (g_Level.Boxes[floor->Box].flags & BLOCKABLE) && (g_Level.Boxes[floor->Box].flags & BLOCKED)) ClearMovableBlockSplitters(x, y, z + 1024, roomNumber); } roomNumber = baseRoomNumber; floor = GetFloor(x, y, z - 1024, &roomNumber); - if (floor->box != NO_BOX) + if (floor->Box != NO_BOX) { - if (g_Level.Boxes[floor->box].height == height && (g_Level.Boxes[floor->box].flags & BLOCKABLE) && (g_Level.Boxes[floor->box].flags & BLOCKED)) + if (g_Level.Boxes[floor->Box].height == height && (g_Level.Boxes[floor->Box].flags & BLOCKABLE) && (g_Level.Boxes[floor->Box].flags & BLOCKED)) ClearMovableBlockSplitters(x, y, z - 1024, roomNumber); } } diff --git a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp index 3b4a916c4..63faa8886 100644 --- a/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp @@ -14,8 +14,8 @@ void InitialiseRaisingBlock(short itemNumber) short roomNumber = item->roomNumber; FLOOR_INFO* floor = GetFloor(item->pos.xPos, item->pos.yPos, item->pos.zPos, &roomNumber); - if(floor->box != NO_BOX) - g_Level.Boxes[floor->box].flags &= ~BLOCKED; + if(floor->Box != NO_BOX) + g_Level.Boxes[floor->Box].flags &= ~BLOCKED; if (item->triggerFlags < 0) { diff --git a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp index cee6ea950..41032ebec 100644 --- a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp +++ b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp @@ -15,7 +15,7 @@ void InitialiseSmashObject(short itemNumber) ROOM_INFO* r = &g_Level.Rooms[item->roomNumber]; FLOOR_INFO* floor = XZ_GET_SECTOR(r, item->pos.xPos - r->x, item->pos.zPos - r->z); - BOX_INFO* box = &g_Level.Boxes[floor->box]; + BOX_INFO* box = &g_Level.Boxes[floor->Box]; if (box->flags & 0x8000) box->flags |= BLOCKED; } @@ -26,7 +26,7 @@ void SmashObject(short itemNumber) ROOM_INFO* r = &g_Level.Rooms[item->roomNumber]; int sector = ((item->pos.zPos - r->z) / 1024) + r->xSize * ((item->pos.xPos - r->x) / 1024); - BOX_INFO* box = &g_Level.Boxes[r->floor[sector].box]; + BOX_INFO* box = &g_Level.Boxes[r->floor[sector].Box]; if (box->flags & 0x8000) box->flags &= ~BOX_BLOCKED; diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index 57bbd2264..d01540743 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -140,10 +140,10 @@ int LoadItems() { FLOOR_INFO* floor = &r.floor[((mesh.z - r.z) / 1024) + r.xSize * ((mesh.x - r.x) / 1024)]; - if (floor->box == NO_BOX) + if (floor->Box == NO_BOX) continue; - if (!(g_Level.Boxes[floor->box].flags & BLOCKED)) + if (!(g_Level.Boxes[floor->Box].flags & BLOCKED)) { int fl = floor->floor * 4; STATIC_INFO* st = &StaticObjects[mesh.staticNumber]; @@ -645,7 +645,7 @@ void ReadRooms() FLOOR_INFO floor; floor.TriggerIndex = ReadInt32(); - floor.box = ReadInt32(); + floor.Box = ReadInt32(); floor.Material = ReadInt32(); floor.Stopper = ReadInt32(); floor.floor = ReadInt32();