diff --git a/src/m_menu.c b/src/m_menu.c index 2a5ae889b..df496815d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1456,7 +1456,6 @@ static menuitem_t OP_ExpOptionsMenu[] = { {IT_HEADER, NULL, "Experimental Options", NULL, 10}, {IT_STRING|IT_CVAR, NULL, "Interpolation Distance", &cv_grmaxinterpdist, 20}, - {IT_STRING|IT_CVAR, NULL, "Mobj Subsector Interpolation", &cv_mobjssector, 25}, {IT_STRING | IT_CVAR, NULL, "Weather Interpolation", &cv_precipinterp, 30}, {IT_STRING | IT_CVAR, NULL, "Less Weather Effects", &cv_lessprecip, 35}, @@ -1480,7 +1479,6 @@ static const char* OP_ExpTooltips[] = { NULL, "How far Mobj interpolation should take effect.", - "Toggles Mobj Subsector Interpolation.", "Should weather be interpolated? Weather should look about the\nsame but perform a bit better when disabled.", "When weather is on this will cut the object amount used in half.", "Toggle being able to see the sky.", @@ -1500,7 +1498,6 @@ enum { op_exp_header, op_exp_interpdist, - op_exp_mobjssector, op_exp_precipinter, op_exp_lessprecip, op_exp_skybox, diff --git a/src/r_fps.c b/src/r_fps.c index 40b2060e6..1b6eb3759 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -43,8 +43,6 @@ consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, N consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_mobjssector = {"mobjsubsectorinterp", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; - UINT32 R_GetFramerateCap(void) { if (rendermode == render_none) @@ -328,10 +326,8 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) IFCHANGED(scale, old_scale) out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac); - if (cv_mobjssector.value) - out->subsector = R_PointInSubsector(out->x, out->y); - else - out->subsector = mobj->subsector; + //out->subsector = R_PointInSubsector(out->x, out->y); // why was this even done? + out->subsector = mobj->subsector; if (mobj->player) { @@ -385,10 +381,8 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst out->spritexoffset = mobj->spritexoffset; out->spriteyoffset = mobj->spriteyoffset; - if (cv_mobjssector.value) - out->subsector = R_PointInSubsector(out->x, out->y); - else - out->subsector = mobj->subsector; + //out->subsector = R_PointInSubsector(out->x, out->y); // i dont understand lol + out->subsector = mobj->subsector; IFCHANGED(angle, old_angle) out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); diff --git a/src/r_fps.h b/src/r_fps.h index 14b7b2157..1b7b02cac 100644 --- a/src/r_fps.h +++ b/src/r_fps.h @@ -21,7 +21,6 @@ extern consvar_t cv_fpscap; extern consvar_t cv_precipinterp; -extern consvar_t cv_mobjssector; UINT32 R_GetFramerateCap(void); boolean R_UsingFrameInterpolation(void); diff --git a/src/r_main.c b/src/r_main.c index 50423e343..04ab84ac3 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1831,10 +1831,8 @@ void R_RegisterEngineStuff(void) if (dedicated) return; - //CV_RegisterVar(&cv_precipdensity); CV_RegisterVar(&cv_translucency); CV_RegisterVar(&cv_drawdist); - //CV_RegisterVar(&cv_drawdist_nights); CV_RegisterVar(&cv_drawdist_precip); CV_RegisterVar(&cv_lessprecip); CV_RegisterVar(&cv_fov); @@ -1907,5 +1905,4 @@ void R_RegisterEngineStuff(void) // Frame interpolation/uncapped CV_RegisterVar(&cv_fpscap); CV_RegisterVar(&cv_precipinterp); - CV_RegisterVar(&cv_mobjssector); }