zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified sop->zorig_floor

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-03 23:56:48 +02:00
parent 0794663601
commit 5d551fcda9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/sw/src/game.h
View file

@ -1462,11 +1462,11 @@ struct SECTOR_OBJECT
int vel, // velocity
vel_tgt, // target velocity
update, // Distance from player at which you continue updating
update; // Distance from player at which you continue updating
// start of must floatify
zorig_floor[MAX_SO_SECTOR], // original z values for all sectors
z_tgt, // target z delta
double zorig_floor[MAX_SO_SECTOR]; // original z values for all sectors
int z_tgt, // target z delta
z_rate, // rate at which z aproaches target
// only works for single player.
bob_diff; // bobbing difference for the frame

12
source/games/sw/src/track.cpp
View file

@ -718,10 +718,10 @@ void SectorObjectSetupBounds(SECTOR_OBJECT* sop)
// detection and recognition
sect->extra |= SECTFX_SECTOR_OBJECT;
sop->zorig_floor[sop->num_sectors] = sect->int_floorz();
sop->zorig_floor[sop->num_sectors] = sect->floorz;
if ((sect->extra & SECTFX_SINK))
sop->zorig_floor[sop->num_sectors] += Z(FixedToInt(sect->depth_fixed));
sop->zorig_floor[sop->num_sectors] += FixedToInt(sect->depth_fixed);
// lowest and highest floor z's
if (sect->floorz > sop->floor_loz)
@ -1972,7 +1972,7 @@ void MoveZ(SECTOR_OBJECT* sop)
if (sop->sectp[i]->hasU() && (sop->sectp[i]->flags & SECTFU_SO_DONT_BOB))
continue;
(*sectp)->set_int_floorz(sop->zorig_floor[i] + sop->bob_diff);
(*sectp)->floorz = sop->zorig_floor[i] + sop->bob_diff * zinttoworld;
}
}
@ -1993,7 +1993,7 @@ void MoveZ(SECTOR_OBJECT* sop)
{
for (i = 0, sectp = &sop->sectp[0]; *sectp; sectp++, i++)
{
AnimSet(ANIM_Floorz, *sectp, (sop->zorig_floor[i] + sop->z_tgt) * zinttoworld, sop->z_rate);
AnimSet(ANIM_Floorz, *sectp, sop->zorig_floor[i] + sop->z_tgt * zinttoworld, sop->z_rate);
}
sop->flags &= ~(SOBJ_ZDOWN);
@ -2002,7 +2002,7 @@ void MoveZ(SECTOR_OBJECT* sop)
{
for (i = 0, sectp = &sop->sectp[0]; *sectp; sectp++, i++)
{
AnimSet(ANIM_Floorz, *sectp, (sop->zorig_floor[i] + sop->z_tgt) * zinttoworld, sop->z_rate);
AnimSet(ANIM_Floorz, *sectp, sop->zorig_floor[i] + sop->z_tgt * zinttoworld, sop->z_rate);
}
sop->flags &= ~(SOBJ_ZUP);
@ -2523,7 +2523,7 @@ void OperateSectorObjectForTics(SECTOR_OBJECT* sop, DAngle newang, const DVector
if (sop->sectp[i]->hasU() && (sop->sectp[i]->flags & SECTFU_SO_DONT_BOB))
continue;
(*sectp)->set_int_floorz(sop->zorig_floor[i] + sop->bob_diff);
(*sectp)->floorz = sop->zorig_floor[i] + sop->bob_diff * zinttoworld;
}
}