teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-01 05:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified sop->z_tgt

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-04 00:00:53 +02:00
parent 5d551fcda9
commit 973c9b89a9
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

@ -1465,9 +1465,9 @@ struct SECTOR_OBJECT
update; // Distance from player at which you continue updating
// start of must floatify
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
double zorig_floor[MAX_SO_SECTOR], // original z values for all sectors
z_tgt; // target z delta
int z_rate, // rate at which z aproaches target
// only works for single player.
bob_diff; // bobbing difference for the frame
double floor_loz, // floor low z

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

@ -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, 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, sop->z_rate);
}
sop->flags &= ~(SOBJ_ZUP);
@ -2400,12 +2400,12 @@ DVector2 DoTrack(SECTOR_OBJECT* sop, short locktics)
sop->flags &= ~(SOBJ_ZDOWN | SOBJ_ZUP);
if (sop->dir < 0)
{
sop->z_tgt = sop->z_tgt + Z(tpoint->tag_high);
sop->z_tgt += tpoint->tag_high;
sop->flags |= (SOBJ_ZDOWN);
}
else
{
sop->z_tgt = sop->z_tgt - Z(tpoint->tag_high);
sop->z_tgt -= tpoint->tag_high;
sop->flags |= (SOBJ_ZUP);
}
break;
@ -2413,12 +2413,12 @@ DVector2 DoTrack(SECTOR_OBJECT* sop, short locktics)
sop->flags &= ~(SOBJ_ZDOWN | SOBJ_ZUP);
if (sop->dir > 0)
{
sop->z_tgt = sop->z_tgt + Z(tpoint->tag_high);
sop->z_tgt += tpoint->tag_high;
sop->flags |= (SOBJ_ZDOWN);
}
else
{
sop->z_tgt = sop->z_tgt - Z(tpoint->tag_high);
sop->z_tgt -= tpoint->tag_high;
sop->flags |= (SOBJ_ZUP);
}
break;