diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp index 88cfbc484..6aed8da83 100644 --- a/source/core/gamecvars.cpp +++ b/source/core/gamecvars.cpp @@ -86,7 +86,6 @@ CVARD(Bool, cl_bloodvanillabobbing, true, CVAR_ARCHIVE, "enable/disable Blood's CVARD(Bool, cl_bloodvanillaexplosions, false, CVAR_ARCHIVE, "enable/disable Blood's vanilla explosion behavior") CVARD(Bool, cl_bloodvanillaenemies, false, CVAR_ARCHIVE, "enable/disable Blood's vanilla enemy behavior") CVARD(Bool, cl_bloodqavinterp, true, CVAR_ARCHIVE, "enable/disable Blood's QAV interpolation") -CVARD(Bool, cl_bloodqavforcedinterp, false, CVAR_ARCHIVE, "enable/disable Blood's QAV interpolation forcefully for QAVs that aren't defined as interpolatable") CVARD(Bool, cl_bloodweapinterp, false, CVAR_ARCHIVE, "enable/disable Blood's weapon interpolation. Depends on 'cl_bloodqavinterp'") CVARD(Bool, cl_bloodoldweapbalance, false, CVAR_ARCHIVE, "enable/disable legacy 1.0 weapon handling for Blood") CVARD(Bool, cl_loadingscreens, true, CVAR_ARCHIVE, "enable/disable loading screens for games") diff --git a/source/core/gamecvars.h b/source/core/gamecvars.h index b9566314c..2bf23359f 100644 --- a/source/core/gamecvars.h +++ b/source/core/gamecvars.h @@ -31,7 +31,6 @@ EXTERN_CVAR(Bool, cl_bloodvanillabobbing) EXTERN_CVAR(Bool, cl_bloodvanillaexplosions) EXTERN_CVAR(Bool, cl_bloodvanillaenemies) EXTERN_CVAR(Bool, cl_bloodqavinterp) -EXTERN_CVAR(Bool, cl_bloodqavforcedinterp) EXTERN_CVAR(Bool, cl_bloodweapinterp) EXTERN_CVAR(Bool, cl_bloodoldweapbalance) EXTERN_CVAR(Bool, cl_loadingscreens) diff --git a/source/games/blood/src/qav.cpp b/source/games/blood/src/qav.cpp index 43f18258a..3f30a957d 100644 --- a/source/games/blood/src/qav.cpp +++ b/source/games/blood/src/qav.cpp @@ -147,14 +147,11 @@ void DrawFrame(double x, double y, double z, double a, double alpha, int picnum, } -static QAVInterpProps forcedinterpdata{qavGetInterpType("picnum")}; - void QAV::Draw(double x, double y, int ticks, int stat, int shade, int palnum, bool to3dview, double const smoothratio) { assert(ticksPerFrame > 0); - QAVInterpProps* interpdata = qavInterpProps.CheckKey(res_id); - if (!interpdata && cl_bloodqavforcedinterp) interpdata = &forcedinterpdata; + auto const interpdata = qavInterpProps.CheckKey(res_id); auto const nFrame = clamp(ticks / ticksPerFrame, 0, nFrames - 1); FRAMEINFO* const thisFrame = &frames[nFrame];