From c630ad9110256db08ad54dce2f22b7997d994942 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 31 Mar 2021 20:35:10 +1100 Subject: [PATCH] Revert "- subjective fix to Duke 3D's RPG harsh recoil." This reverts commit 839a7bcbe4a02e2d38470ea7a114473d59580e91. Revert "- Duke: Restore RPG harsh recoil behind a CVAR." This reverts commit 88a49b0d2248243c687989e3a5a50f265a9fa089. # Conflicts: # source/core/gamecvars.cpp # source/core/gamecvars.h --- source/core/gamecvars.cpp | 1 - source/core/gamecvars.h | 1 - source/games/duke/src/player_d.cpp | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp index 2f974cdbc..7fea2c6f6 100644 --- a/source/core/gamecvars.cpp +++ b/source/core/gamecvars.cpp @@ -77,7 +77,6 @@ CVARD(Bool, cl_slopetilting, false, CVAR_ARCHIVE, "enable/disable slope tilting" CVARD(Int, cl_showweapon, 1, CVAR_ARCHIVE, "enable/disable show weapons") // only implemented in Blood CVARD(Bool, cl_sointerpolation, true, CVAR_ARCHIVE, "enable/disable sector object interpolation") // only implemented in SW CVARD(Bool, cl_syncinput, false, CVAR_ARCHIVE, "enable/disable synchronized input with game's ticrate") // only implemented in Duke -CVARD(Bool, cl_dukefixrpgrecoil, false, CVAR_ARCHIVE, "soften recoil of Duke 3D's RPG") CVARD(Bool, cl_smoothsway, false, CVAR_ARCHIVE, "move SW weapon left and right smoothly while bobbing") CVARD(Bool, cl_showmagamt, false, CVAR_ARCHIVE, "show the amount of rounds left in the magazine of your weapon on the modern HUD") CVARD(Bool, cl_nomeleeblur, false, CVAR_ARCHIVE, "enable/disable blur effect with melee weapons in SW") diff --git a/source/core/gamecvars.h b/source/core/gamecvars.h index 8c92f76c3..fa2115037 100644 --- a/source/core/gamecvars.h +++ b/source/core/gamecvars.h @@ -22,7 +22,6 @@ EXTERN_CVAR(Int, cl_weaponswitch) EXTERN_CVAR(Float, crosshairscale) EXTERN_CVAR(Bool, cl_sointerpolation) EXTERN_CVAR(Bool, cl_syncinput) -EXTERN_CVAR(Bool, cl_dukefixrpgrecoil) EXTERN_CVAR(Bool, cl_smoothsway) EXTERN_CVAR(Bool, cl_showmagamt) EXTERN_CVAR(Bool, cl_nomeleeblur) diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index 6f23e1250..16de421c8 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -2611,7 +2611,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect) fi.shoot(pact, RPG); checkavailweapon(p); } - else if (p->kickback_pic == (cl_dukefixrpgrecoil ? 13 : 20)) + else if (p->kickback_pic == 20) p->okickback_pic = p->kickback_pic = 0; break; }