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@981 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-08-16 11:30:43 +00:00
parent 36d1cbd995
commit fa2b8cb9ec
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -929,10 +929,10 @@ static int increasescriptsize(int size)
{ {
// initprintf("%d\n",i); // initprintf("%d\n",i);
if (bitptr[i] == BITPTR_POINTER && !((intptr_t)script[i] >= (intptr_t)(&script[0]) && (intptr_t)script[i] < (intptr_t)(&script[g_ScriptSize]))) if (bitptr[i] == BITPTR_POINTER && !((intptr_t)script[i] >= (intptr_t)(&script[0]) && (intptr_t)script[i] < (intptr_t)(&script[g_ScriptSize])))
initprintf("wtf %d\n",i); initprintf("Internal compiler error at %d (0x%x)\n",i,i);
// if (bitptr[i] == 0 && ((intptr_t)script[i] >= (intptr_t)(&script[0]) && (intptr_t)script[i] < (intptr_t)(&script[g_ScriptSize]))) // if (bitptr[i] == 0 && ((intptr_t)script[i] >= (intptr_t)(&script[0]) && (intptr_t)script[i] < (intptr_t)(&script[g_ScriptSize])))
// initprintf("oh no!\n"); // initprintf("oh no!\n");
if (bitptr[i] == BITPTR_POINTER && ((intptr_t)script[i] >= (intptr_t)(&script[0]) && (intptr_t)script[i] < (intptr_t)(&script[g_ScriptSize]))) if (bitptr[i] == BITPTR_POINTER /*&& ((intptr_t)script[i] >= (intptr_t)(&script[0]) && (intptr_t)script[i] < (intptr_t)(&script[g_ScriptSize]))*/)
{ {
scriptptrs[i] = 1; scriptptrs[i] = 1;
script[i] -= (intptr_t)&script[0]; script[i] -= (intptr_t)&script[0];
@ -979,7 +979,7 @@ static int increasescriptsize(int size)
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));
Bmemset(&bitptr[osize],0,size-osize); Bmemset(&bitptr[osize],0,size-osize);
initprintf("script: %d, bitptr: %d\n",script,bitptr); // initprintf("script: %d, bitptr: %d\n",script,bitptr);
//initprintf("offset: %d\n",(unsigned)(scriptptr-script)); //initprintf("offset: %d\n",(unsigned)(scriptptr-script));
if (casescriptptr != NULL) if (casescriptptr != NULL)
@ -2619,6 +2619,7 @@ static int parsecommand(void)
for (j=0;j<4;j++) for (j=0;j<4;j++)
{ {
bitptr[(scriptptr-script)] = BITPTR_DONTFUCKWITHIT;
*(parsing_actor+j) = 0; *(parsing_actor+j) = 0;
if (j == 3) if (j == 3)
{ {
@ -5360,7 +5361,7 @@ void loadefs(const char *filenam)
script = Bcalloc(1,g_ScriptSize * sizeof(intptr_t)); script = Bcalloc(1,g_ScriptSize * sizeof(intptr_t));
bitptr = Bcalloc(1,g_ScriptSize * sizeof(char)); bitptr = Bcalloc(1,g_ScriptSize * sizeof(char));
initprintf("script: %d, bitptr: %d\n",script,bitptr); // initprintf("script: %d, bitptr: %d\n",script,bitptr);
labelcnt = defaultlabelcnt = 0; labelcnt = defaultlabelcnt = 0;
scriptptr = script+1; scriptptr = script+1;