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

- Duke/RR: floatified position stuff in unterwater()

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 00:10:49 +02:00
parent bbdb3379d6
commit f33ecbc14f
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1930,10 +1930,12 @@ static void movement(int snum, ESyncBits actions, sectortype* psect, int fz_, in
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void underwater(int snum, ESyncBits actions, int fz, int cz) static void underwater(int snum, ESyncBits actions, int fz_, int cz_)
{ {
auto p = &ps[snum]; auto p = &ps[snum];
auto pact = p->GetActor(); auto pact = p->GetActor();
double floorz = fz_ * zinttoworld;
double ceilingz = cz_ * zinttoworld;
// under water // under water
p->jumping_counter = 0; p->jumping_counter = 0;
@ -1979,14 +1981,14 @@ static void underwater(int snum, ESyncBits actions, int fz, int cz)
if (p->vel.Z > 2048) if (p->vel.Z > 2048)
p->vel.Z >>= 1; p->vel.Z >>= 1;
p->player_add_int_z(p->vel.Z); p->pos.Z += p->vel.Z * zinttoworld;
if (p->player_int_pos().Z > (fz - (15 << 8))) if (p->pos.Z > floorz - 15)
p->player_add_int_z(((fz - (15 << 8)) - p->player_int_pos().Z) >> 1); p->pos.Z += (((floorz - 15) - p->pos.Z) * 0.5);
if (p->player_int_pos().Z < (cz + (4 << 8))) if (p->pos.Z < ceilingz + 4)
{ {
p->player_set_int_z(cz + (4 << 8)); p->pos.Z = ceilingz + 4;
p->vel.Z = 0; p->vel.Z = 0;
} }
@ -1998,7 +2000,7 @@ static void underwater(int snum, ESyncBits actions, int fz, int cz)
j->add_int_pos({ bcos(p->angle.ang.Buildang() + 64 - (global_random & 128), -6), bsin(p->angle.ang.Buildang() + 64 - (global_random & 128), -6), 0 }); j->add_int_pos({ bcos(p->angle.ang.Buildang() + 64 - (global_random & 128), -6), bsin(p->angle.ang.Buildang() + 64 - (global_random & 128), -6), 0 });
j->spr.xrepeat = 3; j->spr.xrepeat = 3;
j->spr.yrepeat = 2; j->spr.yrepeat = 2;
j->set_int_z(p->player_int_pos().Z + (8 << 8)); j->spr.pos.Z = p->pos.Z + 8;
} }
} }
} }

16
source/games/duke/src/player_r.cpp
View file

@ -2289,10 +2289,12 @@ static void movement(int snum, ESyncBits actions, sectortype* psect, int fz_, in
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void underwater(int snum, ESyncBits actions, int fz, int cz) static void underwater(int snum, ESyncBits actions, int fz_, int cz_)
{ {
auto p = &ps[snum]; auto p = &ps[snum];
auto pact = p->GetActor(); auto pact = p->GetActor();
double floorz = fz_ * zinttoworld;
double ceilingz = cz_ * zinttoworld;
p->jumping_counter = 0; p->jumping_counter = 0;
@ -2334,14 +2336,14 @@ static void underwater(int snum, ESyncBits actions, int fz, int cz)
if (p->vel.Z > 2048) if (p->vel.Z > 2048)
p->vel.Z >>= 1; p->vel.Z >>= 1;
p->player_add_int_z(p->vel.Z); p->pos.Z += p->vel.Z * zinttoworld;
if (p->player_int_pos().Z > (fz - (15 << 8))) if (p->pos.Z > floorz - 15)
p->player_add_int_z(((fz - (15 << 8)) - p->player_int_pos().Z) >> 1); p->pos.Z += (((floorz - 15) - p->pos.Z) * 0.5);
if (p->player_int_pos().Z < (cz + (4 << 8))) if (p->pos.Z < ceilingz + 4)
{ {
p->player_set_int_z(cz + (4 << 8)); p->pos.Z = ceilingz + 4;
p->vel.Z = 0; p->vel.Z = 0;
} }
@ -2353,7 +2355,7 @@ static void underwater(int snum, ESyncBits actions, int fz, int cz)
j->add_int_pos({ bcos(p->angle.ang.Buildang() + 64 - (global_random & 128) + 128, -6), bsin(p->angle.ang.Buildang() + 64 - (global_random & 128) + 128, -6), 0 }); j->add_int_pos({ bcos(p->angle.ang.Buildang() + 64 - (global_random & 128) + 128, -6), bsin(p->angle.ang.Buildang() + 64 - (global_random & 128) + 128, -6), 0 });
j->spr.xrepeat = 3; j->spr.xrepeat = 3;
j->spr.yrepeat = 2; j->spr.yrepeat = 2;
j->set_int_z(p->player_int_pos().Z + (8 << 8)); j->spr.pos.Z = p->pos.Z + 8;
j->spr.cstat = CSTAT_SPRITE_TRANS_FLIP | CSTAT_SPRITE_TRANSLUCENT; j->spr.cstat = CSTAT_SPRITE_TRANS_FLIP | CSTAT_SPRITE_TRANSLUCENT;
} }
} }