Switch a few iterators in clipmove() from int to native_t

git-svn-id: https://svn.eduke32.com/eduke32@7828 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-07-24 01:37:57 +00:00 committed by Christoph Oelckers
parent 417318c271
commit 17d3c302a3

View file

@ -1197,7 +1197,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
if (curspr) if (curspr)
continue; // next sector of this index continue; // next sector of this index
#endif #endif
for (int j=headspritesect[dasect]; j>=0; j=nextspritesect[j]) for (native_t j=headspritesect[dasect]; j>=0; j=nextspritesect[j])
{ {
auto const spr = (uspriteptr_t)&sprite[j]; auto const spr = (uspriteptr_t)&sprite[j];
const int32_t cstat = spr->cstat; const int32_t cstat = spr->cstat;
@ -1321,7 +1321,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
} }
#endif #endif
int32_t hitwalls[4] = {}, hitwall; int32_t hitwalls[4], hitwall;
int32_t clipReturn = 0; int32_t clipReturn = 0;
native_t cnt = clipmoveboxtracenum; native_t cnt = clipmoveboxtracenum;
@ -1347,7 +1347,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
int32_t const tempint1 = dmulscale6(clipr.x, move.x, clipr.y, move.y); int32_t const tempint1 = dmulscale6(clipr.x, move.x, clipr.y, move.y);
for (int i=cnt+1, j; i<=clipmoveboxtracenum; ++i) for (native_t i=cnt+1, j; i<=clipmoveboxtracenum; ++i)
{ {
j = hitwalls[i]; j = hitwalls[i];
int32_t const tempint2 = dmulscale6(clipit[j].x2 - clipit[j].x1, move.x, clipit[j].y2 - clipit[j].y1, move.y); int32_t const tempint2 = dmulscale6(clipit[j].x2 - clipit[j].x1, move.x, clipit[j].y2 - clipit[j].y1, move.y);