- partial work on processinput_d

This commit is contained in:
Christoph Oelckers 2022-09-13 19:51:25 +02:00
parent bda3a38ed9
commit b164426dd2

View file

@ -2714,7 +2714,7 @@ static void processweapon(int snum, ESyncBits actions)
void processinput_d(int snum) void processinput_d(int snum)
{ {
int j, k, doubvel, fz, cz, truefdist; int k, doubvel, fz, cz, truefdist;
Collision chz, clz; Collision chz, clz;
bool shrunk; bool shrunk;
int psectlotag; int psectlotag;
@ -2749,12 +2749,10 @@ void processinput_d(int snum)
shrunk = (pact->spr.yrepeat < 32); shrunk = (pact->spr.yrepeat < 32);
getzrange(p->player_int_pos(), psectp, &cz, chz, &fz, clz, 163, CLIPMASK0); getzrange(p->player_int_pos(), psectp, &cz, chz, &fz, clz, 163, CLIPMASK0);
j = getflorzofslopeptr(psectp, p->player_int_pos().X, p->player_int_pos().Y); p->truefz = getflorzofslopeptrf(psectp, p->pos);
p->truecz = getceilzofslopeptrf(psectp, p->pos);
p->truefz = j * zinttoworld; truefdist = abs(p->pos.Z - p->truefz) * worldtoint;
p->truecz = getceilzofslopeptr(psectp, p->player_int_pos().X, p->player_int_pos().Y) * zinttoworld;
truefdist = abs(p->player_int_pos().Z - j);
if (clz.type == kHitSector && psectlotag == 1 && truefdist > gs.int_playerheight + (16 << 8)) if (clz.type == kHitSector && psectlotag == 1 && truefdist > gs.int_playerheight + (16 << 8))
psectlotag = 0; psectlotag = 0;
@ -2909,7 +2907,7 @@ void processinput_d(int snum)
if (p->spritebridge == 0 && pact->insector()) if (p->spritebridge == 0 && pact->insector())
{ {
j = pact->sector()->floorpicnum; int j = pact->sector()->floorpicnum;
if (j == PURPLELAVA || pact->sector()->ceilingpicnum == PURPLELAVA) if (j == PURPLELAVA || pact->sector()->ceilingpicnum == PURPLELAVA)
{ {
@ -2956,6 +2954,7 @@ void processinput_d(int snum)
{ {
if (p->spritebridge == 0 && p->walking_snd_toggle == 0 && p->on_ground) if (p->spritebridge == 0 && p->walking_snd_toggle == 0 && p->on_ground)
{ {
int j;
switch (psectlotag) switch (psectlotag)
{ {
case 0: case 0:
@ -3046,7 +3045,7 @@ HORIZONLY:
if (p->jetpack_on == 0) if (p->jetpack_on == 0)
{ {
if (pact->int_xvel() > 16) if (pact->vel.X > 1)
{ {
if (psectlotag != 1 && psectlotag != 2 && p->on_ground) if (psectlotag != 1 && psectlotag != 2 && p->on_ground)
{ {