X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=42fadc0c18a86b0cc0cec1eb145409adebe08efb;hb=f2804031fdb2889c46959e91ea9da121e6731686;hp=06d8c512841040fd45734d8a36e330b9d404e576;hpb=de2e4697b994b986882536b595cbbacfe4390903;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 06d8c5128..42fadc0c1 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -32,55 +32,6 @@ 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();
@@ -164,14 +115,6 @@ void CSQC_Init(void)
 	precache_model("null");
 	precache_sound("misc/hit.wav");
 	precache_sound("misc/typehit.wav");
-	if (autocvar_cl_precacheplayermodels)
-	{
-		precache_all_playermodels("models/player/*.zym");
-		precache_all_playermodels("models/player/*.dpm");
-		precache_all_playermodels("models/player/*.md3");
-		precache_all_playermodels("models/player/*.psk");
-		precache_all_playermodels("models/player/*.iqm");
-	}
 
 	Projectile_Precache();
 	Hook_Precache();
@@ -480,8 +423,8 @@ void Ent_ReadPlayerScore()
 #ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED
 	if(!isNew && n != self.sv_entnum)
 	{
-		//print(_("A CSQC entity changed its owner!\n"));
-		print(sprintf(_("A CSQC entity changed its owner! (edict: %d, classname: %s)\n"), num_for_edict(self), self.classname));
+		//print("A CSQC entity changed its owner!\n");
+		print(sprintf("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname));
 		isNew = true;
 		Ent_Remove();
 		self.enttype = ENT_CLIENT_SCORES;
@@ -727,7 +670,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
 		}*/
 		if(autocvar_cl_spawn_point_particles)
 		{
-			if(teamplay)
+			if((serverflags & SERVERFLAG_TEAMPLAY))
 			{
 				switch(teamnum)
 				{
@@ -830,8 +773,8 @@ void CSQC_Ent_Update(float bIsNewEntity)
 	{
 		if(t != self.enttype || bIsNewEntity)
 		{
-			//print(_("A CSQC entity changed its type!\n"));
-			print(sprintf(_("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n"), num_for_edict(self), self.entnum, self.enttype, t));
+			//print("A CSQC entity changed its type!\n");
+			print(sprintf("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t));
 			Ent_Remove();
 			clearentity(self);
 			bIsNewEntity = 1;
@@ -841,7 +784,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 	{
 		if(!bIsNewEntity)
 		{
-			print(sprintf(_("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n"), num_for_edict(self), self.entnum, t));
+			print(sprintf("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t));
 			bIsNewEntity = 1;
 		}
 	}