teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- yet another batch of wrapper replacements

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-28 11:35:03 +02:00
parent d9397b3b5d
commit 9314d4c774
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/duke/src/sectors.cpp
View file

@ -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;
}
}
}

4
source/games/duke/src/sectors_d.cpp
View file

@ -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;

4
source/games/duke/src/sectors_r.cpp
View file

@ -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;

18
source/games/duke/src/spawn.cpp
View file

@ -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<DDukeActor*>* 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;

2
source/games/duke/src/spawn_d.cpp
View file

@ -720,7 +720,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
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)

2
source/games/duke/src/spawn_r.cpp
View file

@ -717,7 +717,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
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;