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

Somebody needed an 'ezshootvar'. These commands are getting ridiculous.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@276 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-08-22 21:02:06 +00:00
parent f369ba745c
commit b4ed27fa7d
5 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/game.c
View file

@ -10914,7 +10914,7 @@ FRAGBONUS:
if( KB_KeyPressed( sc_F12 ) ) if( KB_KeyPressed( sc_F12 ) )
{ {
KB_ClearKeyDown( sc_F12 ); KB_ClearKeyDown( sc_F12 );
screencapture("eduke0000.tga",0); screencapture("duke0000.tga",0);
} }
if(bonusonly || ud.multimode > 1) return; if(bonusonly || ud.multimode > 1) return;
@ -11126,7 +11126,7 @@ FRAGBONUS:
if( KB_KeyPressed( sc_F12 ) ) if( KB_KeyPressed( sc_F12 ) )
{ {
KB_ClearKeyDown( sc_F12 ); KB_ClearKeyDown( sc_F12 );
screencapture("eduke0000.tga",0); screencapture("duke0000.tga",0);
} }
if( totalclock < (60*13) ) if( totalclock < (60*13) )

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

@ -439,6 +439,8 @@ char *keyw[] = {
"findnearactorzvar", // 292 "findnearactorzvar", // 292
"findnearspritez", // 293 "findnearspritez", // 293
"findnearspritezvar", // 294 "findnearspritezvar", // 294
"zshootvar", // 295
"ezshootvar", // 296
"<null>" "<null>"
}; };
@ -4136,6 +4138,8 @@ repeatcase:
case CON_CHANGESPRITESTAT: case CON_CHANGESPRITESTAT:
case CON_CHANGESPRITESECT: case CON_CHANGESPRITESECT:
case CON_ZSHOOTVAR:
case CON_EZSHOOTVAR:
if(!CheckEventSync(current_event)) if(!CheckEventSync(current_event))
ReportError(WARNING_EVENTSYNC); ReportError(WARNING_EVENTSYNC);
case CON_GETPNAME: case CON_GETPNAME:

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

@ -726,5 +726,7 @@ enum keywords {
CON_FINDNEARACTORZVAR, // 292 CON_FINDNEARACTORZVAR, // 292
CON_FINDNEARSPRITEZ, // 293 CON_FINDNEARSPRITEZ, // 293
CON_FINDNEARSPRITEZVAR, // 294 CON_FINDNEARSPRITEZVAR, // 294
CON_ZSHOOTVAR, // 295
CON_EZSHOOTVAR, // 296
END END
}; };

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

@ -4548,16 +4548,26 @@ SKIPJIBS:
case CON_SHOOTVAR: case CON_SHOOTVAR:
case CON_ESHOOTVAR: case CON_ESHOOTVAR:
case CON_EZSHOOTVAR:
case CON_ZSHOOTVAR:
{ {
long lIn, lReturn=-1; long lIn, lReturn=-1;
insptr++; insptr++;
if(tw == CON_ZSHOOTVAR || tw == CON_EZSHOOTVAR)
{
hittype[g_i].temp_data[9] = GetGameVarID(*insptr++, g_i, g_p);
if (hittype[g_i].temp_data[9] == 0)
hittype[g_i].temp_data[9] = 1;
}
lIn=GetGameVarID(*insptr++, g_i, g_p); lIn=GetGameVarID(*insptr++, g_i, g_p);
if(g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS) if(g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS)
{
lReturn = shoot(g_i, lIn); lReturn = shoot(g_i, lIn);
if (tw == CON_ESHOOTVAR) if (tw == CON_ESHOOTVAR || tw == CON_EZSHOOTVAR)
SetGameVarID(g_iReturnVarID, lReturn, g_i, g_p); SetGameVarID(g_iReturnVarID, lReturn, g_i, g_p);
}
break; break;
} }

4
polymer/eduke32/source/player.c
View file

@ -2707,6 +2707,7 @@ void getinput(short snum)
loc.avel = angvel = 0; loc.avel = angvel = 0;
loc.horz = horiz = 0; loc.horz = horiz = 0;
loc.bits = (((long)gamequit)<<26); loc.bits = (((long)gamequit)<<26);
loc.extbits = 0;
return; return;
} }
@ -3484,7 +3485,7 @@ void processinput(short snum)
if(p->frag_ps != snum) if(p->frag_ps != snum)
{ {
if(GTFLAGS(GAMETYPE_FLAG_TDM) && ps[p->frag_ps].team == ps[snum].team) if(GTFLAGS(GAMETYPE_FLAG_TDM) && ps[p->frag_ps].team == ps[snum].team)
p->fraggedself++; ps[p->frag_ps].fraggedself++;
else else
{ {
ps[p->frag_ps].frag++; ps[p->frag_ps].frag++;
@ -5112,6 +5113,7 @@ void computergetinput(long snum, input *syn)
syn->avel = 0; syn->avel = 0;
syn->horz = 0; syn->horz = 0;
syn->bits = 0; syn->bits = 0;
syn->extbits = 0;
x1 = sprite[p->i].x; x1 = sprite[p->i].x;
y1 = sprite[p->i].y; y1 = sprite[p->i].y;