lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compile errors

Browse source
This commit is contained in:
mazmazz 2018-11-13 10:31:06 -05:00
parent 4b3dff3ef3
commit c1c815ce6e
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dehacked.c
View file

@ -1660,7 +1660,6 @@ static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
if (usi && usi <= textprompts[num]->numpages) if (usi && usi <= textprompts[num]->numpages)
{ {
UINT8 metapagenum = usi - 1; UINT8 metapagenum = usi - 1;
UINT8 picid;
textprompts[num]->page[pagenum].numpics = textprompts[num]->page[metapagenum].numpics; textprompts[num]->page[pagenum].numpics = textprompts[num]->page[metapagenum].numpics;
textprompts[num]->page[pagenum].picmode = textprompts[num]->page[metapagenum].picmode; textprompts[num]->page[pagenum].picmode = textprompts[num]->page[metapagenum].picmode;
@ -1739,7 +1738,7 @@ static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
// end copypasta from readcutscenescene // end copypasta from readcutscenescene
else if (fastcmp(word, "NAME")) else if (fastcmp(word, "NAME"))
{ {
INT32 i; INT32 j;
// HACK: Add yellow control char now // HACK: Add yellow control char now
// so the drawing function doesn't call it repeatedly // so the drawing function doesn't call it repeatedly
@ -1750,10 +1749,10 @@ static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
name[33] = 0; name[33] = 0;
// Replace _ with ' ' // Replace _ with ' '
for (i = 0; i < 32 && name[i]; i++) for (j = 0; j < 32 && name[j]; j++)
{ {
if (name[i] == '_') if (name[j] == '_')
name[i] = ' '; name[j] = ' ';
} }
strncpy(textprompts[num]->page[pagenum].name, name, 32); strncpy(textprompts[num]->page[pagenum].name, name, 32);