zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-30 20:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@49 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-18 02:01:48 +00:00
parent 2ad240b034
commit 17ed65d29d
2 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4285,6 +4285,7 @@ repeatcase:
transnum(LABEL_DEFINE); transnum(LABEL_DEFINE);
break; break;
} }
case CON_IFONWATER: case CON_IFONWATER:
case CON_IFINWATER: case CON_IFINWATER:
case CON_IFACTORNOTSTAYPUT: case CON_IFACTORNOTSTAYPUT:

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

@ -3314,6 +3314,7 @@ char parse(void)
Bstrcpy(fta_quotes[q],redefined_fta_quotes[i]); Bstrcpy(fta_quotes[q],redefined_fta_quotes[i]);
break; break;
} }
case CON_GETTHISPROJECTILE: case CON_GETTHISPROJECTILE:
case CON_SETTHISPROJECTILE: case CON_SETTHISPROJECTILE:
{ {
@ -3330,6 +3331,7 @@ char parse(void)
DoThisProjectile(tw==CON_SETTHISPROJECTILE,lVar1,lLabelID,lVar2,g_i,g_p); DoThisProjectile(tw==CON_SETTHISPROJECTILE,lVar1,lLabelID,lVar2,g_i,g_p);
break; break;
} }
case CON_IFRND: case CON_IFRND:
insptr++; insptr++;
parseifelse( rnd(*insptr)); parseifelse( rnd(*insptr));
@ -3948,7 +3950,6 @@ SKIPJIBS:
break; break;
} }
case CON_INSERTSPRITEQ: case CON_INSERTSPRITEQ:
insptr++; insptr++;
insertspriteq(g_i); insertspriteq(g_i);
@ -4178,6 +4179,7 @@ SKIPJIBS:
SetGameVarID(i, rand(), g_i, g_p ); SetGameVarID(i, rand(), g_i, g_p );
break; break;
} }
case CON_DRAGPOINT: case CON_DRAGPOINT:
{ {
short wallnum; short wallnum;
@ -4772,6 +4774,7 @@ SKIPJIBS:
break; break;
} }
case CON_IFMOVE: case CON_IFMOVE:
insptr++; insptr++;
parseifelse(g_t[1] == *insptr); parseifelse(g_t[1] == *insptr);
@ -5127,6 +5130,7 @@ SKIPJIBS:
AddLog(g_szBuf); AddLog(g_szBuf);
break; break;
} }
case CON_ADDLOGVAR: case CON_ADDLOGVAR:
{ {
long l,m=1,lVarID; long l,m=1,lVarID;
@ -5195,6 +5199,7 @@ good:
DoSector(tw==CON_SETSECTOR, lVar1, lLabelID, lVar2, g_i, g_p); DoSector(tw==CON_SETSECTOR, lVar1, lLabelID, lVar2, g_i, g_p);
break; break;
} }
case CON_SQRT: case CON_SQRT:
{ {
// syntax sqrt <invar> <outvar> // syntax sqrt <invar> <outvar>
@ -5210,6 +5215,7 @@ good:
SetGameVarID(lOutVarID, ksqrt(lIn), g_i, g_p); SetGameVarID(lOutVarID, ksqrt(lIn), g_i, g_p);
break; break;
} }
case CON_FINDNEARACTOR: case CON_FINDNEARACTOR:
case CON_FINDNEARSPRITE: case CON_FINDNEARSPRITE:
{ {
@ -5333,7 +5339,6 @@ good:
break; break;
} }
case CON_FINDNEARACTOR3DVAR: case CON_FINDNEARACTOR3DVAR:
case CON_FINDNEARSPRITE3DVAR: case CON_FINDNEARSPRITE3DVAR:
{ {
@ -5505,6 +5510,7 @@ good:
DoUserDef(tw==CON_SETUSERDEF, lVar1, lLabelID, lVar2, g_i, g_p, lParm2); DoUserDef(tw==CON_SETUSERDEF, lVar1, lLabelID, lVar2, g_i, g_p, lParm2);
break; break;
} }
case CON_GETPROJECTILE: case CON_GETPROJECTILE:
case CON_SETPROJECTILE: case CON_SETPROJECTILE:
{ {
@ -5523,7 +5529,6 @@ good:
break; break;
} }
case CON_SETWALL: case CON_SETWALL:
case CON_GETWALL: case CON_GETWALL:
{ {
@ -5540,6 +5545,7 @@ good:
DoWall(tw==CON_SETWALL, lVar1, lLabelID, lVar2, g_i, g_p); DoWall(tw==CON_SETWALL, lVar1, lLabelID, lVar2, g_i, g_p);
break; break;
} }
case CON_SETACTORVAR: case CON_SETACTORVAR:
case CON_GETACTORVAR: case CON_GETACTORVAR:
{ {
@ -5633,6 +5639,7 @@ good:
DoActor(tw==CON_SETACTOR, lVar1, lLabelID, lVar2, g_i, g_p, lParm2); DoActor(tw==CON_SETACTOR, lVar1, lLabelID, lVar2, g_i, g_p, lParm2);
break; break;
} }
case CON_GETANGLETOTARGET: case CON_GETANGLETOTARGET:
{ {
int i; int i;
@ -5646,6 +5653,7 @@ good:
SetGameVarID(i, ang, g_i, g_p ); SetGameVarID(i, ang, g_i, g_p );
break; break;
} }
case CON_ANGOFFVAR: case CON_ANGOFFVAR:
{ {
int i; int i;
@ -5654,6 +5662,7 @@ good:
spriteext[g_i].angoff=GetGameVarID(i, g_i, g_p); spriteext[g_i].angoff=GetGameVarID(i, g_i, g_p);
break; break;
} }
case CON_LOCKPLAYER: case CON_LOCKPLAYER:
{ {
int i; int i;
@ -5662,6 +5671,7 @@ good:
ps[g_p].transporter_hold=GetGameVarID(i, g_i, g_p); ps[g_p].transporter_hold=GetGameVarID(i, g_i, g_p);
break; break;
} }
case CON_CHECKAVAILWEAPON: case CON_CHECKAVAILWEAPON:
case CON_CHECKAVAILINVEN: case CON_CHECKAVAILINVEN:
{ {
@ -5684,6 +5694,7 @@ good:
} }
break; break;
} }
case CON_GETPLAYERANGLE: case CON_GETPLAYERANGLE:
{ {
int i; int i;
@ -5692,6 +5703,7 @@ good:
SetGameVarID(i, ps[g_p].ang, g_i, g_p ); SetGameVarID(i, ps[g_p].ang, g_i, g_p );
break; break;
} }
case CON_SETPLAYERANGLE: case CON_SETPLAYERANGLE:
{ {
int i; int i;
@ -5701,6 +5713,7 @@ good:
ps[g_p].ang &= 2047; ps[g_p].ang &= 2047;
break; break;
} }
case CON_GETACTORANGLE: case CON_GETACTORANGLE:
{ {
int i; int i;
@ -5709,6 +5722,7 @@ good:
SetGameVarID(i, g_sp->ang, g_i, g_p ); SetGameVarID(i, g_sp->ang, g_i, g_p );
break; break;
} }
case CON_SETACTORANGLE: case CON_SETACTORANGLE:
{ {
int i; int i;
@ -5718,6 +5732,7 @@ good:
g_sp->ang &= 2047; g_sp->ang &= 2047;
break; break;
} }
case CON_SETVAR: case CON_SETVAR:
{ {
int i; int i;
@ -5726,6 +5741,7 @@ good:
SetGameVarID(i, *insptr++, g_i, g_p ); SetGameVarID(i, *insptr++, g_i, g_p );
break; break;
} }
case CON_SETVARVAR: case CON_SETVARVAR:
{ {
int i; int i;
@ -5743,6 +5759,7 @@ good:
SetGameVarID(i, mulscale(krand(), *insptr++, 16), g_i, g_p ); SetGameVarID(i, mulscale(krand(), *insptr++, 16), g_i, g_p );
break; break;
} }
case CON_DISPLAYRANDVAR: case CON_DISPLAYRANDVAR:
{ {
int i; int i;
@ -5751,6 +5768,7 @@ good:
SetGameVarID(i, mulscale(rand(), *insptr++, 15), g_i, g_p ); SetGameVarID(i, mulscale(rand(), *insptr++, 15), g_i, g_p );
break; break;
} }
case CON_MULVAR: case CON_MULVAR:
{ {
int i; int i;
@ -5772,6 +5790,7 @@ good:
SetGameVarID(i, GetGameVarID(i, g_i, g_p) / *insptr++, g_i, g_p ); SetGameVarID(i, GetGameVarID(i, g_i, g_p) / *insptr++, g_i, g_p );
break; break;
} }
case CON_MODVAR: case CON_MODVAR:
{ {
int i; int i;
@ -5786,6 +5805,7 @@ good:
SetGameVarID(i,GetGameVarID(i, g_i, g_p)%l, g_i, g_p ); SetGameVarID(i,GetGameVarID(i, g_i, g_p)%l, g_i, g_p );
break; break;
} }
case CON_ANDVAR: case CON_ANDVAR:
{ {
int i; int i;
@ -5796,6 +5816,7 @@ good:
SetGameVarID(i,GetGameVarID(i, g_i, g_p) & l, g_i, g_p ); SetGameVarID(i,GetGameVarID(i, g_i, g_p) & l, g_i, g_p );
break; break;
} }
case CON_ORVAR: case CON_ORVAR:
{ {
int i; int i;
@ -5806,6 +5827,7 @@ good:
SetGameVarID(i,GetGameVarID(i, g_i, g_p) | l, g_i, g_p ); SetGameVarID(i,GetGameVarID(i, g_i, g_p) | l, g_i, g_p );
break; break;
} }
case CON_XORVAR: case CON_XORVAR:
{ {
int i; int i;
@ -5874,6 +5896,7 @@ good:
SetGameVarID(i, l1*l2, g_i, g_p ); SetGameVarID(i, l1*l2, g_i, g_p );
break; break;
} }
case CON_DIVVARVAR: case CON_DIVVARVAR:
{ {
int i; int i;
@ -5889,6 +5912,7 @@ good:
SetGameVarID(i, l1/l2 , g_i, g_p ); SetGameVarID(i, l1/l2 , g_i, g_p );
break; break;
} }
case CON_MODVARVAR: case CON_MODVARVAR:
{ {
int i; int i;
@ -5904,6 +5928,7 @@ good:
SetGameVarID(i, l1 % l2, g_i, g_p ); SetGameVarID(i, l1 % l2, g_i, g_p );
break; break;
} }
case CON_ANDVARVAR: case CON_ANDVARVAR:
{ {
int i; int i;
@ -5915,6 +5940,7 @@ good:
SetGameVarID(i, l1 & l2 , g_i, g_p ); SetGameVarID(i, l1 & l2 , g_i, g_p );
break; break;
} }
case CON_XORVARVAR: case CON_XORVARVAR:
{ {
int i; int i;
@ -5926,6 +5952,7 @@ good:
SetGameVarID(i, l1 ^ l2 , g_i, g_p ); SetGameVarID(i, l1 ^ l2 , g_i, g_p );
break; break;
} }
case CON_ORVARVAR: case CON_ORVARVAR:
{ {
int i; int i;
@ -5937,6 +5964,7 @@ good:
SetGameVarID(i, l1 | l2 , g_i, g_p ); SetGameVarID(i, l1 | l2 , g_i, g_p );
break; break;
} }
case CON_SUBVAR: case CON_SUBVAR:
{ {
int i; int i;
@ -5945,6 +5973,7 @@ good:
SetGameVarID(i, GetGameVarID(i, g_i, g_p) - *insptr++, g_i, g_p ); SetGameVarID(i, GetGameVarID(i, g_i, g_p) - *insptr++, g_i, g_p );
break; break;
} }
case CON_SUBVARVAR: case CON_SUBVARVAR:
{ {
int i; int i;
@ -5953,6 +5982,7 @@ good:
SetGameVarID(i, GetGameVarID(i, g_i, g_p) - GetGameVarID(*insptr++, g_i, g_p), g_i, g_p ); SetGameVarID(i, GetGameVarID(i, g_i, g_p) - GetGameVarID(*insptr++, g_i, g_p), g_i, g_p );
break; break;
} }
case CON_ADDVAR: case CON_ADDVAR:
{ {
int i; int i;
@ -5963,6 +5993,7 @@ good:
SetGameVarID(i, GetGameVarID(i, g_i, g_p) + *insptr++, g_i, g_p ); SetGameVarID(i, GetGameVarID(i, g_i, g_p) + *insptr++, g_i, g_p );
break; break;
} }
case CON_SHIFTVARL: case CON_SHIFTVARL:
{ {
int i; int i;
@ -5985,7 +6016,6 @@ good:
break; break;
} }
case CON_SIN: case CON_SIN:
{ {
int i; int i;
@ -5997,6 +6027,7 @@ good:
SetGameVarID(i, lValue , g_i, g_p ); SetGameVarID(i, lValue , g_i, g_p );
break; break;
} }
case CON_COS: case CON_COS:
{ {
int i; int i;
@ -6010,6 +6041,7 @@ good:
SetGameVarID(i, lValue , g_i, g_p ); SetGameVarID(i, lValue , g_i, g_p );
break; break;
} }
case CON_ADDVARVAR: case CON_ADDVARVAR:
{ {
int i; int i;
@ -6018,36 +6050,42 @@ good:
SetGameVarID(i, GetGameVarID(i, g_i, g_p) + GetGameVarID(*insptr++, g_i, g_p), g_i, g_p ); SetGameVarID(i, GetGameVarID(i, g_i, g_p) + GetGameVarID(*insptr++, g_i, g_p), g_i, g_p );
break; break;
} }
case CON_SPGETLOTAG: case CON_SPGETLOTAG:
{ {
insptr++; insptr++;
SetGameVarID(g_iLoTagID, g_sp->lotag, g_i, g_p); SetGameVarID(g_iLoTagID, g_sp->lotag, g_i, g_p);
break; break;
} }
case CON_SPGETHITAG: case CON_SPGETHITAG:
{ {
insptr++; insptr++;
SetGameVarID(g_iHiTagID, g_sp->hitag, g_i, g_p); SetGameVarID(g_iHiTagID, g_sp->hitag, g_i, g_p);
break; break;
} }
case CON_SECTGETLOTAG: case CON_SECTGETLOTAG:
{ {
insptr++; insptr++;
SetGameVarID(g_iLoTagID, sector[g_sp->sectnum].lotag, g_i, g_p); SetGameVarID(g_iLoTagID, sector[g_sp->sectnum].lotag, g_i, g_p);
break; break;
} }
case CON_SECTGETHITAG: case CON_SECTGETHITAG:
{ {
insptr++; insptr++;
SetGameVarID(g_iHiTagID, sector[g_sp->sectnum].hitag, g_i, g_p); SetGameVarID(g_iHiTagID, sector[g_sp->sectnum].hitag, g_i, g_p);
break; break;
} }
case CON_GETTEXTUREFLOOR: case CON_GETTEXTUREFLOOR:
{ {
insptr++; insptr++;
SetGameVarID(g_iTextureID, sector[g_sp->sectnum].floorpicnum, g_i, g_p); SetGameVarID(g_iTextureID, sector[g_sp->sectnum].floorpicnum, g_i, g_p);
break; break;
} }
case CON_STARTTRACK: case CON_STARTTRACK:
{ {
insptr++; insptr++;
@ -6055,12 +6093,14 @@ good:
playmusic(&music_fn[ud.volume_number][music_select][0]); playmusic(&music_fn[ud.volume_number][music_select][0]);
break; break;
} }
case CON_GETTEXTURECEILING: case CON_GETTEXTURECEILING:
{ {
insptr++; insptr++;
SetGameVarID(g_iTextureID, sector[g_sp->sectnum].ceilingpicnum, g_i, g_p); SetGameVarID(g_iTextureID, sector[g_sp->sectnum].ceilingpicnum, g_i, g_p);
break; break;
} }
case CON_IFVARVARAND: case CON_IFVARVARAND:
{ {
int i; int i;
@ -6074,6 +6114,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARVARN: case CON_IFVARVARN:
{ {
int i; int i;
@ -6087,6 +6128,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARVARE: case CON_IFVARVARE:
{ {
int i; int i;
@ -6100,6 +6142,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARVARG: case CON_IFVARVARG:
{ {
int i; int i;
@ -6113,6 +6156,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARVARL: case CON_IFVARVARL:
{ {
int i; int i;
@ -6126,6 +6170,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARE: case CON_IFVARE:
{ {
int i; int i;
@ -6139,6 +6184,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARN: case CON_IFVARN:
{ {
int i; int i;
@ -6152,6 +6198,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_WHILEVARN: case CON_WHILEVARN:
{ {
int i; int i;
@ -6173,6 +6220,7 @@ good:
} }
break; break;
} }
case CON_WHILEVARVARN: case CON_WHILEVARVARN:
{ {
int i,k; int i,k;
@ -6195,6 +6243,7 @@ good:
} }
break; break;
} }
case CON_IFVARAND: case CON_IFVARAND:
{ {
int i; int i;
@ -6208,6 +6257,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARG: case CON_IFVARG:
{ {
int i; int i;
@ -6221,6 +6271,7 @@ good:
parseifelse( j ); parseifelse( j );
break; break;
} }
case CON_IFVARL: case CON_IFVARL:
{ {
int i; int i;
@ -6273,6 +6324,7 @@ good:
parseifelse(j); parseifelse(j);
break; break;
} }
case CON_PSTOMP: case CON_PSTOMP:
insptr++; insptr++;
if( ps[g_p].knee_incs == 0 && sprite[ps[g_p].i].xrepeat >= 40 ) if( ps[g_p].knee_incs == 0 && sprite[ps[g_p].i].xrepeat >= 40 )