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

- very simple replacements

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 19:09:35 +02:00
parent 9a2929a9c6
commit cef65c4ba4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/sector.cpp
View file

@ -2295,7 +2295,7 @@ void PlayerOperateEnv(PLAYER* pp)
{
PlayerTakeSectorDamage(pp);
}
else if ((int_ActorZOfBottom(pp->actor) >= sectp->int_floorz()) && !(pp->Flags & PF_DIVING))
else if ((ActorZOfBottom(pp->actor) >= sectp->floorz) && !(pp->Flags & PF_DIVING))
{
PlayerTakeSectorDamage(pp);
}

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

@ -10980,14 +10980,14 @@ int DoRing(DSWActor* actor)
}
}
int z;
double z;
// move the center with the player
if (pp)
z = pp->int_ppos().Z + Z(20);
z = pp->pos.Z + 20;
else
z = int_ActorZOfMiddle(own) + Z(30);
z = ActorZOfMiddle(own) + 30;
actor->spr.pos = DVector3(own->spr.pos.XY(), z * zinttoworld);
actor->spr.pos = DVector3(own->spr.pos.XY(), z);
// go out until its time to come back in
if (actor->user.Counter2 == false)