From 838d28b93412b9592d57ba48962fb02b20c5cff9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 7 Feb 2022 08:59:20 +0100
Subject: [PATCH] - more simple replacements.
---
source/games/duke/src/actors.cpp | 10 +++++-----
source/games/duke/src/spawn.cpp | 20 ++++++++++----------
source/games/sw/src/copysect.cpp | 4 ++--
source/games/sw/src/sprite.cpp | 6 +++---
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index 412e592d3..96d9b5e73 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -3971,7 +3971,7 @@ void handle_se18(DDukeActor *actor, bool morecheck)
sc->add_int_ceilingz(sc->extra);
if (sc->int_ceilingz() >= actor->int_pos().Z)
{
- sc->set_int_ceilingz(actor->int_pos().Z);
+ sc->setceilingz(actor->spr.pos.Z);
deletesprite(actor);
return;
}
@@ -3995,7 +3995,7 @@ void handle_se18(DDukeActor *actor, bool morecheck)
}
if (sc->int_floorz() <= actor->int_pos().Z)
{
- sc->set_int_floorz(actor->int_pos().Z);
+ sc->setfloorz(actor->spr.pos.Z);
deletesprite(actor);
return;
}
@@ -4474,7 +4474,7 @@ void handle_se32(DDukeActor *actor)
{
if (abs(sc->int_ceilingz() - actor->int_pos().Z) < (actor->spr.yvel << 1))
{
- sc->set_int_ceilingz(actor->int_pos().Z);
+ sc->setceilingz(actor->spr.pos.Z);
callsound(actor->sector(), actor);
actor->temp_data[2] = 0;
actor->temp_data[0] = 0;
@@ -4502,7 +4502,7 @@ void handle_se32(DDukeActor *actor)
actor->temp_data[0] = 0;
actor->temp_data[2] = !actor->temp_data[2];
callsound(actor->sector(), actor);
- sc->set_int_ceilingz(actor->int_pos().Z);
+ sc->setceilingz(actor->spr.pos.Z);
}
else sc->add_int_ceilingz(Sgn(actor->int_pos().Z - sc->int_ceilingz()) * actor->spr.yvel);
}
@@ -4662,7 +4662,7 @@ void handle_se31(DDukeActor* actor, bool choosedir)
{
if (abs(sec->int_floorz() - actor->int_pos().Z) < actor->spr.yvel)
{
- sec->set_int_floorz(actor->int_pos().Z);
+ sec->setfloorz(actor->spr.pos.Z);
actor->temp_data[2] = 0;
actor->temp_data[0] = 0;
if (choosedir) actor->temp_data[3] = actor->spr.hitag;
diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp
index 5acb68f79..4fa8df41b 100644
--- a/source/games/duke/src/spawn.cpp
+++ b/source/games/duke/src/spawn.cpp
@@ -642,13 +642,13 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
{
actor->temp_data[1] = sectp->int_ceilingz();
if (actor->spr.pal)
- sectp->set_int_ceilingz(actor->int_pos().Z);
+ sectp->setceilingz(actor->spr.pos.Z);
}
else
{
actor->temp_data[1] = sectp->int_floorz();
if (actor->spr.pal)
- sectp->set_int_floorz(actor->int_pos().Z);
+ sectp->setfloorz(actor->spr.pos.Z);
}
actor->spr.hitag <<= 2;
@@ -666,11 +666,11 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
else
actor->temp_data[4] = sectp->int_ceilingz();
- sectp->set_int_ceilingz(actor->int_pos().Z);
+ sectp->setceilingz(actor->spr.pos.Z);
StartInterpolation(sectp, Interp_Sect_Ceilingz);
break;
case SE_35:
- sectp->set_int_ceilingz(actor->int_pos().Z);
+ sectp->setceilingz(actor->spr.pos.Z);
break;
case SE_27_DEMO_CAM:
if (ud.recstat == 1)
@@ -700,14 +700,14 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
if (actor->spr.ang == 512)
{
if (ceiling)
- sectp->set_int_ceilingz(actor->int_pos().Z);
+ sectp->setceilingz(actor->spr.pos.Z);
else
- sectp->set_int_floorz(actor->int_pos().Z);
+ sectp->setfloorz(actor->spr.pos.Z);
}
else
{
- sectp->set_int_ceilingz(actor->int_pos().Z);
- sectp->set_int_floorz(actor->int_pos().Z);
+ sectp->setceilingz(actor->spr.pos.Z);
+ sectp->setfloorz(actor->spr.pos.Z);
}
if (sectp->ceilingstat & CSTAT_SECTOR_SKY)
@@ -833,7 +833,7 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
case SE_31_FLOOR_RISE_FALL:
actor->temp_data[1] = sectp->int_floorz();
// actor->temp_data[2] = actor->spr.hitag;
- if (actor->spr.ang != 1536) sectp->set_int_floorz(actor->int_pos().Z);
+ if (actor->spr.ang != 1536) sectp->setfloorz(actor->spr.pos.Z);
for (auto& wal : wallsofsector(sectp))
if (wal.hitag == 0) wal.hitag = 9999;
@@ -844,7 +844,7 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
case SE_32_CEILING_RISE_FALL:
actor->temp_data[1] = sectp->int_ceilingz();
actor->temp_data[2] = actor->spr.hitag;
- if (actor->spr.ang != 1536) sectp->set_int_ceilingz(actor->int_pos().Z);
+ if (actor->spr.ang != 1536) sectp->setceilingz(actor->spr.pos.Z);
for (auto& wal : wallsofsector(sectp))
if (wal.hitag == 0) wal.hitag = 9999;
diff --git a/source/games/sw/src/copysect.cpp b/source/games/sw/src/copysect.cpp
index 0554acb9e..a287807ff 100644
--- a/source/games/sw/src/copysect.cpp
+++ b/source/games/sw/src/copysect.cpp
@@ -211,8 +211,8 @@ void CopySectorMatch(int match)
dsectp->hitag = ssectp->hitag;
dsectp->lotag = ssectp->lotag;
- dsectp->set_int_floorz(ssectp->int_floorz());
- dsectp->set_int_ceilingz(ssectp->int_ceilingz());
+ dsectp->setfloorz(ssectp->floorz);
+ dsectp->setceilingz(ssectp->ceilingz);
dsectp->floorshade = ssectp->floorshade;
dsectp->ceilingshade = ssectp->ceilingshade;
diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
index 48fe2de00..8a18c0355 100644
--- a/source/games/sw/src/sprite.cpp
+++ b/source/games/sw/src/sprite.cpp
@@ -2431,7 +2431,7 @@ void SpriteSetup(void)
if (SP_TAG9(actor) == 0)
SP_TAG9(actor) = 10;
- actor->add_int_z(Z(30));
+ actor->spr.pos.Z += 30;
break;
}
@@ -2453,9 +2453,9 @@ void SpriteSetup(void)
sectp->setceilingslope(0);
}
- SP_TAG4(actor) = abs(sectp->int_ceilingz() - sectp->int_floorz())>>8;
+ SP_TAG4(actor) = int(fabs(sectp->ceilingz - sectp->floorz));
- sectp->set_int_ceilingz(sectp->int_floorz());
+ sectp->setceilingz(sectp->floorz);
change_actor_stat(actor, STAT_EXPLODING_CEIL_FLOOR);
break;