zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made pause key behavior mimic Duke 1.5 and fixed a problem with FRAMEEFFECT1 

git-svn-id: https://svn.eduke32.com/eduke32@67 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-19 05:48:44 +00:00
parent 8524a949c4
commit 293c9593e0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
polymer/eduke32/source/actors.c
View File

@ -4313,7 +4313,7 @@ void moveactors(void)
case BOUNCEMINE__STATIC: case BOUNCEMINE__STATIC:
case MORTER__STATIC: case MORTER__STATIC:
j = spawn(i, (PLUTOPAK ? FRAMEEFFECT1 : FRAMEEFFECT1_13) ); j = spawn(i,(PLUTOPAK?FRAMEEFFECT1:FRAMEEFFECT1_13));
hittype[j].temp_data[0] = 3; hittype[j].temp_data[0] = 3;
case HEAVYHBOMB__STATIC: case HEAVYHBOMB__STATIC:
@ -4902,7 +4902,6 @@ void moveexplosions(void) // STATNUM 5
goto BOLT; goto BOLT;
case FRAMEEFFECT1_13__STATIC: case FRAMEEFFECT1_13__STATIC:
if (PLUTOPAK) goto BOLT; // JBF: ideally this should never happen... if (PLUTOPAK) goto BOLT; // JBF: ideally this should never happen...
case FRAMEEFFECT1__STATIC: case FRAMEEFFECT1__STATIC:
if(s->owner >= 0) if(s->owner >= 0)

5
polymer/eduke32/source/game.c
View File

@ -3674,7 +3674,6 @@ short spawn( short j, short pn )
else switch(dynamictostatic[sp->picnum]) else switch(dynamictostatic[sp->picnum])
{ {
default: default:
if( actorscrptr[sp->picnum] ) if( actorscrptr[sp->picnum] )
{ {
if( j == -1 && sp->lotag > ud.player_skill ) if( j == -1 && sp->lotag > ud.player_skill )
@ -6114,7 +6113,9 @@ PALONLY:
} }
if( (sprite[s->owner].cstat&32768) == 0 ) if( (sprite[s->owner].cstat&32768) == 0 )
{ {
t->picnum = hittype[s->owner].dispicnum; if(!hittype[s->owner].dispicnum)
t->picnum = hittype[i].temp_data[1];
else t->picnum = hittype[s->owner].dispicnum;
t->pal = sprite[s->owner].pal; t->pal = sprite[s->owner].pal;
t->shade = sprite[s->owner].shade; t->shade = sprite[s->owner].shade;
t->ang = sprite[s->owner].ang; t->ang = sprite[s->owner].ang;

5
polymer/eduke32/source/sector.c
View File

@ -2561,8 +2561,9 @@ void cheatkeys(short snum)
if( sb_snum&(1<<21) ) if( sb_snum&(1<<21) )
{ {
KB_ClearKeyDown( sc_Pause ); KB_ClearKeyDown( sc_Pause );
ud.pause_on = !ud.pause_on; if(ud.pause_on)
if( ud.pause_on == 1 && sb_snum&(1<<5) ) ud.pause_on = 2; ud.pause_on = 0;
else ud.pause_on = 1+SHIFTS_IS_PRESSED;
if(ud.pause_on) if(ud.pause_on)
{ {
MUSIC_Pause(); MUSIC_Pause();