From: Samual <samual@xonotic.org>
Date: Fri, 16 Dec 2011 21:05:48 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~126
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=60c3f5e778bdfd84ee199e4a357fae567c6aaeb2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
	qcsrc/common/util.qc
---

60c3f5e778bdfd84ee199e4a357fae567c6aaeb2
diff --cc qcsrc/client/Main.qc
index 0f28e4bac,8c7c6bc0c..a57888e70
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -19,9 -41,57 +19,58 @@@ void menu_sub_null(
  float __engine_check;
  #endif
  
+ void precache_playermodel(string m)
+ {
+ 	string f;
+ 
+ 	if(substring(m, -9,5) == "_lod1")
+ 		return;
+ 	if(substring(m, -9,5) == "_lod2")
+ 		return;
+ 	precache_model(m);
+ 	f = strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1));
+ 	if(fexists(f))
+ 		precache_model(f);
+ 	f = strcat(substring(m, 0, -5), "_lod2", substring(m, -4, -1));
+ 	if(fexists(f))
+ 		precache_model(f);
+ 
+ 	/*
+ 	float globhandle, i, n;
+ 	globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE);
+ 	if (globhandle < 0)
+ 		return;
+ 	n = search_getsize(globhandle);
+ 	for (i = 0; i < n; ++i)
+ 	{
+ 		//print(search_getfilename(globhandle, i), "\n");
+ 		f = search_getfilename(globhandle, i);
+ 		PrecachePlayerSounds(f);
+ 	}
+ 	search_end(globhandle);
+ 	*/
+ }
+ void precache_all_playermodels(string pattern)
+ {
+ 	float globhandle, i, n;
+ 	string f;
+ 
+ 	globhandle = search_begin(pattern, TRUE, FALSE);
+ 	if (globhandle < 0)
+ 		return;
+ 	n = search_getsize(globhandle);
+ 	for (i = 0; i < n; ++i)
+ 	{
+ 		//print(search_getfilename(globhandle, i), "\n");
+ 		f = search_getfilename(globhandle, i);
+ 		precache_playermodel(f);
+ 	}
+ 	search_end(globhandle);
+ }
+ 
  string forcefog;
  void WaypointSprite_Load();
 +void ConsoleCommand_macro_init();
  void CSQC_Init(void)
  {
  	prvm_language = cvar_string("prvm_language");
diff --cc qcsrc/common/util.qc
index 5f648dd52,10f77b6cd..5bb7943fe
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -2108,10 -2108,13 +2108,22 @@@ float lowestbit(float f
  	return f;
  }
  
 +string strlimitedlen(string input, string truncation, float strip_colors, float limit)
 +{
 +	if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit)
 +		return input;
 +	else
 +		return strcat(substring(input, 0, (strlen(input) - strlen(truncation))), truncation);
 +}
++
+ #ifdef CSQC
+ entity ReadCSQCEntity()
+ {
+ 	float f;
+ 	f = ReadShort();
+ 	if(f == 0)
+ 		return world;
+ 	return findfloat(world, entnum, f);
+ }
+ #endif
++
diff --cc qcsrc/server/progs.src
index 1ede57594,45d83116f..156b6279d
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -38,15 -36,11 +38,18 @@@ campaign.q
  ../common/mapinfo.qh
  ../common/util.qc
  
 +command/common.qh
 +command/ipban.qh
 +command/radarmap.qh
 +command/vote.qh
 +command/cmd.qh
 +command/sv_cmd.qh
 +
  accuracy.qh
  csqcprojectile.qh
+ ../csqcmodel/settings.qh
+ ../csqcmodel/common.qh
+ ../csqcmodel/sv_model.qh
  csqceffects.qc
  
  anticheat.qh