zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-16 12:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed cacheit_r sector loop.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-28 06:30:41 +01:00
parent 68f9037883
commit 8360ba99ff
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/games/duke/src/premap_r.cpp
View file

@ -51,17 +51,17 @@ static inline void tloadtile(int tilenum, int palnum = 0)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void cachespritenum(short i) static void cachespritenum(spritetype *spr)
{ {
char maxc; char maxc;
short j; short j;
int pal = sprite[i].pal; int pal = spr->pal;
if (ud.monsters_off && badguy(&sprite[i])) return; if (ud.monsters_off && badguy(spr)) return;
maxc = 1; maxc = 1;
switch (sprite[i].picnum) switch (spr->picnum)
{ {
case HYDRENT: case HYDRENT:
tloadtile(BROKEFIREHYDRENT); tloadtile(BROKEFIREHYDRENT);
@ -70,7 +70,7 @@ static void cachespritenum(short i)
break; break;
case RRTILE2121: case RRTILE2121:
case RRTILE2122: case RRTILE2122:
tloadtile(sprite[i].picnum, pal); tloadtile(spr->picnum, pal);
break; break;
case TOILET: case TOILET:
tloadtile(TOILETBROKE); tloadtile(TOILETBROKE);
@ -126,7 +126,7 @@ static void cachespritenum(short i)
break; break;
case COW: case COW:
maxc = 56; maxc = 56;
for (j = sprite[i].picnum; j < (sprite[i].picnum + maxc); j++) for (j = spr->picnum; j < (spr->picnum + maxc); j++)
tloadtile(j, pal); tloadtile(j, pal);
maxc = 0; maxc = 0;
break; break;
@ -278,7 +278,7 @@ static void cachespritenum(short i)
break; break;
case VIXEN: case VIXEN:
maxc = 214; maxc = 214;
for (j = sprite[i].picnum; j < sprite[i].picnum + maxc; j++) for (j = spr->picnum; j < spr->picnum + maxc; j++)
tloadtile(j, pal); tloadtile(j, pal);
maxc = 0; maxc = 0;
break; break;
@ -287,7 +287,7 @@ static void cachespritenum(short i)
{ {
maxc = 54; maxc = 54;
for (j = sprite[i].picnum; j < sprite[i].picnum + maxc; j++) for (j = spr->picnum; j < spr->picnum + maxc; j++)
tloadtile(j, pal); tloadtile(j, pal);
maxc = 100; maxc = 100;
for (j = SBMOVE; j < SBMOVE + maxc; j++) for (j = SBMOVE; j < SBMOVE + maxc; j++)
@ -297,7 +297,7 @@ static void cachespritenum(short i)
break; break;
case HULK: case HULK:
maxc = 40; maxc = 40;
for (j = sprite[i].picnum - 41; j < sprite[i].picnum + maxc - 41; j++) for (j = spr->picnum - 41; j < spr->picnum + maxc - 41; j++)
tloadtile(j, pal); tloadtile(j, pal);
for (j = HULKJIBA; j <= HULKJIBC + 4; j++) for (j = HULKJIBA; j <= HULKJIBC + 4; j++)
tloadtile(j, pal); tloadtile(j, pal);
@ -305,7 +305,7 @@ static void cachespritenum(short i)
break; break;
case MINION: case MINION:
maxc = 141; maxc = 141;
for (j = sprite[i].picnum; j < sprite[i].picnum + maxc; j++) for (j = spr->picnum; j < spr->picnum + maxc; j++)
tloadtile(j, pal); tloadtile(j, pal);
for (j = MINJIBA; j <= MINJIBC + 4; j++) for (j = MINJIBA; j <= MINJIBC + 4; j++)
tloadtile(j, pal); tloadtile(j, pal);
@ -315,7 +315,7 @@ static void cachespritenum(short i)
} }
for (j = sprite[i].picnum; j < (sprite[i].picnum + maxc); j++) for (j = spr->picnum; j < (spr->picnum + maxc); j++)
tloadtile(j, pal); tloadtile(j, pal);
} }
@ -406,7 +406,7 @@ static void cachegoodsprites(void)
void cacheit_r(void) void cacheit_r(void)
{ {
short i,j; int i;
cachegoodsprites(); cachegoodsprites();
@ -426,13 +426,13 @@ void cacheit_r(void)
tloadtile(LA + 1); tloadtile(LA + 1);
tloadtile(LA + 2); tloadtile(LA + 2);
} }
}
SectIterator it(i); DukeSectIterator it(i);
while ((j = it.NextIndex()) >= 0) while (auto j = it.Next())
{ {
if(sprite[j].xrepeat != 0 && sprite[j].yrepeat != 0 && (sprite[j].cstat&32768) == 0) if(j->s.xrepeat != 0 && j->s.yrepeat != 0 && (j->s.cstat&32768) == 0)
cachespritenum(j); cachespritenum(&j->s);
}
} }
precacheMarkedTiles(); precacheMarkedTiles();
} }