teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW ladder climbing

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-03 10:45:21 +02:00
parent 45690a0e23
commit 48c36bd4a2
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/sw/src/game.h
View file

@ -584,10 +584,6 @@ struct PLAYER
{ {
return { int(pos.X * worldtoint), int(pos.Y * worldtoint), int(pos.Z * zworldtoint) }; return { int(pos.X * worldtoint), int(pos.Y * worldtoint), int(pos.Z * zworldtoint) };
} }
void set_int_ppos_XY(vec2_t z)
{
pos.XY() = {z.X * inttoworld, z.Y * inttoworld };
}
void add_int_ppos_Z(int z) void add_int_ppos_Z(int z)
{ {
pos.Z += z * zinttoworld; pos.Z += z * zinttoworld;

28
source/games/sw/src/player.cpp
View file

@ -3086,9 +3086,8 @@ void DoPlayerBeginClimb(PLAYER* pp)
void DoPlayerClimb(PLAYER* pp) void DoPlayerClimb(PLAYER* pp)
{ {
DSWActor* plActor = pp->actor; DSWActor* plActor = pp->actor;
int climb_amt; double climbVel;
int i; int i;
int climbvel;
int dot; int dot;
bool LadderUpdate = false; bool LadderUpdate = false;
@ -3102,10 +3101,10 @@ void DoPlayerClimb(PLAYER* pp)
if (abs(pp->vect.X) < 12800 && abs(pp->vect.Y) < 12800) if (abs(pp->vect.X) < 12800 && abs(pp->vect.Y) < 12800)
pp->vect.X = pp->vect.Y = 0; pp->vect.X = pp->vect.Y = 0;
climbvel = FindDistance2D(pp->vect.X, pp->vect.Y)>>9; climbVel = DVector2(pp->vect.X, pp->vect.Y).Length() * (1. / 512) * zinttoworld;
dot = DOT_PRODUCT_2D(pp->vect.X, pp->vect.Y, pp->angle.ang.Cos() * (1 << 14), pp->angle.ang.Sin() * (1 << 14)); dot = DOT_PRODUCT_2D(pp->vect.X, pp->vect.Y, pp->angle.ang.Cos() * (1 << 14), pp->angle.ang.Sin() * (1 << 14));
if (dot < 0) if (dot < 0)
climbvel = -climbvel; climbVel = -climbVel;
// need to rewrite this for FAF stuff // need to rewrite this for FAF stuff
@ -3118,7 +3117,7 @@ void DoPlayerClimb(PLAYER* pp)
return; return;
} }
if (climbvel != 0) if (climbVel != 0)
{ {
// move player to center of ladder // move player to center of ladder
for (i = synctics; i; i--) for (i = synctics; i; i--)
@ -3185,15 +3184,11 @@ void DoPlayerClimb(PLAYER* pp)
} }
// moving UP // moving UP
if (climbvel > 0) if (climbVel > 0)
{ {
// pp->climb_ndx += climb_rate * synctics; pp->pos.Z -= climbVel;
climb_amt = (climbvel>>4) * 8;
pp->climb_ndx &= 1023; pp->climb_ndx &= 1023;
pp->add_int_ppos_Z(-climb_amt);
// if player gets to close the ceiling while climbing // if player gets to close the ceiling while climbing
if (PlayerCeilingHit(pp, pp->hiz)) if (PlayerCeilingHit(pp, pp->hiz))
{ {
@ -3223,16 +3218,11 @@ void DoPlayerClimb(PLAYER* pp)
} }
else else
// move DOWN // move DOWN
if (climbvel < 0) if (climbVel < 0)
{ {
// pp->climb_ndx += climb_rate * synctics; pp->pos.Z -= climbVel;
climb_amt = -(climbvel>>4) * 8;
pp->climb_ndx &= 1023; pp->climb_ndx &= 1023;
// pp->posz += MulScale(climb_amt, bsin(pp->climb_ndx), 14);
pp->add_int_ppos_Z(climb_amt);
// if you are touching the floor // if you are touching the floor
if (PlayerFloorHit(pp, pp->loz - 4 - PLAYER_HEIGHTF)) if (PlayerFloorHit(pp, pp->loz - 4 - PLAYER_HEIGHTF))
{ {
@ -3240,7 +3230,7 @@ void DoPlayerClimb(PLAYER* pp)
pp->pos.Z = pp->loz - 4 - PLAYER_HEIGHTF; pp->pos.Z = pp->loz - 4 - PLAYER_HEIGHTF;
// if moving backwards start running // if moving backwards start running
if (climbvel < 0) if (climbVel < 0)
{ {
pp->Flags &= ~(PF_CLIMBING|PF_WEAPON_DOWN); pp->Flags &= ~(PF_CLIMBING|PF_WEAPON_DOWN);
plActor->spr.cstat &= ~(CSTAT_SPRITE_YCENTER); plActor->spr.cstat &= ~(CSTAT_SPRITE_YCENTER);