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

- SW: use BFSSearch in TraverseBreakableWalls

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-16 23:47:17 +01:00
parent 3e558c2295
commit 7111b2470c
3 changed files with 14 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/gamefuncs.cpp
View file

@ -24,8 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gamestruct.h" #include "gamestruct.h"
#include "intvec.h" #include "intvec.h"
TArray<int> GlobalSectorList; //This is a shared list. Every client must leave it in the same state as it was when it started.
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// Unified chasecam function for all games. // Unified chasecam function for all games.

2
source/core/gamefuncs.h
View file

@ -71,8 +71,6 @@ public:
} }
}; };
extern TArray<int> GlobalSectorList;
extern int cameradist, cameraclock; extern int cameradist, cameraclock;
void loaddefinitionsfile(const char* fn, bool cumulative = false, bool maingrp = false); void loaddefinitionsfile(const char* fn, bool cumulative = false, bool maingrp = false);

50
source/games/sw/src/weapon.cpp
View file

@ -7621,9 +7621,8 @@ short StatBreakList[] =
void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, int radius) void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, int radius)
{ {
int j, k; int k;
int sect, startwall, endwall, nextsector; int sect, startwall, endwall, nextsector;
unsigned sectlistplc, sectliststart;
int xmid,ymid; int xmid,ymid;
int dist; int dist;
short break_count; short break_count;
@ -7633,29 +7632,24 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
int hit_x,hit_y,hit_z; int hit_x,hit_y,hit_z;
sectliststart = sectlistplc = GlobalSectorList.Size();
GlobalSectorList.Push(start_sect);
// limit radius // limit radius
if (radius > 2000) if (radius > 2000)
radius = 2000; radius = 2000;
break_count = 0; break_count = 0;
while (sectlistplc < GlobalSectorList.Size())
BFSSearch search(numsectors, start_sect);
for (unsigned sect; (sect = search.GetNext()) != BFSSearch::EOL;)
{ {
sect = GlobalSectorList[sectlistplc++]; for(auto& wal : wallsofsector(sect))
startwall = sector[sect].wallptr;
endwall = startwall + sector[sect].wallnum;
for (j = startwall; j < endwall - 1; j++)
{ {
// see if this wall should be broken // see if this wall should be broken
if (wall[j].lotag == TAG_WALL_BREAK) if (wal.lotag == TAG_WALL_BREAK)
{ {
// find midpoint // find midpoint
xmid = (wall[j].x + wall[j+1].x) >> 1; xmid = (wal.x + wal.point2Wall()->x) >> 1;
ymid = (wall[j].y + wall[j+1].y) >> 1; ymid = (wal.y + wal.point2Wall()->y) >> 1;
// don't need to go further if wall is too far out // don't need to go further if wall is too far out
@ -7663,44 +7657,28 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
if (dist > radius) if (dist > radius)
continue; continue;
if (WallBreakPosition(j, &sectnum, &hit_x, &hit_y, &hit_z, &wall_ang)) if (WallBreakPosition(wallnum(&wal), &sectnum, &hit_x, &hit_y, &hit_z, &wall_ang))
{ {
if (hit_x != INT32_MAX && sectnum >= 0 && FAFcansee(x, y, z, start_sect, hit_x, hit_y, hit_z, sectnum)) if (hit_x != INT32_MAX && sectnum >= 0 && FAFcansee(x, y, z, start_sect, hit_x, hit_y, hit_z, sectnum))
{ {
//HitBreakWall(&wall[j], x, y, z, ang, 0); HitBreakWall(&wal, INT32_MAX, INT32_MAX, INT32_MAX, ang, 0);
HitBreakWall(&wall[j], INT32_MAX, INT32_MAX, INT32_MAX, ang, 0);
break_count++; break_count++;
if (break_count > 4) if (break_count > 4)
{ {
GlobalSectorList.Resize(sectliststart);
return; return;
} }
} }
} }
} }
nextsector = wall[j].nextsector; nextsector = wal.nextsector;
if (nextsector < 0) if (nextsector >= 0)
continue; search.Add(nextsector);
// make sure its not on the list
for (k = GlobalSectorList.Size() - 1; k >= (int)sectliststart; k--)
{
if (GlobalSectorList[k] == nextsector)
break;
}
// if its not on the list add it to the end
if (k < 0)
{
GlobalSectorList.Push(nextsector);
}
} }
} }
GlobalSectorList.Resize(sectliststart);
} }