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

- PLAYER::hiz,loz refactoring, part 1

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 14:08:03 +02:00
parent 30b620c700
commit 13d9505662
15 changed files with 91 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -660,7 +660,7 @@ int DoActorJump(DSWActor* actor)
}
// adjust height by jump speed
actor->add_int_z(actor->user.jump_speed * ACTORMOVETICS);
actor->spr.pos.Z += actor->user.jump_speed * ACTORMOVETICS * JUMP_FACTOR;
// if player gets to close the ceiling while jumping
double minh = actor->user.hiz + tileHeight(actor->spr.picnum);
@ -715,7 +715,7 @@ int DoActorFall(DSWActor* actor)
actor->user.jump_speed += actor->user.jump_grav * ACTORMOVETICS;
// adjust player height by jump speed
actor->add_int_z(actor->user.jump_speed * ACTORMOVETICS);
actor->spr.pos.Z += actor->user.jump_speed * ACTORMOVETICS * JUMP_FACTOR;
// Stick like glue when you hit the ground
if (actor->spr.pos.Z > actor->user.loz)
@ -826,7 +826,7 @@ int DoJump(DSWActor* actor)
}
// adjust height by jump speed
actor->add_int_z(actor->user.jump_speed * ACTORMOVETICS);
actor->spr.pos.Z += actor->user.jump_speed * ACTORMOVETICS * JUMP_FACTOR;
// if player gets to close the ceiling while jumping
double minh = actor->user.hiz + tileHeight(actor->spr.picnum);
@ -864,7 +864,7 @@ int DoFall(DSWActor* actor)
actor->user.jump_speed += actor->user.jump_grav * ACTORMOVETICS;
// adjust player height by jump speed
actor->add_int_z(actor->user.jump_speed * ACTORMOVETICS);
actor->spr.pos.Z += actor->user.jump_speed * ACTORMOVETICS * JUMP_FACTOR;
// Stick like glue when you hit the ground
if (actor->spr.pos.Z > actor->user.loz - actor->user.floor_dist)

1
source/games/sw/src/bunny.cpp
View file

@ -844,7 +844,6 @@ int DoBunnyBeginJumpAttack(DSWActor* actor)
DoActorSetSpeed(actor, FAST_SPEED);
//actor->user.jump_speed = -800;
PickJumpMaxSpeed(actor, -400); // was -800
actor->user.Flags |= (SPR_JUMPING);

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

@ -715,7 +715,7 @@ int DoCoolgCircle(DSWActor* actor)
}
// move in the z direction
actor->user.pos.Z -= actor->user.jump_speed * ACTORMOVETICS * zinttoworld;
actor->user.pos.Z -= actor->user.jump_speed * ACTORMOVETICS * JUMP_FACTOR;
bound = actor->user.hiz + actor->user.ceiling_dist + COOLG_BOB_AMT;
if (actor->user.pos.Z < bound)

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

@ -604,6 +604,14 @@ struct PLAYER
{
pos.XY() += { z.X * inttoworld, z.Y * inttoworld };
}
int int_ploz() const
{
return _loz;
}
int int_phiz() const
{
return _hiz;
}
DSWActor* actor; // this may not be a TObjPtr!
TObjPtr<DSWActor*> lowActor, highActor;
@ -624,7 +632,7 @@ struct PLAYER
int16_t down_speed, up_speed; // diving
int z_speed; // used for diving and flying instead of down_speed, up_speed
int climb_ndx;
int hiz,loz;
int _hiz,_loz;
int ceiling_dist,floor_dist;
sectortype* hi_sectp, *lo_sectp;
@ -2302,6 +2310,7 @@ struct USERSAVE
// save player info when moving to a new level (shortened to only cover the fields that actually are copied back.)
extern USERSAVE puser[MAX_SW_PLAYERS_REG];
constexpr double JUMP_FACTOR = 1. / 256.;
END_SW_NS

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

@ -459,7 +459,7 @@ int DoHornetCircle(DSWActor* actor)
}
// move in the z direction
actor->user.pos.Z -= actor->user.jump_speed * ACTORMOVETICS * zinttoworld;
actor->user.pos.Z -= actor->user.jump_speed * ACTORMOVETICS * JUMP_FACTOR;
bound = actor->user.hiz + actor->user.ceiling_dist + HORNET_BOB_AMT;
if (actor->user.pos.Z < bound)

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

@ -1975,8 +1975,6 @@ int DoNinjaGrabThroat(DSWActor* actor)
ChangeState(actor, actor->user.StateEnd);
actor->spr.xvel = 0;
//actor->user.jump_speed = -300;
//DoActorBeginJump(actor);
PlaySound(DIGI_NINJASCREAM, actor, v3df_follow);
}

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

@ -1430,7 +1430,7 @@ void DoPlayerHeight(PLAYER* pp)
{
int diff;
diff = pp->int_ppos().Z - (pp->loz - PLAYER_HEIGHT);
diff = pp->int_ppos().Z - (pp->int_ploz() - PLAYER_HEIGHT);
pp->set_int_ppos_Z(pp->int_ppos().Z - ((diff >> 2) + (diff >> 3)));
}
@ -1439,9 +1439,9 @@ void DoPlayerJumpHeight(PLAYER* pp)
{
if (pp->lo_sectp && (pp->lo_sectp->extra & SECTFX_DYNAMIC_AREA))
{
if (pp->int_ppos().Z + PLAYER_HEIGHT > pp->loz)
if (pp->int_ppos().Z + PLAYER_HEIGHT > pp->int_ploz())
{
pp->set_int_ppos_Z(pp->loz - PLAYER_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_HEIGHT);
DoPlayerBeginRun(pp);
}
}
@ -1451,7 +1451,7 @@ void DoPlayerCrawlHeight(PLAYER* pp)
{
int diff;
diff = pp->int_ppos().Z - (pp->loz - PLAYER_CRAWL_HEIGHT);
diff = pp->int_ppos().Z - (pp->int_ploz() - PLAYER_CRAWL_HEIGHT);
pp->set_int_ppos_Z(pp->int_ppos().Z - ((diff >> 2) + (diff >> 3)));
}
@ -1816,7 +1816,7 @@ void UpdatePlayerSprite(PLAYER* pp)
}
else
{
actor->set_int_z(pp->loz);
actor->set_int_z(pp->int_ploz());
ChangeActorSect(pp->actor, pp->cursector);
}
@ -1839,7 +1839,7 @@ void DoPlayerZrange(PLAYER* pp)
actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK);
vec3_t pos = pp->int_ppos();
pos.Z += Z(8);
FAFgetzrange(pos, pp->cursector, &pp->hiz, &ceilhit, &pp->loz, &florhit, ((int)actor->spr.clipdist<<2) - GETZRANGE_CLIP_ADJ, CLIPMASK_PLAYER);
FAFgetzrange(pos, pp->cursector, &pp->_hiz, &ceilhit, &pp->_loz, &florhit, ((int)actor->spr.clipdist<<2) - GETZRANGE_CLIP_ADJ, CLIPMASK_PLAYER);
actor->spr.cstat = bakcstat;
Collision ceilColl(ceilhit);
@ -1870,7 +1870,7 @@ void DoPlayerZrange(PLAYER* pp)
if (fsp->spr.statnum == STAT_ENEMY && floorColl.actor()->user.ID == ZOMBIE_RUN_R0)
{
pp->lo_sectp = fsp->sector();
pp->loz = fsp->int_pos().Z;
pp->_loz = fsp->int_pos().Z;
pp->lowActor = nullptr;
}
}
@ -2121,19 +2121,19 @@ void DoPlayerMove(PLAYER* pp)
{
if (pp->Flags & (PF_FLYING|PF_JUMPING|PF_FALLING))
{
if (pp->int_ppos().Z > pp->loz)
pp->set_int_ppos_Z(pp->loz - PLAYER_HEIGHT);
if (pp->int_ppos().Z > pp->int_ploz())
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_HEIGHT);
if (pp->int_ppos().Z < pp->hiz)
pp->set_int_ppos_Z(pp->hiz + PLAYER_HEIGHT);
if (pp->int_ppos().Z < pp->int_phiz())
pp->set_int_ppos_Z(pp->int_phiz() + PLAYER_HEIGHT);
}
else if (pp->Flags & (PF_SWIMMING|PF_DIVING))
{
if (pp->int_ppos().Z > pp->loz)
pp->set_int_ppos_Z(pp->loz - PLAYER_SWIM_HEIGHT);
if (pp->int_ppos().Z > pp->int_ploz())
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_SWIM_HEIGHT);
if (pp->int_ppos().Z < pp->hiz)
pp->set_int_ppos_Z(pp->hiz + PLAYER_SWIM_HEIGHT);
if (pp->int_ppos().Z < pp->int_phiz())
pp->set_int_ppos_Z(pp->int_phiz() + PLAYER_SWIM_HEIGHT);
}
}
}
@ -2819,10 +2819,10 @@ void DoPlayerJump(PLAYER* pp)
// if player gets to close the ceiling while jumping
//if (pp->posz < pp->hiz + Z(4))
if (PlayerCeilingHit(pp, pp->hiz + Z(4)))
if (PlayerCeilingHit(pp, pp->int_phiz() + Z(4)))
{
// put player at the ceiling
pp->set_int_ppos_Z(pp->hiz + Z(4));
pp->set_int_ppos_Z(pp->int_phiz() + Z(4));
// reverse your speed to falling
pp->jump_speed = -pp->jump_speed;
@ -2836,9 +2836,9 @@ void DoPlayerJump(PLAYER* pp)
// added this because jumping up to slopes or jumping on steep slopes
// sometimes caused the view to go into the slope
// if player gets to close the floor while jumping
if (PlayerFloorHit(pp, pp->loz - pp->floor_dist))
if (PlayerFloorHit(pp, pp->int_ploz() - pp->floor_dist))
{
pp->set_int_ppos_Z(pp->loz - pp->floor_dist);
pp->set_int_ppos_Z(pp->int_ploz() - pp->floor_dist);
pp->jump_speed = 0;
PlayerSectorBound(pp, Z(1));
@ -2888,10 +2888,10 @@ void DoPlayerForceJump(PLAYER* pp)
// if player gets to close the ceiling while jumping
//if (pp->posz < pp->hiz + Z(4))
if (PlayerCeilingHit(pp, pp->hiz + Z(4)))
if (PlayerCeilingHit(pp, pp->int_phiz() + Z(4)))
{
// put player at the ceiling
pp->set_int_ppos_Z(pp->hiz + Z(4));
pp->set_int_ppos_Z(pp->int_phiz() + Z(4));
// reverse your speed to falling
pp->jump_speed = -pp->jump_speed;
@ -2995,15 +2995,15 @@ void DoPlayerFall(PLAYER* pp)
// need a test for head hits a sloped ceiling while falling
// if player gets to close the Ceiling while Falling
if (PlayerCeilingHit(pp, pp->hiz + pp->ceiling_dist))
if (PlayerCeilingHit(pp, pp->int_phiz() + pp->ceiling_dist))
{
// put player at the ceiling
pp->set_int_ppos_Z(pp->hiz + pp->ceiling_dist);
pp->set_int_ppos_Z(pp->int_phiz() + pp->ceiling_dist);
// don't return or anything - allow to fall until
// hit floor
}
if (PlayerFloorHit(pp, pp->loz - PLAYER_HEIGHT + recoil_amt))
if (PlayerFloorHit(pp, pp->int_ploz() - PLAYER_HEIGHT + recoil_amt))
{
sectortype* sectp = pp->cursector;
@ -3025,7 +3025,7 @@ void DoPlayerFall(PLAYER* pp)
// i any kind of crawl key get rid of recoil
if (DoPlayerTestCrawl(pp) || (pp->input.actions & SB_CROUCH))
{
pp->set_int_ppos_Z(pp->loz - PLAYER_CRAWL_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_CRAWL_HEIGHT);
}
else
{
@ -3227,15 +3227,15 @@ void DoPlayerClimb(PLAYER* pp)
pp->add_int_ppos_Z(-climb_amt);
// if player gets to close the ceiling while climbing
if (PlayerCeilingHit(pp, pp->hiz))
if (PlayerCeilingHit(pp, pp->int_phiz()))
{
// put player at the hiz
pp->set_int_ppos_Z(pp->hiz);
pp->set_int_ppos_Z(pp->int_phiz());
NewStateGroup(pp->actor, sg_PlayerNinjaClimb);
}
// if player gets to close the ceiling while climbing
if (PlayerCeilingHit(pp, pp->hiz + Z(4)))
if (PlayerCeilingHit(pp, pp->int_phiz() + Z(4)))
{
// put player at the ceiling
pp->set_int_ppos_Z(pp->LadderSector->int_ceilingz() + Z(4));
@ -3267,10 +3267,10 @@ void DoPlayerClimb(PLAYER* pp)
// if you are touching the floor
//if (pp->posz >= pp->loz - Z(4) - PLAYER_HEIGHT)
if (PlayerFloorHit(pp, pp->loz - Z(4) - PLAYER_HEIGHT))
if (PlayerFloorHit(pp, pp->int_ploz() - Z(4) - PLAYER_HEIGHT))
{
// stand on floor
pp->set_int_ppos_Z(pp->loz - Z(4) - PLAYER_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - Z(4) - PLAYER_HEIGHT);
// if moving backwards start running
if (climbvel < 0)
@ -3410,7 +3410,7 @@ void DoPlayerBeginCrawl(PLAYER* pp)
bool PlayerFallTest(PLAYER* pp, int player_height)
{
// If the floor is far below you, fall hard instead of adjusting height
if (labs(pp->int_ppos().Z - pp->loz) > player_height + PLAYER_FALL_HEIGHT)
if (labs(pp->int_ppos().Z - pp->int_ploz()) > player_height + PLAYER_FALL_HEIGHT)
{
// if on a STEEP slope sector and you have not moved off of the sector
if (pp->lo_sectp &&
@ -3454,7 +3454,7 @@ void DoPlayerCrawl(PLAYER* pp)
// Let off of crawl to get up
if (!(pp->input.actions & SB_CROUCH))
{
if (labs(pp->loz - pp->hiz) >= PLAYER_STANDING_ROOM)
if (labs(pp->int_ploz() - pp->int_phiz()) >= PLAYER_STANDING_ROOM)
{
pp->Flags &= ~(PF_CRAWLING);
DoPlayerBeginRun(pp);
@ -3495,7 +3495,7 @@ void DoPlayerCrawl(PLAYER* pp)
if (pp->insector() && (pp->cursector->extra & SECTFX_DYNAMIC_AREA))
{
pp->set_int_ppos_Z(pp->loz - PLAYER_CRAWL_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_CRAWL_HEIGHT);
}
DoPlayerBob(pp);
@ -3591,16 +3591,16 @@ void DoPlayerFly(PLAYER* pp)
// so the player never goes into the ceiling/floor
// Only get so close to the ceiling
if (PlayerCeilingHit(pp, pp->hiz + PLAYER_FLY_BOB_AMT + Z(8)))
if (PlayerCeilingHit(pp, pp->int_phiz() + PLAYER_FLY_BOB_AMT + Z(8)))
{
pp->set_int_ppos_Z(pp->hiz + PLAYER_FLY_BOB_AMT + Z(8));
pp->set_int_ppos_Z(pp->int_phiz() + PLAYER_FLY_BOB_AMT + Z(8));
pp->z_speed = 0;
}
// Only get so close to the floor
if (PlayerFloorHit(pp, pp->loz - PLAYER_HEIGHT - PLAYER_FLY_BOB_AMT))
if (PlayerFloorHit(pp, pp->int_ploz() - PLAYER_HEIGHT - PLAYER_FLY_BOB_AMT))
{
pp->set_int_ppos_Z(pp->loz - PLAYER_HEIGHT - PLAYER_FLY_BOB_AMT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_HEIGHT - PLAYER_FLY_BOB_AMT);
pp->z_speed = 0;
}
@ -3726,7 +3726,7 @@ bool PlayerOnLadder(PLAYER* pp)
bool DoPlayerTestCrawl(PLAYER* pp)
{
if (labs(pp->loz - pp->hiz) < PLAYER_STANDING_ROOM)
if (labs(pp->int_ploz() - pp->int_phiz()) < PLAYER_STANDING_ROOM)
return true;
return false;
@ -3770,7 +3770,7 @@ int PlayerCanDive(PLAYER* pp)
pp->z_speed = Z(20);
pp->jump_speed = 0;
if (pp->int_ppos().Z > pp->loz - Z(pp->WadeDepth) - Z(2))
if (pp->int_ppos().Z > pp->int_ploz() - Z(pp->WadeDepth) - Z(2))
{
DoPlayerBeginDive(pp);
}
@ -4419,9 +4419,9 @@ void DoPlayerDive(PLAYER* pp)
if (sectu && (sectu->number == 0 || (sectu->flags & SECTFU_CANT_SURFACE)))
{
// for room over room water the hiz will be the top rooms ceiling
if (pp->int_ppos().Z < pp->hiz + pp->ceiling_dist)
if (pp->int_ppos().Z < pp->int_phiz() + pp->ceiling_dist)
{
pp->set_int_ppos_Z(pp->hiz + pp->ceiling_dist);
pp->set_int_ppos_Z(pp->int_phiz() + pp->ceiling_dist);
}
}
else
@ -4430,7 +4430,7 @@ void DoPlayerDive(PLAYER* pp)
// !JIM! FRANK - I added !pp->hiActor so that you don't warp to surface when
// there is a sprite above you since getzrange returns a hiz < ceiling height
// if you are clipping into a sprite and not the ceiling.
if (pp->int_ppos().Z < pp->hiz + Z(4) && !pp->highActor)
if (pp->int_ppos().Z < pp->int_phiz() + Z(4) && !pp->highActor)
{
DoPlayerStopDive(pp);
return;
@ -4438,9 +4438,9 @@ void DoPlayerDive(PLAYER* pp)
}
// Only get so close to the floor
if (pp->int_ppos().Z >= pp->loz - PLAYER_DIVE_HEIGHT)
if (pp->int_ppos().Z >= pp->int_ploz() - PLAYER_DIVE_HEIGHT)
{
pp->set_int_ppos_Z(pp->loz - PLAYER_DIVE_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_DIVE_HEIGHT);
}
// make player bob if sitting still
@ -4465,13 +4465,13 @@ void DoPlayerDive(PLAYER* pp)
}
// Reverse bobbing when getting close to the floor
if (pp->int_ppos().Z + pp->bob_amt >= pp->loz - PLAYER_DIVE_HEIGHT)
if (pp->int_ppos().Z + pp->bob_amt >= pp->int_ploz() - PLAYER_DIVE_HEIGHT)
{
pp->bob_ndx = NORM_ANGLE(pp->bob_ndx + ((1024 + 512) - pp->bob_ndx) * 2);
DoPlayerSpriteBob(pp, PLAYER_DIVE_HEIGHT, PLAYER_DIVE_BOB_AMT, 3);
}
// Reverse bobbing when getting close to the ceiling
if (pp->int_ppos().Z + pp->bob_amt < pp->hiz + pp->ceiling_dist)
if (pp->int_ppos().Z + pp->bob_amt < pp->int_phiz() + pp->ceiling_dist)
{
pp->bob_ndx = NORM_ANGLE(pp->bob_ndx + ((512) - pp->bob_ndx) * 2);
DoPlayerSpriteBob(pp, PLAYER_DIVE_HEIGHT, PLAYER_DIVE_BOB_AMT, 3);
@ -4723,7 +4723,7 @@ void DoPlayerWade(PLAYER* pp)
}
// If the floor is far below you, fall hard instead of adjusting height
if (labs(pp->int_ppos().Z - pp->loz) > PLAYER_HEIGHT + PLAYER_FALL_HEIGHT)
if (labs(pp->int_ppos().Z - pp->int_ploz()) > PLAYER_HEIGHT + PLAYER_FALL_HEIGHT)
{
pp->jump_speed = Z(1);
DoPlayerBeginFall(pp);
@ -4740,7 +4740,7 @@ void DoPlayerWade(PLAYER* pp)
}
// If the floor is far below you, fall hard instead of adjusting height
if (labs(pp->int_ppos().Z - pp->loz) > PLAYER_HEIGHT + PLAYER_FALL_HEIGHT)
if (labs(pp->int_ppos().Z - pp->int_ploz()) > PLAYER_HEIGHT + PLAYER_FALL_HEIGHT)
{
pp->jump_speed = Z(1);
DoPlayerBeginFall(pp);
@ -5204,10 +5204,10 @@ void DoPlayerDeathJump(PLAYER* pp)
// if player gets to close the ceiling while jumping
//if (pp->posz < pp->hiz + Z(4))
if (PlayerCeilingHit(pp, pp->hiz + Z(4)))
if (PlayerCeilingHit(pp, pp->int_phiz() + Z(4)))
{
// put player at the ceiling
pp->set_int_ppos_Z(pp->hiz + Z(4));
pp->set_int_ppos_Z(pp->int_phiz() + Z(4));
// reverse your speed to falling
pp->jump_speed = -pp->jump_speed;
@ -5239,12 +5239,12 @@ void DoPlayerDeathFall(PLAYER* pp)
loz = pp->lo_sectp->int_floorz();
}
else
loz = pp->loz;
loz = pp->int_ploz();
if (PlayerFloorHit(pp, loz - PLAYER_DEATH_HEIGHT))
//if (pp->posz > loz - PLAYER_DEATH_HEIGHT)
{
if (loz != pp->loz)
if (loz != pp->int_ploz())
SpawnSplash(pp->actor);
if (RandomRange(1000) > 500)
@ -5630,7 +5630,7 @@ void DoPlayerDeathZrange(PLAYER* pp)
DoFindGround(pp->actor);
// update player values with results from DoFindGround
pp->loz = plActor->user.int_loz();
pp->_loz = plActor->user.int_loz();
pp->lowActor = plActor->user.lowActor;
pp->lo_sectp = plActor->user.lo_sectp;
}
@ -5702,7 +5702,7 @@ void DoPlayerDeathCheckKeys(PLAYER* pp)
{
// Spawn a dead LoWang body for non-head deaths
// Hey Frank, if you think of a better check, go ahead and put it in.
if (PlayerFloorHit(pp, pp->loz - PLAYER_HEIGHT))
if (PlayerFloorHit(pp, pp->int_ploz() - PLAYER_HEIGHT))
{
if (pp->DeathType == PLAYER_DEATH_FLIP || pp->DeathType == PLAYER_DEATH_RIPPER)
QueueLoWangs(pp->actor);
@ -5828,7 +5828,7 @@ void DoPlayerDeathCheckKick(PLAYER* pp)
DoPlayerZrange(pp);
// sector stomper kick
if (labs(pp->loz - pp->hiz) < int_ActorSizeZ(plActor) - Z(8))
if (labs(pp->int_ploz() - pp->int_phiz()) < int_ActorSizeZ(plActor) - Z(8))
{
plActor->user.slide_ang = RANDOM_P2(2048);
plActor->user.slide_vel = 1000;
@ -5964,9 +5964,9 @@ void DoPlayerDeathDrown(PLAYER* pp)
actor->spr.pos.Z += 4;
// Stick like glue when you hit the ground
if (pp->int_ppos().Z > pp->loz - PLAYER_DEATH_HEIGHT)
if (pp->int_ppos().Z > pp->int_ploz() - PLAYER_DEATH_HEIGHT)
{
pp->set_int_ppos_Z(pp->loz - PLAYER_DEATH_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_DEATH_HEIGHT);
pp->Flags &= ~(PF_FALLING);
}
}
@ -6181,7 +6181,7 @@ void DoPlayerRun(PLAYER* pp)
//DoPlayerHeight(pp);
//DoPlayerHeight(pp);
//DoPlayerHeight(pp);
pp->set_int_ppos_Z(pp->loz - PLAYER_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_HEIGHT);
DoPlayerBeginJump(pp);
return;
}
@ -6276,7 +6276,7 @@ void DoPlayerRun(PLAYER* pp)
if ((pp->cursector->extra & SECTFX_DYNAMIC_AREA))
{
pp->set_int_ppos_Z(pp->loz - PLAYER_HEIGHT);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_HEIGHT);
}
// Adjust height moving up and down sectors
@ -6468,7 +6468,7 @@ void PlayerGlobal(PLAYER* pp)
// just adjusted min height to something small to take care of all cases
min_height = PLAYER_MIN_HEIGHT;
if (labs(pp->loz - pp->hiz) < min_height)
if (labs(pp->int_ploz() - pp->int_phiz()) < min_height)
{
if (!(pp->Flags & PF_DEAD))
{
@ -7045,8 +7045,8 @@ DEFINE_FIELD_X(SWPlayer, PLAYER, down_speed)
DEFINE_FIELD_X(SWPlayer, PLAYER, up_speed)
DEFINE_FIELD_X(SWPlayer, PLAYER, z_speed)
DEFINE_FIELD_X(SWPlayer, PLAYER, climb_ndx)
DEFINE_FIELD_X(SWPlayer, PLAYER, hiz)
DEFINE_FIELD_X(SWPlayer, PLAYER, loz)
DEFINE_FIELD_X(SWPlayer, PLAYER, _hiz)
DEFINE_FIELD_X(SWPlayer, PLAYER, _loz)
DEFINE_FIELD_X(SWPlayer, PLAYER, ceiling_dist)
DEFINE_FIELD_X(SWPlayer, PLAYER, floor_dist)
DEFINE_FIELD_X(SWPlayer, PLAYER, circle_camera_dist)

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

@ -960,7 +960,6 @@ int InitRipperHang(DSWActor* actor)
actor->user.StateFallOverride = sg_RipperHangFall;
DoActorSetSpeed(actor, FAST_SPEED);
//actor->user.jump_speed = -800;
PickJumpMaxSpeed(actor, -800);
actor->user.Flags |= (SPR_JUMPING);
@ -1057,7 +1056,6 @@ int DoRipperBeginJumpAttack(DSWActor* actor)
DoActorSetSpeed(actor, FAST_SPEED);
//actor->user.jump_speed = -800;
PickJumpMaxSpeed(actor, -400); // was -800
actor->user.Flags |= (SPR_JUMPING);

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

@ -969,7 +969,6 @@ int InitRipper2Hang(DSWActor* actor)
actor->user.StateFallOverride = sg_Ripper2HangFall;
DoActorSetSpeed(actor, FAST_SPEED);
//actor->user.jump_speed = -800;
PickJumpMaxSpeed(actor, -(RandomRange(400)+100));
actor->user.Flags |= (SPR_JUMPING);
@ -1079,7 +1078,6 @@ int DoRipper2BeginJumpAttack(DSWActor* actor)
DoActorSetSpeed(actor, FAST_SPEED);
//actor->user.jump_speed = -800;
PickJumpMaxSpeed(actor, -(RandomRange(400)+100));
actor->user.Flags |= (SPR_JUMPING);

4
source/games/sw/src/save.cpp
View file

@ -453,8 +453,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYER& w, PLAYER*
("up_speed", w.up_speed)
("z_speed", w.z_speed)
("climb_ndx", w.climb_ndx)
("hiz", w.hiz)
("loz", w.loz)
("hiz", w._hiz)
("loz", w._loz)
("ceiling_dist", w.ceiling_dist)
("floor_dist", w.floor_dist)
("hi_sectp", w.hi_sectp)

4
source/games/sw/src/spike.cpp
View file

@ -200,7 +200,7 @@ int DoSpikeMove(DSWActor* actor, double *lptr)
if (zval < actor->user.z_tgt)
{
// move it DOWN
zval += (synctics * actor->user.jump_speed) * zinttoworld;
zval += (synctics * actor->user.jump_speed) * JUMP_FACTOR;
actor->user.jump_speed += actor->user.vel_rate * synctics;
@ -213,7 +213,7 @@ int DoSpikeMove(DSWActor* actor, double *lptr)
if (zval > actor->user.z_tgt)
{
// move it UP
zval -= (synctics * actor->user.jump_speed) * zinttoworld;
zval -= (synctics * actor->user.jump_speed) * JUMP_FACTOR;
actor->user.jump_speed += actor->user.vel_rate * synctics;

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

@ -1781,8 +1781,8 @@ PlayerPart:
// move up some for really fast moving plats
//pp->posz -= PLAYER_HEIGHT + Z(12);
DoPlayerZrange(pp);
pp->set_int_ppos_Z(pp->loz - PLAYER_CRAWL_HEIGHT);
pp->actor->set_int_z(pp->loz);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_CRAWL_HEIGHT);
pp->actor->set_int_z(pp->int_ploz());
}
else
{
@ -1792,8 +1792,8 @@ PlayerPart:
if (!(pp->Flags & (PF_JUMPING | PF_FALLING | PF_FLYING)))
{
pp->set_int_ppos_Z(pp->loz - PLAYER_HEIGHT);
pp->actor->set_int_z(pp->loz);
pp->set_int_ppos_Z(pp->int_ploz() - PLAYER_HEIGHT);
pp->actor->set_int_z(pp->int_ploz());
}
}
}

4
source/games/sw/src/vator.cpp
View file

@ -332,7 +332,7 @@ int DoVatorMove(DSWActor* actor, double *lptr)
if (zval < actor->user.z_tgt)
{
// move it DOWN
zval += (synctics * actor->user.jump_speed) * zinttoworld;
zval += (synctics * actor->user.jump_speed) * JUMP_FACTOR;
actor->user.jump_speed += actor->user.vel_rate * synctics;
@ -345,7 +345,7 @@ int DoVatorMove(DSWActor* actor, double *lptr)
if (zval > actor->user.z_tgt)
{
// move it UP
zval -= (synctics * actor->user.jump_speed) * zinttoworld;
zval -= (synctics * actor->user.jump_speed) * JUMP_FACTOR;
actor->user.jump_speed += actor->user.vel_rate * synctics;

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

@ -3689,7 +3689,7 @@ AutoShrap:
}
// for FastShrap
actor->user.change.Z = labs(actor->user.jump_speed*4) - RandomRange(labs(actor->user.jump_speed)*8)*2;
actor->user.change.Z = abs(actor->user.jump_speed*4) - RandomRange(labs(actor->user.jump_speed)*8)*2;
actor->user.WaitTics = WaitTics + RandomRange(WaitTics/2);
switch (actor->user.ID)
@ -4152,7 +4152,7 @@ int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, i
actorNew->user.change.Y = MOVEy(actorNew->spr.xvel, actorNew->int_ang());
// for FastShrap
actorNew->user.change.Z = labs(actorNew->user.jump_speed*4) - RandomRange(labs(actorNew->user.jump_speed)*8);
actorNew->user.change.Z = abs(actorNew->user.jump_speed*4) - RandomRange(labs(actorNew->user.jump_speed)*8);
actorNew->user.WaitTics = 64 + RANDOM_P2(32);
actor->user.Flags |= (SPR_BOUNCE);

2
wadsrc/static/zscript/games/sw/swgame.zs
View file

@ -191,7 +191,7 @@ struct SWPlayer native
native int16 down_speed, up_speed; // diving
native int z_speed; // used for diving and flying instead of down_speed, up_speed
native int climb_ndx;
native int hiz,loz;
//native int hiz,loz;
native int ceiling_dist,floor_dist;
native int circle_camera_dist;
native int16 siang;