From 587c6267185db0d6a544a25143d9211097459c11 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 12 Feb 2013 17:03:29 +0100 Subject: [PATCH] kill more dead code --- qcsrc/client/miscfunctions.qc | 1 - qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c | 6 ------ qcsrc/server/defs.qh | 5 ----- qcsrc/server/miscfunctions.qc | 8 -------- 4 files changed, 20 deletions(-) diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index ad0ca01c5..7edabdfc5 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -574,7 +574,6 @@ void DrawCircleClippedPic(vector centre, float radius, string pic, float f, vect const vector GETPLAYERORIGIN_ERROR = '1123581321 2357111317 3141592653'; // way out of bounds for anything on the map vector getplayerorigin(float pl) { - string s; entity e; e = CSQCModel_server2csqc(pl + 1); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c index 25b0fcb19..c55d4d488 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c @@ -37,12 +37,6 @@ void XonoticModelDialog_fill(entity me) e.configureXonoticTextSliderValues(e); setDependent(e, "cl_gentle", 0, 0); me.TR(me); - #ifdef ALLOW_FORCEMODELS - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Force models:"))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, string_null, string_null, ZCTX(_("MDL^None")))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodelsfromxonotic", string_null, ZCTX(_("MDL^Custom")))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodels", string_null, ZCTX(_("MDL^All")))); - #endif me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine"))); me.TR(me); diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index ca01caf9c..bfea6b2bc 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -277,11 +277,6 @@ float default_weapon_alpha; .string cvar_g_xonoticversion; .string cvar_cl_weaponpriority; .string cvar_cl_weaponpriorities[10]; -#ifdef ALLOW_FORCEMODELS -.float cvar_cl_forceplayermodels; -.float cvar_cl_forceplayermodelsfromxonotic; -float sv_clforceplayermodels; -#endif .float cvar_cl_gunalign; .float cvar_cl_noantilag; diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index e8972ca8e..e3689cc3d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -574,10 +574,6 @@ void GetCvars(float f) self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share); self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive); -#ifdef ALLOW_FORCEMODELS - GetCvars_handleFloat(s, f, cvar_cl_forceplayermodels, "cl_forceplayermodels"); - GetCvars_handleFloat(s, f, cvar_cl_forceplayermodelsfromxonotic, "cl_forceplayermodelsfromxonotic"); -#endif GetCvars_handleFloatOnce(s, f, cvar_cl_gunalign, "cl_gunalign"); GetCvars_handleFloat(s, f, cvar_cl_allow_uid2name, "cl_allow_uid2name"); GetCvars_handleFloat(s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking"); @@ -1164,10 +1160,6 @@ void readlevelcvars(void) g_touchexplode_edgedamage = cvar("g_touchexplode_edgedamage"); g_touchexplode_force = cvar("g_touchexplode_force"); -#ifdef ALLOW_FORCEMODELS - sv_clforceplayermodels = cvar("sv_clforceplayermodels"); -#endif - sv_clones = cvar("sv_clones"); sv_gentle = cvar("sv_gentle"); sv_foginterval = cvar("sv_foginterval"); -- 2.39.2