From cd02a9223ecce1dcc73113442a71de26e107fad8 Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 31 Jan 2018 04:13:35 +0000 Subject: [PATCH] Use enum git-svn-id: https://svn.eduke32.com/eduke32@6636 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/gameexec.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index b4eea4d53..77578cc55 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -4036,9 +4036,10 @@ finish_qsprintf: int const findPicnum = *insptr++; int const maxDist = Gv_GetVarX(*insptr++); int const returnVar = *insptr++; - int foundSprite = -1; - int findStatnum = 1; - int spriteNum; + + int foundSprite = -1; + int findStatnum = STAT_ACTOR; + int spriteNum; if (tw == CON_FINDNEARSPRITEVAR || tw == CON_FINDNEARSPRITE3DVAR) findStatnum = MAXSTATUS-1; @@ -4103,12 +4104,13 @@ finish_qsprintf: int const maxDist = Gv_GetVarX(*insptr++); int const maxZDist = Gv_GetVarX(*insptr++); int const returnVar = *insptr++; - int foundSprite = -1; - int findStatnum = MAXSTATUS - 1; + + int foundSprite = -1; + int findStatnum = MAXSTATUS - 1; do { - int spriteNum = headspritestat[tw == CON_FINDNEARACTORZVAR ? 1 : findStatnum]; // all sprites + int spriteNum = headspritestat[tw == CON_FINDNEARACTORZVAR ? STAT_ACTOR : findStatnum]; // all sprites if (spriteNum == -1) continue; @@ -4129,6 +4131,7 @@ finish_qsprintf: spriteNum = nextspritestat[spriteNum]; } while (spriteNum>=0); + if (tw==CON_FINDNEARACTORZVAR || spriteNum == MAXSPRITES) break; }