zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adds logic CON commands:

Browse source 
ifvaror |
ifvarxor ^
ifvareither || (rename?)


git-svn-id: https://svn.eduke32.com/eduke32@1060 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hnt_ts 2008-09-07 12:36:20 +00:00
parent b664f7686e
commit 0c77f4a6f5
3 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,6 +471,12 @@ const char *keyw[] =
"setgamepalette", // 334 "setgamepalette", // 334
"setdefname", // 335 "setdefname", // 335
"setcfgname", // 336 "setcfgname", // 336
"ifvaror", // 337
"ifvarvaror", // 338
"ifvarxor", // 339
"ifvarvarxor", // 340
"ifvareither", // 341
"ifvarvareither", // 342
"<null>" "<null>"
}; };
@ -4001,6 +4007,9 @@ static int parsecommand(void)
case CON_IFVARVARE: case CON_IFVARVARE:
case CON_IFVARVARN: case CON_IFVARVARN:
case CON_IFVARVARAND: case CON_IFVARVARAND:
case CON_IFVARVAROR:
case CON_IFVARVARXOR:
case CON_IFVARVAREITHER:
case CON_WHILEVARVARN: case CON_WHILEVARVARN:
{ {
intptr_t offset; intptr_t offset;
@ -4040,6 +4049,9 @@ static int parsecommand(void)
case CON_IFVARE: case CON_IFVARE:
case CON_IFVARN: case CON_IFVARN:
case CON_IFVARAND: case CON_IFVARAND:
case CON_IFVAROR:
case CON_IFVARXOR:
case CON_IFVAREITHER:
case CON_WHILEVARN: case CON_WHILEVARN:
{ {
intptr_t offset; intptr_t offset;

6
polymer/eduke32/source/gamedef.h
View file

@ -859,5 +859,11 @@ enum keywords
CON_SETGAMEPALETTE, // 334 CON_SETGAMEPALETTE, // 334
CON_SETDEFNAME, // 335 CON_SETDEFNAME, // 335
CON_SETCFGNAME, // 336 CON_SETCFGNAME, // 336
CON_IFVAROR, // 337
CON_IFVARVAROR, // 338
CON_IFVARXOR, // 339
CON_IFVARVARXOR, // 340
CON_IFVAREITHER, // 341
CON_IFVARVAREITHER, // 342
CON_END CON_END
}; };

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

@ -3821,6 +3821,24 @@ static int parse(void)
parseifelse(GetGameVarID(j, g_i, g_p) & GetGameVarID(*(insptr), g_i, g_p)); parseifelse(GetGameVarID(j, g_i, g_p) & GetGameVarID(*(insptr), g_i, g_p));
break; break;
case CON_IFVARVAROR:
insptr++;
j=*insptr++;
parseifelse(GetGameVarID(j, g_i, g_p) | GetGameVarID(*(insptr), g_i, g_p));
break;
case CON_IFVARVARXOR:
insptr++;
j=*insptr++;
parseifelse(GetGameVarID(j, g_i, g_p) ^ GetGameVarID(*(insptr), g_i, g_p));
break;
case CON_IFVARVAREITHER:
insptr++;
j=*insptr++;
parseifelse(GetGameVarID(j, g_i, g_p) || GetGameVarID(*(insptr), g_i, g_p));
break;
case CON_IFVARVARN: case CON_IFVARVARN:
insptr++; insptr++;
j=*insptr++; j=*insptr++;
@ -3896,6 +3914,24 @@ static int parse(void)
parseifelse(GetGameVarID(j, g_i, g_p) & *insptr); parseifelse(GetGameVarID(j, g_i, g_p) & *insptr);
break; break;
case CON_IFVAROR:
insptr++;
j=*insptr++;
parseifelse(GetGameVarID(j, g_i, g_p) | *insptr);
break;
case CON_IFVARXOR:
insptr++;
j=*insptr++;
parseifelse(GetGameVarID(j, g_i, g_p) ^ *insptr);
break;
case CON_IFVAREITHER:
insptr++;
j=*insptr++;
parseifelse(GetGameVarID(j, g_i, g_p) || *insptr);
break;
case CON_IFVARG: case CON_IFVARG:
insptr++; insptr++;
j=*insptr++; j=*insptr++;