zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

— Duke: Use BFSSectorSearch to handle the hitradius searches without using indices.

Browse source 
(and a bit nicer looking loop condition.)
This commit is contained in:
Christoph Oelckers 2021-11-21 08:42:36 +01:00
parent b1b0c5d25c
commit 265abf7fa6
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/duke/src/actors_d.cpp
View file

@ -345,11 +345,10 @@ void hitradius_d(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
if(spri->picnum != SHRINKSPARK && !(spri->picnum == RPG && spri->xrepeat < 11))
{
BFSSearch search(numsectors, spri->sectnum);
BFSSectorSearch search(spri->sector());
for(unsigned dasect; (dasect = search.GetNext()) != BFSSearch::EOL;)
while (auto dasectp = search.GetNext())
{
auto dasectp = &sector[dasect];
if (((dasectp->ceilingz - spri->z) >> 8) < r)
{
auto wal = dasectp->firstWall();
@ -369,10 +368,9 @@ void hitradius_d(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
{
if ((abs(wal.x - spri->x) + abs(wal.y - spri->y)) < r)
{
int nextsect = wal.nextsector;
if (nextsect >= 0)
if (wal.twoSided())
{
search.Add(nextsect);
search.Add(wal.nextSector());
}
int x1 = (((wal.x + wal.point2Wall()->x) >> 1) + spri->x) >> 1;
int y1 = (((wal.y + wal.point2Wall()->y) >> 1) + spri->y) >> 1;

12
source/games/duke/src/actors_r.cpp
View file

@ -223,11 +223,10 @@ void hitradius_r(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
if (spri->xrepeat >= 11 || !(spri->picnum == RPG || ((isRRRA()) && spri->picnum == RPG2)))
{
BFSSearch search(numsectors, spri->sectnum);
for (unsigned dasect; (dasect = search.GetNext()) != BFSSearch::EOL;)
BFSSectorSearch search(spri->sector());
while (auto dasectp = search.GetNext())
{
auto dasectp = &sector[dasect];
if (((dasectp->ceilingz - spri->z) >> 8) < r)
{
auto wal = dasectp->firstWall();
@ -247,10 +246,9 @@ void hitradius_r(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
{
if ((abs(wal.x - spri->x) + abs(wal.y - spri->y)) < r)
{
int nextsect = wal.nextsector;
if (nextsect >= 0)
if (wal.twoSided())
{
search.Add(nextsect);
search.Add(wal.nextSector());
}
int x1 = (((wal.x + wal.point2Wall()->x) >> 1) + spri->x) >> 1;
int y1 = (((wal.y + wal.point2Wall()->y) >> 1) + spri->y) >> 1;