[nexuiz-commits] r7217 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-13 06:36:10 -0400 (Mon, 13 Jul 2009)
New Revision: 7217

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
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.


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-07-13 10:24:21 UTC (rev 7216)
+++ trunk/data/defaultNexuiz.cfg	2009-07-13 10:36:10 UTC (rev 7217)
@@ -1598,9 +1598,10 @@
 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

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2009-07-13 10:24:21 UTC (rev 7216)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2009-07-13 10:36:10 UTC (rev 7217)
@@ -152,10 +152,12 @@
 		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));

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-07-13 10:24:21 UTC (rev 7216)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-07-13 10:36:10 UTC (rev 7217)
@@ -417,11 +417,15 @@
 #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

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-07-13 10:24:21 UTC (rev 7216)
+++ trunk/data/qcsrc/server/defs.qh	2009-07-13 10:36:10 UTC (rev 7217)
@@ -329,9 +329,11 @@
 .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;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-07-13 10:24:21 UTC (rev 7216)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-07-13 10:36:10 UTC (rev 7217)
@@ -532,8 +532,10 @@
     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 @@
     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)