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

Fix handling of lotag and friends in generic sprite search. Tags like 65535 which are really (int16_t)(-1) are now also found.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1787 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-02-03 17:44:03 +00:00
parent 201ed79dcc
commit 8bf5f5f848
2 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
polymer/eduke32/source/astub.c
View file

@ -6619,7 +6619,7 @@ static void DoSpriteSearch(int32_t dir) // <0: backwards, >=0: forwards
for (i=0; i<3; i++) for (i=0; i<3; i++)
for (j=0; i==1 ? j<6 : j<7; j++) for (j=0; i==1 ? j<6 : j<7; j++)
{ {
if (!gs_spritewhat[i][j]) continue; if (!gs_spriteTagInterested[i][j]) continue;
if (i==0) if (i==0)
{ {
@ -6630,28 +6630,28 @@ static void DoSpriteSearch(int32_t dir) // <0: backwards, >=0: forwards
case 2: k = sprite[gs_cursprite].z; break; case 2: k = sprite[gs_cursprite].z; break;
case 3: k = sprite[gs_cursprite].sectnum; break; case 3: k = sprite[gs_cursprite].sectnum; break;
case 4: k = sprite[gs_cursprite].statnum; break; case 4: k = sprite[gs_cursprite].statnum; break;
case 5: k = sprite[gs_cursprite].hitag; break; case 5: k = (uint16_t)sprite[gs_cursprite].hitag; break;
case 6: k = sprite[gs_cursprite].lotag; break; case 6: k = (uint16_t)sprite[gs_cursprite].lotag; break;
} }
} }
if (i==1) else if (i==1)
{ {
switch (j) switch (j)
{ {
case 0: case 0:
k = sprite[gs_cursprite].cstat; k = sprite[gs_cursprite].cstat;
k &= gs_sprite[1][0]; k &= gs_spriteTagValue[1][0];
break; break;
case 1: k = sprite[gs_cursprite].shade; break; case 1: k = sprite[gs_cursprite].shade; break;
case 2: k = sprite[gs_cursprite].pal; break; case 2: k = sprite[gs_cursprite].pal; break;
case 3: case 3:
k = gs_sprite[1][3]; k = gs_spriteTagValue[1][3];
if (k != sprite[gs_cursprite].xrepeat && if (k != sprite[gs_cursprite].xrepeat &&
k != sprite[gs_cursprite].yrepeat) k != sprite[gs_cursprite].yrepeat)
goto NEXTSPRITE; goto NEXTSPRITE;
break; break;
case 4: case 4:
k = gs_sprite[1][4]; k = gs_spriteTagValue[1][4];
if (k != sprite[gs_cursprite].xoffset && if (k != sprite[gs_cursprite].xoffset &&
k != sprite[gs_cursprite].yoffset) k != sprite[gs_cursprite].yoffset)
goto NEXTSPRITE; goto NEXTSPRITE;
@ -6659,21 +6659,21 @@ static void DoSpriteSearch(int32_t dir) // <0: backwards, >=0: forwards
case 5: k = sprite[gs_cursprite].picnum; break; case 5: k = sprite[gs_cursprite].picnum; break;
} }
} }
if (i==2) else if (i==2)
{ {
switch (j) switch (j)
{ {
case 0: k = sprite[gs_cursprite].ang; break; case 0: k = sprite[gs_cursprite].ang; break;
case 1: k = sprite[gs_cursprite].xvel; break; case 1: k = (uint16_t)sprite[gs_cursprite].xvel; break;
case 2: k = sprite[gs_cursprite].yvel; break; case 2: k = (uint16_t)sprite[gs_cursprite].yvel; break;
case 3: k = sprite[gs_cursprite].zvel; break; case 3: k = (uint16_t)sprite[gs_cursprite].zvel; break;
case 4: k = sprite[gs_cursprite].owner; break; case 4: k = (uint16_t)sprite[gs_cursprite].owner; break;
case 5: k = sprite[gs_cursprite].clipdist; break; case 5: k = sprite[gs_cursprite].clipdist; break;
case 6: k = sprite[gs_cursprite].extra; break; case 6: k = sprite[gs_cursprite].extra; break;
} }
} }
if (k != gs_sprite[i][j]) goto NEXTSPRITE; if (k != gs_spriteTagValue[i][j]) goto NEXTSPRITE;
} }
// found matching sprite // found matching sprite
@ -10951,14 +10951,6 @@ static void GenericSpriteSearch()
{0, 0, 1} {0, 0, 1}
}; };
static char firstrun=1;
if (firstrun)
{
firstrun = 0;
Bmemset(&gs_spritewhat, 0, sizeof(gs_spritewhat));
}
clearmidstatbar16(); clearmidstatbar16();
drawgradient(); drawgradient();
@ -10968,8 +10960,8 @@ static void GenericSpriteSearch()
for (i=0; i<3; i++) for (i=0; i<3; i++)
for (j=0; j<=rowmax[i]; j++) for (j=0; j<=rowmax[i]; j++)
{ {
if (gs_spritewhat[i][j]) if (gs_spriteTagInterested[i][j])
k=Bsprintf(disptext, "%s: %d", labels[j][i], gs_sprite[i][j]); k=Bsprintf(disptext, "%s: %d", labels[j][i], gs_spriteTagValue[i][j]);
else else
k=Bsprintf(disptext, "%s: ^7any", labels[j][i]); k=Bsprintf(disptext, "%s: ^7any", labels[j][i]);
for (; k<dispwidth[i]; k++) disptext[k] = 0; for (; k<dispwidth[i]; k++) disptext[k] = 0;
@ -11032,29 +11024,29 @@ static void GenericSpriteSearch()
{ {
Bsprintf(edittext, "%s: ", labels[row][col]); Bsprintf(edittext, "%s: ", labels[row][col]);
printmessage16("%s", edittext); printmessage16("%s", edittext);
i = getnumber16(edittext, gs_spritewhat[col][row] ? gs_sprite[col][row] : 0, i = getnumber16(edittext, gs_spriteTagInterested[col][row] ? gs_spriteTagValue[col][row] : 0,
maxval[row][col], sign[row][col]); maxval[row][col], sign[row][col]);
if (col == 2 && row == 0) i = (i+2048)&2047; // angle if (col == 2 && row == 0) i = (i+2048)&2047; // angle
gs_sprite[col][row] = i; gs_spriteTagValue[col][row] = i;
gs_spritewhat[col][row] = 1; gs_spriteTagInterested[col][row] = 1;
if (col == 1 && row == 5) // picnum if (col == 1 && row == 5) // picnum
printext16(xpos[1], ypos-2*8, editorcolors[14], editorcolors[0], names[i], 0); printext16(xpos[1], ypos-2*8, editorcolors[14], editorcolors[0], names[i], 0);
} }
if (PRESSED_KEYSC(BS) || PRESSED_KEYSC(DELETE)) if (PRESSED_KEYSC(BS) || PRESSED_KEYSC(DELETE))
{ {
gs_spritewhat[col][row] = 0; gs_spriteTagInterested[col][row] = 0;
if (col == 1 && row == 5) // picnum if (col == 1 && row == 5) // picnum
printext16(xpos[1], ypos-2*8, editorcolors[14], editorcolors[0], " ", 0); printext16(xpos[1], ypos-2*8, editorcolors[14], editorcolors[0], " ", 0);
} }
if (gs_spritewhat[col][row]) if (gs_spriteTagInterested[col][row])
{ {
if (col == 1 && row == 0) // flags if (col == 1 && row == 0) // flags
k = Bsprintf(disptext, "%s: %x", labels[row][col], gs_sprite[col][row]); k = Bsprintf(disptext, "%s: %x", labels[row][col], gs_spriteTagValue[col][row]);
else else
k = Bsprintf(disptext, "%s: %d", labels[row][col], gs_sprite[col][row]); k = Bsprintf(disptext, "%s: %d", labels[row][col], gs_spriteTagValue[col][row]);
} }
else else
k = Bsprintf(disptext, "%s: ^7any", labels[row][col]); k = Bsprintf(disptext, "%s: ^7any", labels[row][col]);

4
polymer/eduke32/source/mapster32.h
View file

@ -216,8 +216,8 @@ extern int16_t localartlookup[MAXTILES], localartlookupnum;
extern int32_t lockclock; extern int32_t lockclock;
extern void clearkeys(void); extern void clearkeys(void);
static int32_t gs_sprite[3][7]; static int32_t gs_spriteTagValue[3][7];
static char gs_spritewhat[3][7]; static char gs_spriteTagInterested[3][7];
static int16_t gs_cursprite=-1; static int16_t gs_cursprite=-1;
int32_t g_musicSize=0; int32_t g_musicSize=0;