Fix CON parser accepting defines and numbers where writable var expected (4 cmds)

git-svn-id: https://svn.eduke32.com/eduke32@2593 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-04-07 20:09:44 +00:00
parent 9a7d1ed1a5
commit dbd8745620

View file

@ -2665,6 +2665,7 @@ static int32_t C_ParseCommand(int32_t loop)
g_scriptPtr--; g_scriptPtr--;
} }
// save the actor name w/o consuming it
C_SkipComments(); C_SkipComments();
j = 0; j = 0;
while (isaltok(*(textptr+j))) while (isaltok(*(textptr+j)))
@ -2682,7 +2683,7 @@ static int32_t C_ParseCommand(int32_t loop)
{ {
C_ReportError(-1); C_ReportError(-1);
initprintf("%s:%d: warning: invalid useractor type. Must be 0, 1, 2" initprintf("%s:%d: warning: invalid useractor type. Must be 0, 1, 2"
" (notenemy, enemy, enemystayput) or have 4 added ('doesn't move').\n", " (notenemy, enemy, enemystayput) or have 4 added (\"doesn't move\").\n",
g_szScriptFileName,g_lineNumber); g_szScriptFileName,g_lineNumber);
g_numCompilerWarnings++; g_numCompilerWarnings++;
j = 0; j = 0;
@ -3836,7 +3837,7 @@ static int32_t C_ParseCommand(int32_t loop)
*g_scriptPtr++=i; *g_scriptPtr++=i;
C_SkipComments(); C_SkipComments();
C_GetNextVar(); C_GetNextVarType(tw==CON_GETARRAYSIZE ? GAMEVAR_READONLY : 0);
continue; continue;
case CON_RANDVARVAR: case CON_RANDVARVAR:
@ -4614,13 +4615,15 @@ repeatcase:
continue; continue;
case CON_SETACTORANGLE: case CON_SETACTORANGLE:
case CON_SETPLAYERANGLE: case CON_SETPLAYERANGLE:
C_GetNextVar();
continue;
case CON_GETANGLETOTARGET: case CON_GETANGLETOTARGET:
case CON_GETACTORANGLE: case CON_GETACTORANGLE:
case CON_GETPLAYERANGLE: case CON_GETPLAYERANGLE:
// Syntax: <command> <var> // Syntax: <command> <var>
// get the ID of the DEF // get the ID of the DEF
C_GetNextVar(); C_GetNextVar(GAMEVAR_READONLY);
continue; continue;
case CON_ADDLOG: case CON_ADDLOG: