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

- floatified globloz and globhiz

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 16:29:39 +02:00
parent d573ba4cad
commit d3715e3332
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ extern STATE s_CarryFlag[];
extern STATE s_CarryFlagNoDet[]; extern STATE s_CarryFlagNoDet[];
// beware of mess... :( // beware of mess... :(
static int globhiz, globloz; static double globhiz, globloz;
static Collision globhihit, globlohit; static Collision globhihit, globlohit;
short wait_active_check_offset; short wait_active_check_offset;
@ -4487,8 +4487,8 @@ void DoActorZrange(DSWActor* actor)
int DoActorGlobZ(DSWActor* actor) int DoActorGlobZ(DSWActor* actor)
{ {
actor->user.loz = globloz * zinttoworld; actor->user.loz = globloz;
actor->user.hiz = globhiz * zinttoworld; actor->user.hiz = globhiz;
actor->user.lo_sectp = actor->user.hi_sectp = nullptr; actor->user.lo_sectp = actor->user.hi_sectp = nullptr;
actor->user.highActor = nullptr; actor->user.highActor = nullptr;
@ -4632,7 +4632,7 @@ int move_actor(DSWActor* actor, int xchange, int ychange, int zchange)
// try and determine whether you moved > lo_step in the z direction // 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 (!(actor->user.Flags & (SPR_NO_SCAREDZ | SPR_JUMPING | SPR_CLIMBING | SPR_FALLING | SPR_DEAD | SPR_SWIMMING)))
{ {
if (abs(actor->int_pos().Z - globloz) > actor->user.lo_step) if (abs(actor->spr.pos.Z - globloz) > actor->user.lo_step * zinttoworld)
{ {
// cancel move // cancel move
actor->spr.pos = apos; actor->spr.pos = apos;
@ -6266,7 +6266,7 @@ Collision move_sprite(DSWActor* actor, int xchange, int ychange, int zchange, in
clippos.Z = actor->int_pos().Z + ((zchange * numtics) >> 3); clippos.Z = actor->int_pos().Z + ((zchange * numtics) >> 3);
// test for hitting ceiling or floor // test for hitting ceiling or floor
if ((clippos.Z - zh <= globhiz) || (clippos.Z - zh > globloz)) if ((clippos.Z - zh <= globhiz * zworldtoint) || (clippos.Z - zh > globloz * zworldtoint))
{ {
if (retval.type == kHitNone) if (retval.type == kHitNone)
{ {
@ -6384,8 +6384,7 @@ int MissileZrange(DSWActor* actor)
auto tempshort = actor->spr.cstat; auto tempshort = actor->spr.cstat;
actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK); actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK);
FAFgetzrangepoint(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z - 1, actor->sector(), FAFgetzrangepoint(actor->spr.pos.plusZ(-maptoworld), actor->sector(), &globhiz, &globhihit, &globloz, &globlohit);
&globhiz, &globhihit, &globloz, &globlohit);
actor->spr.cstat = tempshort; actor->spr.cstat = tempshort;
@ -6439,8 +6438,7 @@ Collision move_missile(DSWActor* actor, int xchange, int ychange, int zchange, i
auto tempshort = actor->spr.cstat; auto tempshort = actor->spr.cstat;
actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK); actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK);
FAFgetzrangepoint(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z - 1, actor->sector(), FAFgetzrangepoint(actor->spr.pos.plusZ(-zmaptoworld), actor->sector(), &globhiz, &globhihit, &globloz, &globlohit);
&globhiz, &globhihit, &globloz, &globlohit);
actor->spr.cstat = tempshort; actor->spr.cstat = tempshort;