diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 5ebae2c58..56171e08a 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -4313,7 +4313,7 @@ void moveactors(void) case BOUNCEMINE__STATIC: case MORTER__STATIC: - j = spawn(i, (PLUTOPAK ? FRAMEEFFECT1 : FRAMEEFFECT1_13) ); + j = spawn(i,(PLUTOPAK?FRAMEEFFECT1:FRAMEEFFECT1_13)); hittype[j].temp_data[0] = 3; case HEAVYHBOMB__STATIC: @@ -4902,7 +4902,6 @@ void moveexplosions(void) // STATNUM 5 goto BOLT; case FRAMEEFFECT1_13__STATIC: if (PLUTOPAK) goto BOLT; // JBF: ideally this should never happen... - case FRAMEEFFECT1__STATIC: if(s->owner >= 0) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 54abb102b..9b693afff 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -3674,7 +3674,6 @@ short spawn( short j, short pn ) else switch(dynamictostatic[sp->picnum]) { default: - if( actorscrptr[sp->picnum] ) { if( j == -1 && sp->lotag > ud.player_skill ) @@ -6114,7 +6113,9 @@ PALONLY: } 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->shade = sprite[s->owner].shade; t->ang = sprite[s->owner].ang; diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c index 4f0284e67..0bd71a640 100644 --- a/polymer/eduke32/source/sector.c +++ b/polymer/eduke32/source/sector.c @@ -2561,8 +2561,9 @@ void cheatkeys(short snum) if( sb_snum&(1<<21) ) { KB_ClearKeyDown( sc_Pause ); - ud.pause_on = !ud.pause_on; - if( ud.pause_on == 1 && sb_snum&(1<<5) ) ud.pause_on = 2; + if(ud.pause_on) + ud.pause_on = 0; + else ud.pause_on = 1+SHIFTS_IS_PRESSED; if(ud.pause_on) { MUSIC_Pause();