diff --git a/src/r_main.c b/src/r_main.c index 8037775d6..e8bedddaf 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -149,7 +149,6 @@ consvar_t cv_flipcam2 = {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, consvar_t cv_shadow = {"shadow", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_3dfloors = {"3dfloors", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_ffloorclip = {"ffloorclip", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_allowmlook = {"allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showhud = {"showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize, 0, NULL, NULL, 0, 0, NULL}; @@ -1592,7 +1591,6 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_shadow); CV_RegisterVar(&cv_skybox); - CV_RegisterVar(&cv_3dfloors); CV_RegisterVar(&cv_ffloorclip); CV_RegisterVar(&cv_cam_dist); diff --git a/src/r_main.h b/src/r_main.h index acbb47ae3..3091246d0 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -103,7 +103,7 @@ extern consvar_t cv_chasecam, cv_chasecam2; extern consvar_t cv_flipcam, cv_flipcam2; extern consvar_t cv_shadow; -extern consvar_t cv_3dfloors, cv_ffloorclip; +extern consvar_t cv_ffloorclip; extern consvar_t cv_translucency; extern consvar_t cv_drawdist, cv_drawdist_nights, cv_drawdist_precip; extern consvar_t cv_fov; diff --git a/src/r_things.c b/src/r_things.c index e9eee6328..d2647b811 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -2251,7 +2251,7 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps // Add the 3D floors, thicksides, and masked textures... for (ds = drawsegs + mask->drawsegs[1]; ds-- > drawsegs + mask->drawsegs[0];) { - if (ds->numthicksides && cv_3dfloors.value) + if (ds->numthicksides) { for (i = 0; i < ds->numthicksides; i++) { @@ -2280,7 +2280,7 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps entry = R_CreateDrawNode(head); entry->seg = ds; } - if (ds->numffloorplanes && cv_3dfloors.value) + if (ds->numffloorplanes) { for (i = 0; i < ds->numffloorplanes; i++) {