teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- smaller changes in sector.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-06 00:52:51 +02:00
parent fce5f01f07
commit dc22b2e0ae
2 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1627,7 +1627,6 @@ inline int DistanceI(const DVector2& pos1, const DVector2& pos2)
} }
int NewStateGroup(DSWActor* actor, STATE* SpriteGroup[]); int NewStateGroup(DSWActor* actor, STATE* SpriteGroup[]);
void SectorMidPoint(sectortype* sect, int *xmid, int *ymid, int *zmid);
DVector3 SectorMidPoint(sectortype* sectp); DVector3 SectorMidPoint(sectortype* sectp);
void SpawnUser(DSWActor* actor, short id, STATE* state); void SpawnUser(DSWActor* actor, short id, STATE* state);

34
source/games/sw/src/sector.cpp
View file

@ -633,28 +633,6 @@ void SectorSetup(void)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void SectorMidPoint(sectortype* sectp, int *xmid, int *ymid, int *zmid)
{
int xsum = 0, ysum = 0;
for(auto& wal : wallsofsector(sectp))
{
xsum += wal.wall_int_pos().X;
ysum += wal.wall_int_pos().Y;
}
*xmid = xsum / (sectp->wallnum);
*ymid = ysum / (sectp->wallnum);
*zmid = (sectp->int_floorz() + sectp->int_ceilingz()) >> 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
DVector3 SectorMidPoint(sectortype* sectp) DVector3 SectorMidPoint(sectortype* sectp)
{ {
DVector3 sum(0,0,0); DVector3 sum(0,0,0);
@ -1285,21 +1263,20 @@ void KillMatchingCrackSprites(short match)
void WeaponExplodeSectorInRange(DSWActor* wActor) void WeaponExplodeSectorInRange(DSWActor* wActor)
{ {
int dist;
int radius; int radius;
SWStatIterator it(STAT_SPRITE_HIT_MATCH); SWStatIterator it(STAT_SPRITE_HIT_MATCH);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
// test to see if explosion is close to crack sprite // test to see if explosion is close to crack sprite
dist = FindDistance3D(wActor->int_pos() - actor->int_pos()); double dist = (wActor->spr.pos - actor->spr.pos).Length();
if (actor->spr.clipdist == 0) if (actor->spr.clipdist == 0)
continue; continue;
radius = (((int)actor->spr.clipdist) << 2) * 8; radius = (((int)actor->spr.clipdist) << 2) * 8;
if ((unsigned int)dist > (wActor->user.Radius/2) + radius) if (dist > ((wActor->user.Radius/2) + radius) * inttoworld)
continue; continue;
if (!FAFcansee(wActor->spr.pos, wActor->sector(), actor->spr.pos, actor->sector())) if (!FAFcansee(wActor->spr.pos, wActor->sector(), actor->spr.pos, actor->sector()))
@ -1356,7 +1333,7 @@ void DoDeleteSpriteMatch(short match)
STAT_FAF STAT_FAF
}; };
int del_x = 0,del_y = 0; DVector2 del = {0,0};
unsigned stat; unsigned stat;
while (true) while (true)
@ -1370,8 +1347,7 @@ void DoDeleteSpriteMatch(short match)
if (actor->spr.lotag == match) if (actor->spr.lotag == match)
{ {
found = actor; found = actor;
del_x = actor->int_pos().X; del = actor->spr.pos;
del_y = actor->int_pos().Y;
break; break;
} }
} }
@ -1384,7 +1360,7 @@ void DoDeleteSpriteMatch(short match)
it.Reset(StatList[stat]); it.Reset(StatList[stat]);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
if (del_x == actor->int_pos().X && del_y == actor->int_pos().Y) if (del == actor->spr.pos)
{ {
// special case lighting delete of Fade On/off after fades // special case lighting delete of Fade On/off after fades
if (StatList[stat] == STAT_LIGHTING) if (StatList[stat] == STAT_LIGHTING)