From 9314d4c77429cedc9c7f7d1c4dda10882a080646 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 28 Aug 2022 11:35:03 +0200 Subject: [PATCH] - yet another batch of wrapper replacements --- source/games/duke/src/sectors.cpp | 10 +++++----- source/games/duke/src/sectors_d.cpp | 4 ++-- source/games/duke/src/sectors_r.cpp | 4 ++-- source/games/duke/src/spawn.cpp | 18 +++++++++--------- source/games/duke/src/spawn_d.cpp | 2 +- source/games/duke/src/spawn_r.cpp | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source/games/duke/src/sectors.cpp b/source/games/duke/src/sectors.cpp index 8f5acfea1..6b97505ec 100644 --- a/source/games/duke/src/sectors.cpp +++ b/source/games/duke/src/sectors.cpp @@ -804,7 +804,7 @@ static void handle_st21(sectortype* sptr, DDukeActor* actor) } else { - if (sptr->int_ceilingz() == sptr->int_floorz()) + if (sptr->ceilingz == sptr->floorz) j = nextsectorneighborzptr(sptr, sptr->int_ceilingz(), Find_FloorDown | Find_Safe)->int_floorz(); else j = sptr->int_ceilingz(); @@ -1161,13 +1161,13 @@ void operateactivators(int low, int plnum) case 0: break; case 1: - if (act->sector()->int_floorz() != act->sector()->int_ceilingz()) + if (act->sector()->floorz != act->sector()->ceilingz) { continue; } break; case 2: - if (act->sector()->int_floorz() == act->sector()->int_ceilingz()) + if (act->sector()->floorz == act->sector()->ceilingz) { continue; } @@ -1283,8 +1283,8 @@ void allignwarpelevators(void) { if ((act2->spr.lotag) == SE_17_WARP_ELEVATOR && act != act2 && act->spr.hitag == act2->spr.hitag) { - act2->sector()->set_int_floorz(act->sector()->int_floorz()); - act2->sector()->set_int_ceilingz(act->sector()->int_ceilingz()); + act2->sector()->floorz = act->sector()->floorz; + act2->sector()->ceilingz = act->sector()->ceilingz; } } } diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp index 172fb0cf3..a0a1f7bce 100644 --- a/source/games/duke/src/sectors_d.cpp +++ b/source/games/duke/src/sectors_d.cpp @@ -656,7 +656,7 @@ void checkhitwall_d(DDukeActor* spr, walltype* wal, int x, int y, int z, int atw if (((wal->cstat & CSTAT_WALL_MASKED) || wal->overpicnum == BIGFORCE) && wal->twoSided()) if (wal->nextSector()->int_floorz() > z) - if (wal->nextSector()->int_floorz() - wal->nextSector()->int_ceilingz()) + if (wal->nextSector()->floorz - wal->nextSector()->ceilingz) switch (wal->overpicnum) { case W_FORCEFIELD: @@ -1288,7 +1288,7 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj) } { auto spawned = spawn(targ, STEAM); - if (spawned) spawned->set_int_z(targ->sector()->int_floorz() - (32 << 8)); + if (spawned) spawned->spr.pos.Z = targ->sector()->floorz - 32; } break; diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp index 4ff235182..42dd48001 100644 --- a/source/games/duke/src/sectors_r.cpp +++ b/source/games/duke/src/sectors_r.cpp @@ -997,7 +997,7 @@ void checkhitwall_r(DDukeActor* spr, walltype* wal, int x, int y, int z, int atw if (((wal->cstat & CSTAT_WALL_MASKED) || wal->overpicnum == BIGFORCE) && wal->twoSided()) if (wal->nextSector()->int_floorz() > z) - if (wal->nextSector()->int_floorz() - wal->nextSector()->int_ceilingz()) + if (wal->nextSector()->floorz - wal->nextSector()->ceilingz) switch (wal->overpicnum) { case FANSPRITE: @@ -2284,7 +2284,7 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj) } { auto spawned = spawn(targ, STEAM); - if (spawned) spawned->set_int_z(targ->sector()->int_floorz() - (32 << 8)); + if (spawned) spawned->spr.pos.Z = targ->sector()->floorz - 32; } break; diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp index e250fadde..75da808be 100644 --- a/source/games/duke/src/spawn.cpp +++ b/source/games/duke/src/spawn.cpp @@ -343,16 +343,16 @@ int spawnbloodpoolpart1(DDukeActor* act) auto s1 = act->sector(); updatesector(act->int_pos().X + 108, act->int_pos().Y + 108, &s1); - if (s1 && s1->int_floorz() == act->sector()->int_floorz()) + if (s1 && s1->floorz == act->sector()->floorz) { updatesector(act->int_pos().X - 108, act->int_pos().Y - 108, &s1); - if (s1 && s1->int_floorz() == act->sector()->int_floorz()) + if (s1 && s1->floorz == act->sector()->floorz) { updatesector(act->int_pos().X + 108, act->int_pos().Y - 108, &s1); - if (s1 && s1->int_floorz() == act->sector()->int_floorz()) + if (s1 && s1->floorz == act->sector()->floorz) { updatesector(act->int_pos().X - 108, act->int_pos().Y + 108, &s1); - if (s1 && s1->int_floorz() != act->sector()->int_floorz()) + if (s1 && s1->floorz != act->sector()->floorz) { act->spr.xrepeat = act->spr.yrepeat = 0; ChangeActorStat(act, STAT_MISC); return true; } @@ -385,16 +385,16 @@ void initfootprint(DDukeActor* actj, DDukeActor* act) auto s1 = act->sector(); updatesector(act->int_pos().X + 84, act->int_pos().Y + 84, &s1); - if (s1 && s1->int_floorz() == act->sector()->int_floorz()) + if (s1 && s1->floorz == act->sector()->floorz) { updatesector(act->int_pos().X - 84, act->int_pos().Y - 84, &s1); - if (s1 && s1->int_floorz() == act->sector()->int_floorz()) + if (s1 && s1->floorz == act->sector()->floorz) { updatesector(act->int_pos().X + 84, act->int_pos().Y - 84, &s1); - if (s1 && s1->int_floorz() == act->sector()->int_floorz()) + if (s1 && s1->floorz == act->sector()->floorz) { updatesector(act->int_pos().X - 84, act->int_pos().Y + 84, &s1); - if (s1 && s1->int_floorz() != act->sector()->int_floorz()) + if (s1 && s1->floorz != act->sector()->floorz) { act->spr.xrepeat = act->spr.yrepeat = 0; ChangeActorStat(act, STAT_MISC); return; } @@ -628,7 +628,7 @@ void spawneffector(DDukeActor* actor, TArray* actors) } else actor->SetOwner(actor); - actor->temp_data[4] = sectp->int_floorz() == actor->int_pos().Z; + actor->temp_data[4] = sectp->floorz == actor->spr.pos.Z; actor->spr.cstat = 0; ChangeActorStat(actor, STAT_TRANSPORT); return; diff --git a/source/games/duke/src/spawn_d.cpp b/source/games/duke/src/spawn_d.cpp index 026dabdb8..bfdc018cd 100644 --- a/source/games/duke/src/spawn_d.cpp +++ b/source/games/duke/src/spawn_d.cpp @@ -720,7 +720,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray* case TOUCHPLATE: act->temp_data[2] = sectp->int_floorz(); if (sectp->lotag != 1 && sectp->lotag != 2) - sectp->set_int_floorz(act->int_pos().Z); + sectp->floorz = act->spr.pos.Z; if (!isWorldTour()) { if (act->spr.pal && ud.multimode > 1) diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp index 7516e0096..13369e5b8 100644 --- a/source/games/duke/src/spawn_r.cpp +++ b/source/games/duke/src/spawn_r.cpp @@ -717,7 +717,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray* case TOUCHPLATE: act->temp_data[2] = sectp->int_floorz(); if (sectp->lotag != 1 && sectp->lotag != 2) - sectp->set_int_floorz(act->int_pos().Z); + sectp->setfloorz(act->spr.pos.Z); if (act->spr.pal && ud.multimode > 1) { act->spr.xrepeat = act->spr.yrepeat = 0;