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

- floatified operateJetpack

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-14 21:29:37 +02:00
parent 583a5bd0e3
commit 89cb29292c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/duke/src/player_d.cpp
View file

@ -1704,7 +1704,7 @@ void checkweapons_d(player_struct* p)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void operateJetpack(int snum, ESyncBits actions, int psectlotag, int fz, int cz, int shrunk) static void operateJetpack(int snum, ESyncBits actions, int psectlotag, double floorz, double ceilingz, int shrunk)
{ {
auto p = &ps[snum]; auto p = &ps[snum];
auto pact = p->GetActor(); auto pact = p->GetActor();
@ -1765,8 +1765,8 @@ static void operateJetpack(int snum, ESyncBits actions, int psectlotag, int fz,
if (psectlotag != 2 && p->scuba_on == 1) if (psectlotag != 2 && p->scuba_on == 1)
p->scuba_on = 0; p->scuba_on = 0;
if (p->player_int_pos().Z > (fz - (k << 8))) if (p->pos.Z > floorz - k)
p->pos.Z += (((fz - (k << 8)) - p->player_int_pos().Z) >> 1) * zinttoworld; p->pos.Z += ((floorz - k) - p->pos.Z) * 0.5;
if (p->pos.Z < pact->ceilingz + 18) if (p->pos.Z < pact->ceilingz + 18)
p->pos.Z = pact->ceilingz + 18; p->pos.Z = pact->ceilingz + 18;
@ -2911,7 +2911,7 @@ void processinput_d(int snum)
else if (p->jetpack_on) else if (p->jetpack_on)
{ {
operateJetpack(snum, actions, psectlotag, fz, cz, shrunk); operateJetpack(snum, actions, psectlotag, fz * inttoworld, cz * inttoworld, shrunk);
} }
else if (psectlotag != ST_2_UNDERWATER) else if (psectlotag != ST_2_UNDERWATER)
{ {