From 09f9ee357478ae6014f02b8755c53db24112d974 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 13 Jul 2009 10:36:10 +0000 Subject: [PATCH] remove model forcing feature until further notice, due to zyms having mismatching bone indexes. Code can be reenabled by specifying -DALLOW_FORCEMODELS on the fteqcc command line. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7217 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 7 ++++--- data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c | 2 ++ data/qcsrc/server/cl_client.qc | 4 ++++ data/qcsrc/server/defs.qh | 2 ++ data/qcsrc/server/miscfunctions.qc | 4 ++++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 1fb15f64e..2e08e22e7 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -1598,9 +1598,10 @@ set menu_updatecheck 1 set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved set bot_sound_monopoly 0 "when enabled, only bots can make any noise" -seta cl_forceplayermodels 0 "force all players to look like you; WARNING: animations can look very bad with this" -seta cl_forceplayermodelsfromnexuiz 0 "force models coming from nexuiz; WARNING: animations can look very bad with this" -set sv_clforceplayermodels 1 "allow clients to use cl_forcemodels" +// broken, sorry (cannot handle weapon attachment properly) +//seta cl_forceplayermodels 0 "force all players to look like you; WARNING: animations can look very bad with this" +//seta cl_forceplayermodelsfromnexuiz 0 "force models coming from nexuiz; WARNING: animations can look very bad with this" +//set sv_clforceplayermodels 1 "allow clients to use cl_forcemodels" set sv_loddistance1 1024 set sv_loddistance2 4096 diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c index e60f6e923..54fcb484e 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c @@ -152,10 +152,12 @@ void fillNexuizPlayerSettingsTab(entity me) me.TDempty(me, 0.5); me.TR(me); me.TR(me); +#ifdef ALLOW_FORCEMODELS me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Force Models:")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, string_null, string_null, "None")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, "cl_forceplayermodelsfromnexuiz", string_null, "Custom")); me.TD(me, 1, 2/3, e = makeNexuizRadioButton(2, "cl_forceplayermodels", string_null, "All")); +#endif me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromnexuiz;sendcvar cl_forceplayermodels", COMMANDBUTTON_APPLY)); diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 6bc404c66..154c553d0 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -417,11 +417,15 @@ float Client_customizeentityforclient() #endif modelsource = self; + +#ifdef ALLOW_FORCEMODELS if(other.cvar_cl_forceplayermodelsfromnexuiz) if not(self.modelindex_lod0_from_nexuiz) modelsource = other; if(other.cvar_cl_forceplayermodels && sv_clforceplayermodels) modelsource = other; +#endif + self.skin = modelsource.skinindex; #if 0 diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 8f85f4645..f8af5891b 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -329,9 +329,11 @@ float default_weapon_alpha; .string cvar_g_nexuizversion; .string cvar_cl_weaponpriority; .string cvar_cl_weaponpriorities[10]; +#ifdef ALLOW_FORCEMODELS .float cvar_cl_forceplayermodels; .float cvar_cl_forceplayermodelsfromnexuiz; float sv_clforceplayermodels; +#endif float sv_loddistance1; float sv_loddistance2; .float cvar_cl_gunalign; diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index d1549cd28..0946d233f 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -532,8 +532,10 @@ void GetCvars(float f) GetCvars_handleFloat(s, f, cvar_cl_voice_directional, "cl_voice_directional"); GetCvars_handleFloat(s, f, cvar_cl_voice_directional_taunt_attenuation, "cl_voice_directional_taunt_attenuation"); GetCvars_handleFloat(s, f, cvar_cl_hitsound, "cl_hitsound"); +#ifdef ALLOW_FORCEMODELS GetCvars_handleFloat(s, f, cvar_cl_forceplayermodels, "cl_forceplayermodels"); GetCvars_handleFloat(s, f, cvar_cl_forceplayermodelsfromnexuiz, "cl_forceplayermodelsfromnexuiz"); +#endif GetCvars_handleFloat(s, f, cvar_cl_gunalign, "cl_gunalign"); @@ -1018,7 +1020,9 @@ 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_loddistance1 = cvar("sv_loddistance1"); sv_loddistance2 = cvar("sv_loddistance2"); if(sv_loddistance2 <= sv_loddistance1) -- 2.39.2