From 2394420f48706a0aada931b3313449db54d3515c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 22 Nov 2021 23:16:21 +0100 Subject: [PATCH] - quick replacements --- source/games/exhumed/src/anims.cpp | 10 +++++----- source/games/exhumed/src/anubis.cpp | 2 +- source/games/exhumed/src/bullet.cpp | 4 ++-- source/games/exhumed/src/fish.cpp | 2 +- source/games/exhumed/src/grenade.cpp | 8 ++++---- source/games/exhumed/src/object.cpp | 2 +- source/games/exhumed/src/player.cpp | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source/games/exhumed/src/anims.cpp b/source/games/exhumed/src/anims.cpp index 5d85d4531..641984284 100644 --- a/source/games/exhumed/src/anims.cpp +++ b/source/games/exhumed/src/anims.cpp @@ -147,16 +147,16 @@ void AIAnim::Tick(RunListEvent* ev) pSprite->y = pSpriteB->y; pSprite->z = pSpriteB->z; - if (pSpriteB->sectnum != pSprite->sectnum) + if (pSpriteB->sector() != pSprite->sector()) { - if (!validSectorIndex(pSpriteB->sectnum)) + if (!pSpriteB->sector()) { DestroyAnim(pActor); return; } else { - ChangeActorSect(pActor, pSpriteB->sectnum); + ChangeActorSect(pActor, pSpriteB->sector()); } } @@ -239,11 +239,11 @@ void BuildExplosion(DExhumedActor* pActor) { auto pSprite = &pActor->s(); - int nSector = pSprite->sectnum; + auto pSector = pSprite->sector(); int edx = 36; - if (sector[nSector].Flag & kSectUnderwater) + if (pSector->Flag & kSectUnderwater) { edx = 75; } diff --git a/source/games/exhumed/src/anubis.cpp b/source/games/exhumed/src/anubis.cpp index ff0f94fb9..ddbe664da 100644 --- a/source/games/exhumed/src/anubis.cpp +++ b/source/games/exhumed/src/anubis.cpp @@ -401,7 +401,7 @@ void AIAnubis::Damage(RunListEvent* ev) { if (nAction >= 6 && nAction <= 10) { - auto pDrumActor = insertActor(sp->sectnum, kStatAnubisDrum); + auto pDrumActor = insertActor(sp->sector(), kStatAnubisDrum); auto pDrumSprite = &pDrumActor->s(); pDrumSprite->x = sp->x; diff --git a/source/games/exhumed/src/bullet.cpp b/source/games/exhumed/src/bullet.cpp index f257e8126..8475a70d6 100644 --- a/source/games/exhumed/src/bullet.cpp +++ b/source/games/exhumed/src/bullet.cpp @@ -588,12 +588,12 @@ DExhumedActor* BuildBullet(DExhumedActor* pActor, int nType, int nZOffset, int n sBullet.nType = nType; sBullet.nDoubleDamage = nDoubleDamage; - sBullet.pActor = insertActor(pSprite->sectnum, 200); + sBullet.pActor = insertActor(pSprite->sector(), 200); sBullet.pActor->s().ang = nAngle; int nHeight = GetActorHeight(pTarget); - assert(validSectorIndex(pTargetSprite->sectnum)); + assert(pTargetSprite->sector()); BulletHitsSprite(&sBullet, pActor, pTarget, pTargetSprite->x, pTargetSprite->y, pTargetSprite->z - (nHeight >> 1), pTargetSprite->sectnum); DeleteActor(sBullet.pActor); diff --git a/source/games/exhumed/src/fish.cpp b/source/games/exhumed/src/fish.cpp index 9b58e8165..bb73d35ef 100644 --- a/source/games/exhumed/src/fish.cpp +++ b/source/games/exhumed/src/fish.cpp @@ -44,7 +44,7 @@ void BuildFishLimb(DExhumedActor* pActor, int anim) { auto pSprite = &pActor->s(); - auto pChunkActor = insertActor(pSprite->sectnum, 99); + auto pChunkActor = insertActor(pSprite->sector(), 99); auto pSprite2 = &pChunkActor->s(); pChunkActor->nCount = anim + 40; diff --git a/source/games/exhumed/src/grenade.cpp b/source/games/exhumed/src/grenade.cpp index bdb3be729..33b7abd96 100644 --- a/source/games/exhumed/src/grenade.cpp +++ b/source/games/exhumed/src/grenade.cpp @@ -149,18 +149,18 @@ void ExplodeGrenade(DExhumedActor* pActor) auto pGrenadeSprite = &pActor->s(); int nPlayer = pGrenadeSprite->owner; - int nGrenadeSect = pGrenadeSprite->sectnum; + auto pGrenadeSect = pGrenadeSprite->sector(); pActor->nFrame = 1; - if (sector[nGrenadeSect].Flag & kSectUnderwater) + if (pGrenadeSect->Flag & kSectUnderwater) { var_28 = 75; var_20 = 60; } else { - if (pGrenadeSprite->z < sector[nGrenadeSect].floorz) + if (pGrenadeSprite->z < pGrenadeSect->floorz) { var_20 = 200; var_28 = 36; @@ -186,7 +186,7 @@ void ExplodeGrenade(DExhumedActor* pActor) pGrenadeSprite->x = bcos(nAngle, -5) + pPlayerSprite->x; pGrenadeSprite->y = bsin(nAngle, -5) + pPlayerSprite->y; - ChangeActorSect(pActor, pPlayerSprite->sectnum); + ChangeActorSect(pActor, pPlayerSprite->sector()); if (!PlayerList[nPlayer].invincibility) { PlayerList[nPlayer].nHealth = 1; diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp index 8877fd86e..5f448c5b9 100644 --- a/source/games/exhumed/src/object.cpp +++ b/source/games/exhumed/src/object.cpp @@ -1360,7 +1360,7 @@ int BuildFireBall(DExhumedActor* nSprite, int a, int b) DExhumedActor* BuildSpark(DExhumedActor* pActor, int nVal) { auto pSprite = &pActor->s(); - auto pSpark = insertActor(pSprite->sectnum, 0); + auto pSpark = insertActor(pSprite->sector(), 0); auto spr = &pSpark->s(); diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 5f712bfac..dce021c40 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -1290,9 +1290,9 @@ sectdone: pFloorSprite->x = pPlayerSprite->x; pFloorSprite->y = pPlayerSprite->y; - if (pFloorSprite->sectnum != pPlayerSprite->sectnum) + if (pFloorSprite->sector() != pPlayerSprite->sector()) { - ChangeActorSect(pFloorActor, pPlayerSprite->sectnum); + ChangeActorSect(pFloorActor, pPlayerSprite->sector()); } pFloorSprite->z = pPlayerSprite->sector()->floorz;