CON parser: Merge some cases for code size savings.

git-svn-id: https://svn.eduke32.com/eduke32@6413 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-08-01 09:48:55 +00:00
parent c3fcd92db3
commit bc1ed207d6

View file

@ -4107,7 +4107,19 @@ DO_DEFSTATE:
case CON_CLAMP: case CON_CLAMP:
case CON_GETCLOSESTCOL: case CON_GETCLOSESTCOL:
case CON_CALCHYPOTENUSE:
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);
fallthrough__;
case CON_CHANGESPRITESTAT:
case CON_CHANGESPRITESECT:
case CON_ZSHOOTVAR:
case CON_EZSHOOTVAR:
case CON_GETPNAME:
case CON_STARTLEVEL:
case CON_QSTRCAT:
case CON_QSTRCPY:
case CON_QGETSYSSTR:
case CON_STOPACTORSOUND:
C_GetManyVars(2); C_GetManyVars(2);
continue; continue;
@ -4407,6 +4419,7 @@ DO_DEFSTATE:
case CON_GETFLORZOFSLOPE: case CON_GETFLORZOFSLOPE:
case CON_GETCEILZOFSLOPE: case CON_GETCEILZOFSLOPE:
case CON_UPDATESECTORZ:
C_GetManyVars(3); C_GetManyVars(3);
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);
continue; continue;
@ -4709,11 +4722,6 @@ DO_DEFSTATE:
C_GetManyVars(6); C_GetManyVars(6);
continue; continue;
case CON_CALCHYPOTENUSE:
C_GetNextVarType(GAMEVAR_READONLY);
C_GetManyVars(2);
continue;
case CON_LINEINTERSECT: case CON_LINEINTERSECT:
case CON_RAYINTERSECT: case CON_RAYINTERSECT:
// lineintersect x y z x y z x y x y <intx> <inty> <intz> <ret> // lineintersect x y z x y z x y x y <intx> <inty> <intz> <ret>
@ -4731,6 +4739,7 @@ DO_DEFSTATE:
continue; continue;
case CON_CANSEESPR: case CON_CANSEESPR:
case CON_UPDATESECTOR:
C_GetManyVars(2); C_GetManyVars(2);
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);
continue; continue;
@ -4751,14 +4760,8 @@ DO_DEFSTATE:
continue; continue;
case CON_MOVESPRITE: case CON_MOVESPRITE:
case CON_SETSPRITE: C_GetManyVars(5);
case CON_NEXTSECTORNEIGHBORZ:
C_GetManyVars(4);
if (tw == CON_MOVESPRITE)
{
C_GetNextVar();
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);
}
continue; continue;
case CON_MINITEXT: case CON_MINITEXT:
@ -4792,14 +4795,6 @@ DO_DEFSTATE:
} }
continue; continue;
case CON_UPDATESECTOR:
case CON_UPDATESECTORZ:
C_GetManyVars(2);
if (tw==CON_UPDATESECTORZ)
C_GetNextVar();
C_GetNextVarType(GAMEVAR_READONLY);
continue;
case CON_MYOS: case CON_MYOS:
case CON_MYOSPAL: case CON_MYOSPAL:
case CON_MYOSX: case CON_MYOSX:
@ -5058,26 +5053,14 @@ repeatcase:
C_GetManyVars(3); C_GetManyVars(3);
continue; continue;
case CON_CHANGESPRITESTAT:
case CON_CHANGESPRITESECT:
case CON_ZSHOOTVAR:
case CON_EZSHOOTVAR:
case CON_GETPNAME:
case CON_STARTLEVEL:
case CON_QSTRCAT:
case CON_QSTRCPY:
case CON_QGETSYSSTR:
case CON_STOPACTORSOUND:
C_GetManyVars(2);
continue;
case CON_QSTRDIM: case CON_QSTRDIM:
C_GetNextVarType(GAMEVAR_READONLY); C_GetManyVarsType(GAMEVAR_READONLY, 2);
C_GetNextVarType(GAMEVAR_READONLY);
C_GetManyVars(16); C_GetManyVars(16);
continue; continue;
case CON_QSUBSTR: case CON_QSUBSTR:
case CON_SETSPRITE:
case CON_NEXTSECTORNEIGHBORZ:
C_GetManyVars(4); C_GetManyVars(4);
continue; continue;