teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-03 14:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified lo_step.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 18:21:30 +02:00
parent 9ba03ac53f
commit 6feb187a2a
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS
ANIMATOR InitActorRunToward;
bool DropAhead(DSWActor* actor, int min_height);
bool DropAhead(DSWActor* actor, double min_height);
ANIMATOR* ChooseAction(DECISION decision[]);

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

@ -781,10 +781,10 @@ int SetupBunny(DSWActor* actor)
actor->user.Flags |= (SPR_XFLIP_TOGGLE);
actor->user.zclip = (16);
actor->user.floor_dist = (8);
actor->user.ceiling_dist = (8);
actor->user.lo_step = Z(16);
actor->user.zclip = 16;
actor->user.floor_dist = 8;
actor->user.ceiling_dist = 8;
actor->user.lo_step = 16;
return 0;
}

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

@ -405,12 +405,12 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SET* action, PERSONALITY* perso
actor->user.spal = actor->spr.pal;
actor->user.RotNum = 5;
actor->spr.clipdist = (256) >> 2;
actor->spr.clipdist = 256 >> 2;
actor->user.zclip = (48);
actor->user.lo_step = Z(32);
actor->user.zclip = 48;
actor->user.lo_step = 32;
actor->user.floor_dist = actor->user.zclip - actor->user.lo_step * zinttoworld;
actor->user.floor_dist = actor->user.zclip - actor->user.lo_step;
actor->user.ceiling_dist = ActorSizeZ(actor) - actor->user.zclip;
actor->user.Radius = 400;

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

@ -993,7 +993,7 @@ struct USER
int16_t jump_grav;
// clipmove
int16_t lo_step;
double lo_step;
int active_range;
sectortype* hi_sectp, *lo_sectp;

6
source/games/sw/src/serp.cpp
View file

@ -733,11 +733,11 @@ int SetupSerp(DSWActor* actor)
actor->user.loz = actor->spr.pos.Z;
// amount to move up for clipmove
actor->user.zclip = (80);
actor->user.zclip = 80;
// size of step can walk off of
actor->user.lo_step = Z(40);
actor->user.lo_step = 40;
actor->user.floor_dist = actor->user.zclip - actor->user.lo_step * zinttoworld;
actor->user.floor_dist = actor->user.zclip - actor->user.lo_step;
actor->user.ceiling_dist = ActorSizeZ(actor) - actor->user.zclip;
return 0;

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

@ -4542,7 +4542,7 @@ bool ActorDrop(DSWActor* actor, const DVector3& pos, sectortype* new_sector, dou
}
// Primarily used in ai.c for now - need to get rid of
bool DropAhead(DSWActor* actor, int min_height)
bool DropAhead(DSWActor* actor, double min_height)
{
auto vect = actor->spr.pos + MOVExy(256, actor->spr.angle);
@ -4550,7 +4550,7 @@ bool DropAhead(DSWActor* actor, int min_height)
updatesector(vect, &newsector);
// look straight down for a drop
if (ActorDrop(actor, vect, newsector, min_height * zinttoworld))
if (ActorDrop(actor, vect, newsector, min_height))
return true;
return false;
@ -4600,7 +4600,7 @@ int move_actor(DSWActor* actor, int xchange, int ychange, int zchange)
// try and determine whether you moved > lo_step in the z direction
if (!(actor->user.Flags & (SPR_NO_SCAREDZ | SPR_JUMPING | SPR_CLIMBING | SPR_FALLING | SPR_DEAD | SPR_SWIMMING)))
{
if (abs(actor->spr.pos.Z - globloz) > actor->user.lo_step * zinttoworld)
if (abs(actor->spr.pos.Z - globloz) > actor->user.lo_step)
{
// cancel move
actor->spr.pos = apos;
@ -4616,7 +4616,7 @@ int move_actor(DSWActor* actor, int xchange, int ychange, int zchange)
return false;
}
if (ActorDrop(actor, actor->spr.pos, actor->sector(), actor->user.lo_step * zinttoworld))
if (ActorDrop(actor, actor->spr.pos, actor->sector(), actor->user.lo_step))
{
// cancel move
actor->spr.pos = apos;