zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 14:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SectorObjectSetupBounds

Browse source 
Note: Do proper checks on crashing mapping errors. Asserts are insufficient for these!
This commit is contained in:
Christoph Oelckers 2021-11-05 23:59:45 +01:00
parent 41f8c6f4af
commit c34f0ab210
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5495,8 +5495,7 @@ DoGet(DSWActor* actor)
TRAVERSE_CONNECT(pnum)
{
pp = &Player[pnum];
//pu = User[pp->PlayerSprite].Data();
pu = User[pp->SpriteP - sprite].Data();
pu = pp->Actor()->u();
if (TEST(pp->Flags, PF_DEAD))
continue;

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

@ -698,17 +698,14 @@ TrackSetup(void)
}
SPRITEp
FindBoundSprite(int tag)
DSWActor* FindBoundSprite(int tag)
{
int sn;
StatIterator it(STAT_ST1);
while ((sn = it.NextIndex()) >= 0)
SWStatIterator it(STAT_ST1);
while (auto actor = it.Next())
{
if (sprite[sn].hitag == tag)
if (actor->s().hitag == tag)
{
return &sprite[sn];
return actor;
}
}
@ -722,7 +719,7 @@ SectorObjectSetupBounds(SECTOR_OBJECTp sop)
int xlow, ylow, xhigh, yhigh;
int startwall, endwall;
int i, k, j;
SPRITEp BoundSprite;
DSWActor* BoundActor = nullptr;
bool FoundOutsideLoop = false;
bool SectorInBounds;
SECTORp *sectp;
@ -742,23 +739,29 @@ SectorObjectSetupBounds(SECTOR_OBJECTp sop)
// search for 2 sprite bounding tags
BoundSprite = FindBoundSprite(500 + (int(sop - SectorObject) * 5));
BoundActor = FindBoundSprite(500 + (int(sop - SectorObject) * 5));
if (BoundActor == nullptr)
{
I_Error("SOP bound sprite with hitag %d not found", 500 + (int(sop - SectorObject) * 5));
}
auto BoundSprite = &BoundActor->s();
//DSPRINTF(ds,"tagnum %d, so num %d",500 + ((sop - SectorObject) * 5), sop - SectorObject);
MONO_PRINT(ds);
ASSERT(BoundSprite != nullptr);
xlow = BoundSprite->x;
ylow = BoundSprite->y;
KillSprite(short(BoundSprite - sprite));
KillActor(BoundActor);
BoundActor = FindBoundSprite(501 + (int(sop - SectorObject) * 5));
if (BoundActor == nullptr)
{
I_Error("SOP bound sprite with hitag %d not found", 501 + (int(sop - SectorObject) * 5));
}
BoundSprite = &BoundActor->s();
BoundSprite = FindBoundSprite(501 + (int(sop - SectorObject) * 5));
ASSERT(BoundSprite != nullptr);
xhigh = BoundSprite->x;
yhigh = BoundSprite->y;
KillSprite(short(BoundSprite - sprite));
KillActor(BoundActor);
// set radius for explosion checking - based on bounding box
u->Radius = DIV4((xhigh - xlow) + (yhigh - ylow));
@ -766,13 +769,14 @@ SectorObjectSetupBounds(SECTOR_OBJECTp sop)
// search for center sprite if it exists
BoundSprite = FindBoundSprite(SECT_SO_CENTER);
if (BoundSprite)
BoundActor = FindBoundSprite(SECT_SO_CENTER);
if (BoundActor)
{
auto BoundSprite = &BoundActor->s();
sop->xmid = BoundSprite->x;
sop->ymid = BoundSprite->y;
sop->zmid = BoundSprite->z;
KillSprite(short(BoundSprite - sprite));
KillActor(BoundActor);
}
#if 0
@ -3629,8 +3633,6 @@ int ActorFollowTrack(DSWActor* actor, short locktics)
SPRITEp sp = &actor->s();
PLAYERp pp;
int move_actor(short SpriteNum, int xchange, int ychange, int zchange);
TRACK_POINTp tpoint;
short pnum;
int nx = 0, ny = 0, nz = 0, dx, dy, dz;