diff --git a/src/p_local.h b/src/p_local.h index 38dcc006b..944879fa8 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -158,6 +158,8 @@ extern consvar_t cv_tiltsmoothing; extern consvar_t cv_actionmovie; +extern consvar_t cv_screenquake; + extern consvar_t cv_lookbackmom[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS]; diff --git a/src/p_tick.c b/src/p_tick.c index 5e1af1b68..9664d50be 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -573,7 +573,7 @@ static void P_RunQuakes(void) { fixed_t ir; - if (quake.time <= 0) + if (!cv_screenquake.value || quake.time <= 0) { quake.x = quake.y = quake.z = quake.roll = 0; return; @@ -618,8 +618,8 @@ static inline void P_ResetSpriteStuff(void) if (!mo || (mo->sprite == SPR_NULL) || (mo->flags2 & MF2_DONTDRAW) || (mo->type == MT_SHADOW)) continue; - mo->spritexscale = mo->realxscale; - mo->spriteyscale = mo->realyscale; + mo->spritexscale = mo->realxscale; + mo->spriteyscale = mo->realyscale; mo->spritexoffset = mo->realxoffset; mo->spriteyoffset = mo->realyoffset; } diff --git a/src/p_user.c b/src/p_user.c index bbf3d2478..d4a36276c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3044,6 +3044,8 @@ consvar_t cv_tiltsmoothing = {"tiltsmoothing", "32", CV_SAVE, CV_Natural, NULL, consvar_t cv_actionmovie = {"actionmovie", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_screenquake = {"quakescreenshake", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static CV_PossibleValue_t lookbackmom_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Double"}, {0, NULL}}; consvar_t cv_lookbackmom[MAXSPLITSCREENPLAYERS] = { diff --git a/src/r_main.c b/src/r_main.c index 1cee288a9..3e898a749 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1550,6 +1550,8 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_tiltsmoothing); CV_RegisterVar(&cv_actionmovie); + CV_RegisterVar(&cv_screenquake); + CV_RegisterVar(&cv_driftsparkpulse); CV_RegisterVar(&cv_gravstretch); CV_RegisterVar(&cv_sloperoll);