X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=0b0faa31084dd773ae2336727e5dd21a5fa833ec;hb=d32a6d9aa4343cc760519016e5c3d8d4c150fa35;hp=bac1fdaef9c2719bf3c0438f6f5af51e1aeec43a;hpb=20e5e22c9d917b66c543120fd0dee9b3a5e7b373;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index bac1fdaef..0b0faa310 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -47,7 +47,7 @@ void WaypointSprite_Load();
 void CSQC_Init(void)
 {
 	prvm_language = cvar_string("prvm_language");
-	
+
 #ifdef USE_FTE
 #pragma target ID
 	__engine_check = checkextension("DP_SV_WRITEPICTURE");
@@ -139,6 +139,9 @@ void CSQC_Init(void)
 	GibSplash_Precache();
 	Casings_Precache();
 	DamageInfo_Precache();
+	Vehicles_Precache();
+	turrets_precache();
+
 	if(autocvar_cl_announcer != cl_announcer_prev) {
 		Announcer_Precache();
 		if(cl_announcer_prev)
@@ -824,8 +827,6 @@ void Ent_ClientData()
 
 	if(newspectatee_status != spectatee_status)
 	{
-		float i;
-
 		// clear race stuff
 		race_laptime = 0;
 		race_checkpointtime = 0;
@@ -846,7 +847,27 @@ void Ent_Nagger()
 {
 	float nags, i, j, b, f;
 
-	nags = ReadByte();
+	nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
+
+	if(!(nags & 4))
+	{
+		if(vote_called_vote)
+			strunzone(vote_called_vote);
+		vote_called_vote = string_null;
+		vote_active = 0;
+	}
+	else
+	{
+		vote_active = 1;
+	}
+
+	if(nags & 64)
+	{
+		vote_yescount = ReadByte();
+		vote_nocount = ReadByte();
+		vote_needed = ReadByte();
+		vote_highlighted = ReadChar();
+	}
 
 	if(nags & 128)
 	{
@@ -895,7 +916,7 @@ void Ent_ReadAccuracy(void)
 			weapon_accuracy[w] = -1;
 		return;
 	}
-	
+
 	for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w, f *= 2)
 	{
 		if(sf & f)
@@ -977,6 +998,8 @@ void(float bIsNewEntity) CSQC_Ent_Update =
 		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;
+		case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
+		case ENT_CLIENT_TURRET: ent_turret(); break; 
 		default:
 			//error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
 			error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));
@@ -1095,7 +1118,7 @@ void Ent_Init()
 	g_balance_electro_secondary_bouncestop = ReadCoord();
 
 	nex_scope = !ReadByte();
-	sniperrifle_scope = !ReadByte();
+	rifle_scope = !ReadByte();
 
 	serverflags = ReadByte();
 
@@ -1290,22 +1313,6 @@ void Net_ReadPingPLReport()
 	playerslots[e].ping_movementloss = ml / 255.0;
 }
 
-void Net_VoteDialog(float highlight) {
-	if(highlight) {
-		vote_highlighted = ReadByte();
-		return;
-	}
-
-	vote_yescount = ReadByte();
-	vote_nocount = ReadByte();
-	vote_needed = ReadByte();
-	vote_active = 1;
-}
-
-void Net_VoteDialogReset() {
-	vote_active = 0;
-}
-
 void Net_Notify() {
 	float type;
 	type = ReadByte();
@@ -1375,14 +1382,6 @@ float CSQC_Parse_TempEntity()
 			Net_TeamNagger();
 			bHandled = true;
 			break;
-		case TE_CSQC_VOTE:
-			Net_VoteDialog(ReadByte());
-			bHandled = true;
-			break;
-		case TE_CSQC_VOTERESET:
-			Net_VoteDialogReset();
-			bHandled = true;
-			break;
 		case TE_CSQC_LIGHTNINGARC:
 			Net_ReadLightningarc();
 			bHandled = true;
@@ -1403,6 +1402,10 @@ float CSQC_Parse_TempEntity()
 			Net_WeaponComplain();
 			bHandled = true;
 			break;
+        case TE_CSQC_VEHICLESETUP:
+            Net_VehicleSetup();
+            bHandled = true;
+            break;
 		default:
 			// No special logic for this temporary entity; return 0 so the engine can handle it
 			bHandled = false;