zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify CON_FINDNEARACTOR family of functions and restore the original behavior of returning the nearest sprite instead of any sprite that satisfies the condition

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7641 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-05-19 03:53:46 +00:00 committed by Christoph Oelckers
parent 271cdeaf5d
commit 9ac1ce04d6
1 changed files with 43 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
source/duke3d/src/gameexec.cpp
View file

@ -5261,60 +5261,41 @@ badindex:
// that is of <type> into <getvar> // that is of <type> into <getvar>
// -1 for none found // -1 for none found
// <type> <maxdistvarid> <varid> // <type> <maxdistvarid> <varid>
int const findPicnum = *insptr++; bool const actorsOnly = (tw == CON_FINDNEARACTOR || tw == CON_FINDNEARACTOR3D);
int const maxDist = Gv_GetVarX(*insptr++); auto const dist_funcptr = (tw == CON_FINDNEARACTOR || tw == CON_FINDNEARSPRITE) ? &ldist : &dist;
int const findTile = *insptr++;
int maxDist = Gv_GetVarX(*insptr++);
int const returnVar = *insptr++; int const returnVar = *insptr++;
int findStatnum = actorsOnly ? STAT_ACTOR : MAXSTATUS - 1;
int foundSprite = -1; int foundSprite = -1;
int findStatnum = STAT_ACTOR;
int spriteNum;
if (tw == CON_FINDNEARSPRITE || tw == CON_FINDNEARSPRITE3D)
findStatnum = MAXSTATUS - 1;
if (tw == CON_FINDNEARACTOR3D || tw == CON_FINDNEARSPRITE3D)
{
do
{
spriteNum = headspritestat[findStatnum]; // all sprites
while (spriteNum >= 0)
{
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum
&& dist(vm.pSprite, &sprite[spriteNum]) < maxDist)
{
foundSprite = spriteNum;
spriteNum = MAXSPRITES;
break;
}
spriteNum = nextspritestat[spriteNum];
}
if (spriteNum == MAXSPRITES || tw == CON_FINDNEARACTOR3D)
break;
} while (findStatnum--);
Gv_SetVarX(returnVar, foundSprite);
dispatch();
}
do do
{ {
spriteNum = headspritestat[findStatnum]; // all sprites int spriteNum = headspritestat[findStatnum]; // all sprites
while (spriteNum >= 0) while ((unsigned)spriteNum < MAXSPRITES)
{ {
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum if (sprite[spriteNum].picnum == findTile && spriteNum != vm.spriteNum)
&& ldist(vm.pSprite, &sprite[spriteNum]) < maxDist)
{ {
int const foundDist = dist_funcptr(vm.pSprite, &sprite[spriteNum]);
if (foundDist < maxDist)
{
maxDist = foundDist;
foundSprite = spriteNum; foundSprite = spriteNum;
spriteNum = MAXSPRITES;
break;
} }
}
spriteNum = nextspritestat[spriteNum]; spriteNum = nextspritestat[spriteNum];
} }
if (spriteNum == MAXSPRITES || tw == CON_FINDNEARACTOR) if (actorsOnly)
break; break;
} while (findStatnum--); }
while (findStatnum--);
Gv_SetVarX(returnVar, foundSprite); Gv_SetVarX(returnVar, foundSprite);
dispatch(); dispatch();
} }
@ -5328,42 +5309,42 @@ badindex:
// that is of <type> into <getvar> // that is of <type> into <getvar>
// -1 for none found // -1 for none found
// <type> <maxdistvarid> <varid> // <type> <maxdistvarid> <varid>
int const findPicnum = *insptr++; bool const actorsOnly = (tw == CON_FINDNEARACTORZ);
int const maxDist = Gv_GetVarX(*insptr++);
int const findTile = *insptr++;
int maxDist = Gv_GetVarX(*insptr++);
int const maxZDist = Gv_GetVarX(*insptr++); int const maxZDist = Gv_GetVarX(*insptr++);
int const returnVar = *insptr++; int const returnVar = *insptr++;
int findStatnum = actorsOnly ? STAT_ACTOR : MAXSTATUS - 1;
int foundSprite = -1; int foundSprite = -1;
int findStatnum = MAXSTATUS - 1;
do do
{ {
int spriteNum = headspritestat[tw == CON_FINDNEARACTORZ ? STAT_ACTOR : findStatnum]; // all sprites int spriteNum = headspritestat[findStatnum]; // all sprites
if (spriteNum == -1) while ((unsigned)spriteNum < MAXSPRITES)
continue;
do
{ {
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum) if (sprite[spriteNum].picnum == findTile && spriteNum != vm.spriteNum)
{ {
if (ldist(vm.pSprite, &sprite[spriteNum]) < maxDist) int const foundDist = ldist(vm.pSprite, &sprite[spriteNum]);
{
if (klabs(vm.pSprite->z - sprite[spriteNum].z) < maxZDist) if (foundDist < maxDist && klabs(vm.pSprite->z - sprite[spriteNum].z) < maxZDist)
{ {
maxDist = foundDist;
foundSprite = spriteNum; foundSprite = spriteNum;
spriteNum = MAXSPRITES;
break;
}
} }
} }
spriteNum = nextspritestat[spriteNum]; spriteNum = nextspritestat[spriteNum];
} while (spriteNum >= 0); }
if (tw == CON_FINDNEARACTORZ || spriteNum == MAXSPRITES) if (actorsOnly)
break; break;
} while (findStatnum--); }
Gv_SetVarX(returnVar, foundSprite); while (findStatnum--);
Gv_SetVarX(returnVar, foundSprite);
dispatch(); dispatch();
} }