CON parser: don't accept read-only gamevars for 1st arg of *sprite{sect,stat}.

git-svn-id: https://svn.eduke32.com/eduke32@3429 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-01-24 20:02:52 +00:00
parent ee9fc04c9a
commit 92f5158a70
2 changed files with 6 additions and 1 deletions

View file

@ -4950,13 +4950,16 @@ repeatcase:
case CON_QSTRCPY: case CON_QSTRCPY:
case CON_QSTRLEN: case CON_QSTRLEN:
case CON_QGETSYSSTR: case CON_QGETSYSSTR:
C_GetManyVars(2);
continue;
case CON_HEADSPRITESTAT: case CON_HEADSPRITESTAT:
case CON_PREVSPRITESTAT: case CON_PREVSPRITESTAT:
case CON_NEXTSPRITESTAT: case CON_NEXTSPRITESTAT:
case CON_HEADSPRITESECT: case CON_HEADSPRITESECT:
case CON_PREVSPRITESECT: case CON_PREVSPRITESECT:
case CON_NEXTSPRITESECT: case CON_NEXTSPRITESECT:
C_GetManyVars(2); C_GetNextVarType(GAMEVAR_READONLY);
C_GetNextVar();
continue; continue;
case CON_QSUBSTR: case CON_QSUBSTR:
C_GetManyVars(4); C_GetManyVars(4);

View file

@ -924,6 +924,8 @@ static void __fastcall VM_AccessActiveProjectile(int32_t iSet, int32_t lVar1, in
{ {
int32_t lValue=0,proj=vm.g_i; int32_t lValue=0,proj=vm.g_i;
// http://forums.duke4.net/topic/775-eduke32-20-and-polymer/page__view__findpost__p__143260
if (lVar1 != g_iThisActorID) if (lVar1 != g_iThisActorID)
proj=Gv_GetVarX(lVar1); proj=Gv_GetVarX(lVar1);