X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=20f949bf3fc70b68f6e513c1412503a20531bc6d;hb=9e92e0e5bdad9052ff3463f67f3fb5a2ab812ed2;hp=d43c0bbbef658585503674777cefd73204bcfc8f;hpb=948c08402a7b9b7af36059104937650e343ecefe;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index d43c0bbbe..20f949bf3 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -131,6 +131,7 @@ void CSQC_Init(void)
 	// needs to be done so early because of the constants they create
 	static_init();
 	static_init_late();
+	static_init_precache();
 
 	// precaches
 
@@ -636,39 +637,33 @@ void Ent_RandomSeed()
 	psrandom(s);
 }
 
-void Ent_ReadAccuracy(void)
+void Ent_ReadAccuracy()
 {
-    int f, w;
     int sf = ReadInt24_t();
-	if(sf == 0)
-	{
-		for(w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
+	if (sf == 0) {
+		for (int w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
 			weapon_accuracy[w] = -1;
 		return;
 	}
 
-	for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w)
-	{
-		if(sf & f)
-		{
+	int f = 1;
+	for (int w = 0; w <= WEP_LAST - WEP_FIRST; ++w) {
+		if (sf & f) {
             int b = ReadByte();
-			if(b == 0)
+			if (b == 0)
 				weapon_accuracy[w] = -1;
-			else if(b == 255)
+			else if (b == 255)
 				weapon_accuracy[w] = 1.0; // no better error handling yet, sorry
 			else
 				weapon_accuracy[w] = (b - 1.0) / 100.0;
 		}
-		if(f == 0x800000)
-			f = 1;
-		else
-			f *= 2;
+		f = (f == 0x800000) ? 1 : f * 2;
 	}
 }
 
 void Spawn_Draw(entity this)
 {
-	pointparticles(this.cnt, this.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
+	__pointparticles(this.cnt, this.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
 }
 
 void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
@@ -738,11 +733,11 @@ void Ent_ReadSpawnEvent(float is_new)
 			{
 				switch(teamnum)
 				{
-					case NUM_TEAM_1: pointparticles(particleeffectnum(EFFECT_SPAWN_RED), self.origin, '0 0 0', 1); break;
-					case NUM_TEAM_2: pointparticles(particleeffectnum(EFFECT_SPAWN_BLUE), self.origin, '0 0 0', 1); break;
-					case NUM_TEAM_3: pointparticles(particleeffectnum(EFFECT_SPAWN_YELLOW), self.origin, '0 0 0', 1); break;
-					case NUM_TEAM_4: pointparticles(particleeffectnum(EFFECT_SPAWN_PINK), self.origin, '0 0 0', 1); break;
-					default: pointparticles(particleeffectnum(EFFECT_SPAWN_NEUTRAL), self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_1: pointparticles(EFFECT_SPAWN_RED, self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_2: pointparticles(EFFECT_SPAWN_BLUE, self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_3: pointparticles(EFFECT_SPAWN_YELLOW, self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_4: pointparticles(EFFECT_SPAWN_PINK, self.origin, '0 0 0', 1); break;
+					default: pointparticles(EFFECT_SPAWN_NEUTRAL, self.origin, '0 0 0', 1); break;
 				}
 			}
 			if(autocvar_cl_spawn_event_sound)
@@ -1043,6 +1038,8 @@ void Ent_Init()
 	g_trueaim_minrange = ReadCoord();
 	g_balance_porto_secondary = ReadByte();
 
+	MUTATOR_CALLHOOK(Ent_Init);
+
 	if(!postinit)
 		PostInit();
 }