From 39ecdd1591cc6b95a7f52504ef30428f947bab10 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 26 Jan 2020 15:57:28 -0800 Subject: [PATCH] Rumble rumble --- src/doomstat.h | 1 + src/p_tick.c | 9 ++++++++- src/r_main.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/doomstat.h b/src/doomstat.h index 232a5af8e..32a5b02f6 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -190,6 +190,7 @@ extern struct quake { // camera offsets and duration fixed_t x,y,z; + angle_t roll; UINT16 time; // location, radius, and intensity... diff --git a/src/p_tick.c b/src/p_tick.c index 4cc6c9ba4..deb8b5cc9 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -744,10 +744,17 @@ void P_Ticker(boolean run) quake.x = M_RandomRange(-ir,ir); quake.y = M_RandomRange(-ir,ir); quake.z = M_RandomRange(-ir,ir); + ir >>= 2; + ir = M_RandomRange(-ir,ir); + if (ir < 0) + ir = ANGLE_MAX - FixedAngle(-ir); + else + ir = FixedAngle(ir); + quake.roll = ir; --quake.time; } else - quake.x = quake.y = quake.z = 0; + quake.x = quake.y = quake.z = quake.roll = 0; if (metalplayback) G_ReadMetalTic(metalplayback); diff --git a/src/r_main.c b/src/r_main.c index ee071c06f..96f21e51f 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -666,7 +666,7 @@ void R_CheckViewMorph(void) float fisheyemap[MAXVIDWIDTH/2 + 1]; #endif - angle_t rollangle = players[displayplayers[0]].viewrollangle; + angle_t rollangle = players[displayplayers[0]].viewrollangle + quake.roll; #ifdef WOUGHMP_WOUGHMP fixed_t fisheye = cv_cam2_turnmultiplier.value; // temporary test value #endif