zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@977 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-08-16 09:07:41 +00:00
parent 4ad4350d48
commit 4033b2b9c3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/eduke32/source/gamedef.c
View file

@ -969,9 +969,7 @@ static int increasescriptsize(int size)
error++; error++;
return 1; return 1;
} }
// Bmemset(&newscript[size],0,size); Bmemset(&newscript[osize],0,(size-osize) * sizeof(intptr_t));
// Bmemcpy(&newscript[size],&newscript[osize],osize);
// Bmemset(&newscript[osize],0,osize);
script = newscript; script = newscript;
scriptptr = (intptr_t *)(script+oscriptptr); scriptptr = (intptr_t *)(script+oscriptptr);
bitptr = (char *)Brealloc(bitptr, g_ScriptSize * sizeof(char)); bitptr = (char *)Brealloc(bitptr, g_ScriptSize * sizeof(char));
@ -1432,6 +1430,7 @@ static int transword(void) //Returns its code #
if (Bstrcmp(tempbuf,keyw[i]) == 0) if (Bstrcmp(tempbuf,keyw[i]) == 0)
{ {
*scriptptr = i + (line_number<<12); *scriptptr = i + (line_number<<12);
bitptr[(scriptptr-script)] = 2;
textptr += l; textptr += l;
scriptptr++; scriptptr++;
if (!(error || warning) && g_ScriptDebug) if (!(error || warning) && g_ScriptDebug)
@ -1649,8 +1648,9 @@ static int transnum(int type)
initprintf("%s:%d: debug: accepted %s label `%s'.\n",compilefile,line_number,gl,label+(i<<6)); initprintf("%s:%d: debug: accepted %s label `%s'.\n",compilefile,line_number,gl,label+(i<<6));
Bfree(gl); Bfree(gl);
} }
if (labeltype[i] != LABEL_DEFINE && labelcode[i] != 0) if (labeltype[i] != LABEL_DEFINE && labelcode[i] >= (intptr_t)&script[0] && labelcode[i] < (intptr_t)&script[g_ScriptSize])
bitptr[(scriptptr-script)] = 1; bitptr[(scriptptr-script)] = 1;
else bitptr[(scriptptr-script)] = 2;
*(scriptptr++) = labelcode[i]; *(scriptptr++) = labelcode[i];
textptr += l; textptr += l;
return labeltype[i]; return labeltype[i];
@ -1795,7 +1795,8 @@ static int parsecommand(void)
if (!(error || warning) && g_ScriptDebug > 1) if (!(error || warning) && g_ScriptDebug > 1)
initprintf("%s:%d: debug: accepted state label `%s'.\n",compilefile,line_number,label+(j<<6)); initprintf("%s:%d: debug: accepted state label `%s'.\n",compilefile,line_number,label+(j<<6));
*scriptptr = labelcode[j]; *scriptptr = labelcode[j];
bitptr[(scriptptr-script)] = 1; if (labelcode[j] >= (intptr_t)&script[0] && labelcode[j] < (intptr_t)&script[g_ScriptSize])
bitptr[(scriptptr-script)] = 1;
break; break;
} }
else else