From 6942298862616bff09ff17167597c9713f775cbc Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 2 Apr 2023 23:55:16 +0100 Subject: [PATCH] Adjustments to Rumble - Cause more intense rumble for damage/damage-causing hitlag - Reduce intensity for offroad/bananadrag rumble --- src/p_tick.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/p_tick.c b/src/p_tick.c index 4c731bf9d..46be683f0 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -759,10 +759,15 @@ void P_Ticker(boolean run) if (player->mo == NULL) continue; - if (player->boostpower < FRACUNIT && P_IsObjectOnGround(player->mo)) + if ((player->mo->eflags & MFE_DAMAGEHITLAG) && player->mo->hitlag) { - low = 65536 / 4; - high = 65536 / 4; + low = 65536 / 2; + high = 65536 / 2; + } + else if (player->boostpower < FRACUNIT && P_IsObjectOnGround(player->mo)) + { + low = 65536 / 32; + high = 65536 / 32; } G_PlayerDeviceRumble(i, low, high);