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

CON_ADDLOG and CON_ADDLOGVAR don't need to explicitly store the line number anymore

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@948 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-08-09 07:41:09 +00:00
parent c366d0e9a5
commit ff18979277
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3798,8 +3798,8 @@ static int parsecommand(void)
// syntax: addlogvar <var> // syntax: addlogvar <var>
// prints the line number in the log file. // prints the line number in the log file.
*scriptptr=line_number; /* *scriptptr=line_number;
scriptptr++; scriptptr++; */
// get the ID of the DEF // get the ID of the DEF
transvar(); transvar();
@ -4212,8 +4212,8 @@ repeatcase:
// syntax: addlog // syntax: addlog
// prints the line number in the log file. // prints the line number in the log file.
*scriptptr=line_number; /* *scriptptr=line_number;
scriptptr++; scriptptr++; */
return 0; return 0;
case CON_IFPINVENTORY: case CON_IFPINVENTORY:

17
polymer/eduke32/source/gameexec.c
View file

@ -6524,6 +6524,11 @@ case CON_CHANGESPRITESECT:
case CON_CLEARMAPSTATE: case CON_CLEARMAPSTATE:
insptr++; insptr++;
j = GetGameVarID(*insptr++,g_i,g_p); j = GetGameVarID(*insptr++,g_i,g_p);
if (j < 0 || j > MAXVOLUMES*MAXLEVELS)
{
OSD_Printf(CON_ERROR "CON_CLEARMAPSTATE: Invalid map number: %d\n",line_num,j);
return 0;
}
if (map[j].savedstate) if (map[j].savedstate)
FreeMapState(j); FreeMapState(j);
return 0; return 0;
@ -6641,7 +6646,7 @@ case CON_CHANGESPRITESECT:
case CON_ADDLOG: case CON_ADDLOG:
{ {
insptr++; insptr++;
OSD_Printf(OSDTEXT_GREEN "CONLOG: L=%d\n",*insptr++); OSD_Printf(OSDTEXT_GREEN "CONLOG: L=%d\n",line_num);
break; break;
} }
@ -6650,7 +6655,7 @@ case CON_CHANGESPRITESECT:
{ {
int m=1; int m=1;
char szBuf[256]; char szBuf[256];
int l=*insptr++, lVarID = *insptr; int lVarID = *insptr;
if ((lVarID >= iGameVarCount) || lVarID < 0) if ((lVarID >= iGameVarCount) || lVarID < 0)
{ {
@ -6674,12 +6679,12 @@ case CON_CHANGESPRITESECT:
index=GetGameVarID(*insptr++,g_i,g_p); index=GetGameVarID(*insptr++,g_i,g_p);
if ((index < aGameArrays[lVarID].size)&&(index>=0)) if ((index < aGameArrays[lVarID].size)&&(index>=0))
{ {
OSD_Printf(OSDTEXT_GREEN "CONLOGVAR: L=%d %s[%d] =%d\n",l, aGameArrays[lVarID].szLabel,index,m*aGameArrays[lVarID].plValues[index]); OSD_Printf(OSDTEXT_GREEN "CON_ADDLOGVAR: L=%d %s[%d] =%d\n",line_num, aGameArrays[lVarID].szLabel,index,m*aGameArrays[lVarID].plValues[index]);
break; break;
} }
else else
{ {
OSD_Printf(CON_ERROR "CON_ADDLOGVAR: L=%d invalid array index\n",line_num,l); OSD_Printf(CON_ERROR "CON_ADDLOGVAR: invalid array index\n",line_num);
break; break;
} }
} }
@ -6692,11 +6697,11 @@ case CON_CHANGESPRITESECT:
{ {
// invalid varID // invalid varID
insptr++; insptr++;
OSD_Printf(CON_ERROR "CON_ADDLOGVAR: L=%d invalid variable\n",line_num,l); OSD_Printf(CON_ERROR "CON_ADDLOGVAR: invalid variable\n",line_num);
break; // out of switch break; // out of switch
} }
} }
Bsprintf(szBuf,"CONLOGVAR: L=%d %s ",l, aGameVars[lVarID].szLabel); Bsprintf(szBuf,"CONLOGVAR: L=%d %s ",line_num, aGameVars[lVarID].szLabel);
strcpy(g_szBuf,szBuf); strcpy(g_szBuf,szBuf);
if (aGameVars[lVarID].dwFlags & GAMEVAR_FLAG_READONLY) if (aGameVars[lVarID].dwFlags & GAMEVAR_FLAG_READONLY)