diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp index 1008b5d1f..2dee33550 100644 --- a/source/core/gamecvars.cpp +++ b/source/core/gamecvars.cpp @@ -85,6 +85,7 @@ CVARD(Bool, cl_hudinterpolation, true, CVAR_ARCHIVE, "enable/disable HUD (weapon CVARD(Bool, cl_bloodvanillarun, true, CVAR_ARCHIVE, "enable/disable Blood's vanilla run mode") CVARD(Bool, cl_bloodvanillabobbing, true, CVAR_ARCHIVE, "enable/disable Blood's vanilla bobbing while not using vanilla run mode") CVARD(Bool, cl_bloodhudinterp, false, CVAR_ARCHIVE, "enable/disable Blood's HUD interpolation") +CVARD(Bool, cl_bloodoldweapbalance, false, CVAR_ARCHIVE, "enable/disable legacy 1.0 weapon handling for Blood") CUSTOM_CVARD(Int, cl_autoaim, 1, CVAR_ARCHIVE|CVAR_USERINFO, "enable/disable weapon autoaim") diff --git a/source/core/gamecvars.h b/source/core/gamecvars.h index 4328b0b43..d8d70cd5d 100644 --- a/source/core/gamecvars.h +++ b/source/core/gamecvars.h @@ -30,6 +30,7 @@ EXTERN_CVAR(Bool, cl_hudinterpolation) EXTERN_CVAR(Bool, cl_bloodvanillarun) EXTERN_CVAR(Bool, cl_bloodvanillabobbing) EXTERN_CVAR(Bool, cl_bloodhudinterp) +EXTERN_CVAR(Bool, cl_bloodoldweapbalance) EXTERN_CVAR(Bool, demorec_seeds_cvar) EXTERN_CVAR(Bool, demoplay_diffs) diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp index 5099b170f..c53284831 100644 --- a/source/games/blood/src/blood.cpp +++ b/source/games/blood/src/blood.cpp @@ -92,7 +92,7 @@ void StartLevel(MapRecord* level, bool newgame) if (gGameOptions.nGameType == 0) { /////// - gGameOptions.weaponsV10x = gWeaponsV10x; + gGameOptions.weaponsV10x = cl_bloodoldweapbalance; /////// } #if 0 diff --git a/source/games/blood/src/globals.cpp b/source/games/blood/src/globals.cpp index 400713eb0..959578119 100644 --- a/source/games/blood/src/globals.cpp +++ b/source/games/blood/src/globals.cpp @@ -39,8 +39,4 @@ bool gInfiniteAmmo; int32_t gDeliriumBlur = 1; bool gFogMode = false; -////////// -int gWeaponsV10x; -///////// - END_BLD_NS diff --git a/source/games/blood/src/globals.h b/source/games/blood/src/globals.h index 7695906fa..767023461 100644 --- a/source/games/blood/src/globals.h +++ b/source/games/blood/src/globals.h @@ -39,10 +39,6 @@ extern bool gNoClip; extern bool gInfiniteAmmo; extern int32_t gDeliriumBlur; -/////// -extern int gWeaponsV10x; -////// - extern bool gFogMode; END_BLD_NS