zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ActorDrop.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-06 10:33:21 +01:00
parent 56760d1824
commit cd73cd616e
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4780,11 +4780,11 @@ int DoActorGlobZ(DSWActor* actor)
} }
bool bool ActorDrop(DSWActor* actor, int x, int y, int z, short new_sector, short min_height)
ActorDrop(short SpriteNum, int x, int y, int z, short new_sector, short min_height)
{ {
SPRITEp sp = &sprite[SpriteNum]; SPRITEp sp = &actor->s();
int ceilhit, florhit, hiz, loz; int hiz, loz;
Collision ceilhit, florhit;
short save_cstat; short save_cstat;
// look only at the center point for a floor sprite // look only at the center point for a floor sprite
@ -4793,21 +4793,16 @@ ActorDrop(short SpriteNum, int x, int y, int z, short new_sector, short min_heig
FAFgetzrangepoint(x, y, z - DIV2(SPRITEp_SIZE_Z(sp)), new_sector, &hiz, &ceilhit, &loz, &florhit); FAFgetzrangepoint(x, y, z - DIV2(SPRITEp_SIZE_Z(sp)), new_sector, &hiz, &ceilhit, &loz, &florhit);
SET(sp->cstat, save_cstat); SET(sp->cstat, save_cstat);
if (florhit < 0 || ceilhit < 0) if (florhit.type < 0 || ceilhit.type < 0)
{ {
//SetSuicide(actor);
return true; return true;
} }
switch (florhit.type)
// ASSERT(florhit >= 0);
// ASSERT(ceilhit >= 0);
switch (TEST(florhit, HIT_MASK))
{ {
case HIT_SPRITE: case kHitSprite:
{ {
SPRITEp hsp = &sprite[florhit & 4095]; SPRITEp hsp = &florhit.actor->s();
// if its a floor sprite and not too far down // if its a floor sprite and not too far down
if (TEST(hsp->cstat, CSTAT_SPRITE_ALIGNMENT_FLOOR) && if (TEST(hsp->cstat, CSTAT_SPRITE_ALIGNMENT_FLOOR) &&
@ -4819,7 +4814,7 @@ ActorDrop(short SpriteNum, int x, int y, int z, short new_sector, short min_heig
break; break;
} }
case HIT_SECTOR: case kHitSector:
{ {
if (labs(loz - z) <= min_height) if (labs(loz - z) <= min_height)
{ {
@ -4840,7 +4835,6 @@ ActorDrop(short SpriteNum, int x, int y, int z, short new_sector, short min_heig
bool bool
DropAhead(DSWActor* actor, short min_height) DropAhead(DSWActor* actor, short min_height)
{ {
int SpriteNum = actor->GetSpriteIndex();
SPRITEp sp = &actor->s(); SPRITEp sp = &actor->s();
int dax, day; int dax, day;
int newsector; int newsector;
@ -4855,7 +4849,7 @@ DropAhead(DSWActor* actor, short min_height)
updatesector(dax, day, &newsector); updatesector(dax, day, &newsector);
// look straight down for a drop // look straight down for a drop
if (ActorDrop(SpriteNum, dax, day, sp->z, newsector, min_height)) if (ActorDrop(actor, dax, day, sp->z, newsector, min_height))
return true; return true;
return false; return false;
@ -4931,9 +4925,8 @@ int move_actor(DSWActor* actor, int xchange, int ychange, int zchange)
return false; return false;
} }
if (ActorDrop(SpriteNum, sp->x, sp->y, sp->z, sp->sectnum, u->lo_step)) if (ActorDrop(actor, sp->x, sp->y, sp->z, sp->sectnum, u->lo_step))
{ {
//printf("cancel move 2\n", sp->z, u->loz);
// cancel move // cancel move
sp->x = x; sp->x = x;
sp->y = y; sp->y = y;