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

- got rid of int_z_tgt

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 10:20:35 +02:00
parent d2818322b0
commit 17d5242958
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -932,7 +932,6 @@ struct USER
int int_loz() const { return loz * zworldtoint; }
int int_hiz() const { return hiz * zworldtoint; }
int int_z_tgt() const { return z_tgt * zworldtoint; }
int int_ceiling_dist() const { return ceiling_dist * zworldtoint; }
int int_floor_dist() const { return floor_dist * zworldtoint; }
int int_zclip() const { return zclip * zworldtoint; }

8
source/games/sw/src/spike.cpp
View file

@ -106,7 +106,7 @@ void SetSpikeActive(DSWActor* actor)
VatorSwitch(SP_TAG2(actor), true);
else
// moving to the OFF position
if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
if (actor->user.z_tgt == actor->user.pos.Z)
VatorSwitch(SP_TAG2(actor), false);
}
@ -291,8 +291,8 @@ int DoSpike(DSWActor* actor)
}
else
// in the OFF position
if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
{
if (actor->user.z_tgt == actor->user.pos.Z)
{
short match = SP_TAG2(actor);
// change target
@ -391,7 +391,7 @@ int DoSpikeAuto(DSWActor* actor)
}
else
// in the DOWN position
if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
if (actor->user.z_tgt == actor->user.pos.Z)
{
// change target
actor->user.jump_speed = actor->user.vel_tgt;

6
source/games/sw/src/sprite.cpp
View file

@ -6549,11 +6549,11 @@ Collision move_ground_missile(DSWActor* actor, int xchange, int ychange, int cei
daz = actor->int_pos().Z;
// climbing a wall
if (actor->user.int_z_tgt())
if (actor->user.z_tgt)
{
if (labs(actor->user.int_z_tgt() - actor->int_pos().Z) > Z(40))
if (abs(actor->user.z_tgt - actor->spr.pos.Z) > 40)
{
if (actor->user.int_z_tgt() > actor->int_pos().Z)
if (actor->user.z_tgt > actor->spr.pos.Z)
{
actor->spr.pos.Z += 30;
return retval;

6
source/games/sw/src/vator.cpp
View file

@ -107,11 +107,11 @@ void SetVatorActive(DSWActor* actor)
actor->user.Tics = 0;
// moving to the ON position
if (actor->user.int_z_tgt() == actor->int_pos().Z)
if (actor->user.z_tgt == actor->spr.pos.Z)
VatorSwitch(SP_TAG2(actor), true);
else
// moving to the OFF position
if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
if (actor->user.z_tgt == actor->user.pos.Z)
VatorSwitch(SP_TAG2(actor), false);
}
@ -443,7 +443,7 @@ int DoVator(DSWActor* actor)
actor->user.Tics = actor->user.WaitTics;
}
}
else // if (*lptr == actor->user.int_z_tgt())
else // if (*lptr == actor->user.z_tgt)
{
// if heading for the OFF (original) position and should NOT CRUSH
if (TEST_BOOL3(actor) && actor->user.z_tgt == actor->user.oz)