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

- SW: use a dynamic array to track already visited sectors in TraverseBreakableWalls.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-11 00:40:30 +01:00
parent cc16c02baa
commit a79f7a3784
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/gamefuncs.cpp
View file

@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gamestruct.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.
//---------------------------------------------------------------------------
//

2
source/core/gamefuncs.h
View file

@ -4,6 +4,8 @@
#include "binaryangle.h"
#include "build.h"
extern TArray<int> GlobalSectorList;
extern int cameradist, cameraclock;
void loaddefinitionsfile(const char* fn, bool cumulative = false, bool maingrp = false);

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

@ -7653,8 +7653,8 @@ short StatBreakList[] =
void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, int radius)
{
int j, k;
short sectlist[MAXSECTORS]; // !JIM! Frank, 512 was not big enough for $dozer, was asserting out!
short sectlistplc, sectlistend, sect, startwall, endwall, nextsector;
int sect, startwall, endwall, nextsector;
unsigned sectlistplc, sectliststart;
int xmid,ymid;
int dist;
short break_count;
@ -7662,20 +7662,19 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
int sectnum;
short wall_ang;
int hit_x,hit_y,hit_z;
sectlist[0] = start_sect;
sectlistplc = 0; sectlistend = 1;
sectliststart = sectlistplc = GlobalSectorList.Size();
GlobalSectorList.Push(start_sect);
// limit radius
if (radius > 2000)
radius = 2000;
break_count = 0;
while (sectlistplc < sectlistend)
while (sectlistplc < GlobalSectorList.Size())
{
sect = sectlist[sectlistplc++];
ASSERT((uint16_t)sectlistplc < SIZ(sectlist));
sect = GlobalSectorList[sectlistplc++];
startwall = sector[sect].wallptr;
endwall = startwall + sector[sect].wallnum;
@ -7686,8 +7685,8 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
if (wall[j].lotag == TAG_WALL_BREAK)
{
// find midpoint
xmid = DIV2(wall[j].x + wall[j+1].x);
ymid = DIV2(wall[j].y + wall[j+1].y);
xmid = (wall[j].x + wall[j+1].x) >> 1;
ymid = (wall[j].y + wall[j+1].y) >> 1;
// don't need to go further if wall is too far out
@ -7704,7 +7703,10 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
break_count++;
if (break_count > 4)
{
GlobalSectorList.Resize(sectliststart);
return;
}
}
}
}
@ -7715,21 +7717,21 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
continue;
// make sure its not on the list
for (k = sectlistend - 1; k >= 0; k--)
for (k = GlobalSectorList.Size() - 1; k >= (int)sectliststart; k--)
{
if (sectlist[k] == nextsector)
if (GlobalSectorList[k] == nextsector)
break;
}
// if its not on the list add it to the end
if (k < 0)
{
sectlist[sectlistend++] = nextsector;
ASSERT((uint16_t)sectlistend < SIZ(sectlist));
GlobalSectorList.Push(nextsector);
}
}
}
GlobalSectorList.Resize(sectliststart);
}