zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- got rid of most int_oz calls.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 09:34:33 +02:00
parent 9433f2ada8
commit af7e63137f
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,16 +52,16 @@ void ReverseSpike(DSWActor* actor)
if (actor->user.z_tgt == actor->user.oz)
{
if (actor->spr.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->user.int_upos().Z * zinttoworld;
else if (actor->user.int_upos().Z == actor->user.int_oz())
actor->user.z_tgt = actor->user.pos.Z;
else if (actor->user.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->spr.pos.Z;
}
else if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
else if (actor->user.z_tgt == actor->user.pos.Z)
{
if (actor->spr.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->spr.pos.Z;
else if (actor->user.int_upos().Z == actor->user.int_oz())
actor->user.z_tgt = actor->user.int_upos().Z * zinttoworld;
else if (actor->user.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->user.pos.Z;
}
actor->user.vel_rate = -actor->user.vel_rate;

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

@ -57,16 +57,16 @@ void ReverseVator(DSWActor* actor)
if (actor->user.z_tgt == actor->user.oz)
{
if (actor->spr.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->user.int_upos().Z * zinttoworld;
else if (actor->user.int_upos().Z == actor->user.int_oz())
actor->user.z_tgt = actor->user.pos.Z;
else if (actor->user.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->spr.pos.Z;
}
else if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
else if (actor->user.z_tgt == actor->user.pos.Z)
{
if (actor->spr.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->spr.pos.Z;
else if (actor->user.int_upos().Z == actor->user.int_oz())
actor->user.z_tgt = actor->user.int_upos().Z * zinttoworld;
else if (actor->user.pos.Z == actor->user.oz)
actor->user.z_tgt = actor->user.pos.Z;
}
actor->user.vel_rate = -actor->user.vel_rate;
@ -392,10 +392,10 @@ int DoVator(DSWActor* actor)
if (zval == actor->user.int_z_tgt())
{
// in the ON position
if (actor->user.int_z_tgt() == actor->int_pos().Z)
if (actor->user.z_tgt == actor->spr.pos.Z)
{
// change target
actor->user.z_tgt = actor->user.int_upos().Z * zinttoworld;
actor->user.z_tgt = actor->user.pos.Z;
actor->user.vel_rate = -actor->user.vel_rate;
SetVatorInactive(actor);
@ -406,7 +406,7 @@ int DoVator(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);
@ -503,7 +503,7 @@ int DoVator(DSWActor* actor)
{
if (itActor->spr.statnum == STAT_ENEMY)
{
if (labs(sectp->int_ceilingz() - sectp->int_floorz()) < ActorSizeZ(itActor))
if (abs(sectp->int_ceilingz() - sectp->int_floorz()) < ActorSizeZ(itActor))
{
InitBloodSpray(itActor, true, -1);
UpdateSinglePlayKills(itActor);