X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=de87c0d747c66e0ce1f49f1474e74a0d74fb8b1c;hp=c3d1afb6f421bf02725f8b68595004dcf9631a8e;hb=85933809fc8288e7f0c59fb6bc4fa4d053597446;hpb=0250eeb9b9ce4f6b10d817700123d1bfd12f5789

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index c3d1afb6f4..de87c0d747 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -827,11 +827,6 @@ void Ent_ClientData()
 	if(newspectatee_status != spectatee_status)
 	{
 		float i;
-		// clear the weapon accuracy stats
-		for(i = WEP_FIRST; i <= WEP_LAST; ++i) {
-			weapon_hits[i] = 0;
-			weapon_fired[i] = 0;
-		}
 
 		// clear race stuff
 		race_laptime = 0;
@@ -883,6 +878,32 @@ void Ent_RandomSeed()
 	psrandom(s);
 }
 
+void Ent_ReadAccuracy(void)
+{
+	float sf, f, w, b;
+	sf = ReadInt24_t();
+	if(sf == 0)
+	{
+		for(w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
+			weapon_accuracy[w] = -1;
+		return;
+	}
+	
+	for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w, f *= 2)
+	{
+		if(sf & f)
+		{
+			b = ReadByte();
+			if(b == 0)
+				weapon_accuracy[w] = -1;
+			else if(b == 255)
+				weapon_accuracy[w] = 1.0; // no better error handling yet, sorry
+			else
+				weapon_accuracy[w] = (b - 1.0) / 100.0;
+		}
+	}
+}
+
 // CSQC_Ent_Update : Called every frame that the server has indicated an update to the SSQC / CSQC entity has occured.
 // The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
 void Ent_RadarLink();
@@ -946,6 +967,7 @@ void(float bIsNewEntity) CSQC_Ent_Update =
 		case ENT_CLIENT_HOOK: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_HOOK); break;
 		case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
 		case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
+		case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
 		default:
 			error(strcat("unknown entity type in CSQC_Ent_Update: ", ftos(self.enttype), "\n"));
 			break;