X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=f5dfec4e4a12f09649e3ff800e48c8cd732ff901;hb=d8102a4b1f5ddbaa66ea65195a8fff0c90e15529;hp=92c647c19e590bcc5e8445d9fbc1b5bef08bace3;hpb=201e09e1605d9e40ab9c40943ebc2f1bbf20f9b0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 92c647c19..f5dfec4e4 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -140,6 +140,7 @@ void CSQC_Init(void)
 	Casings_Precache();
 	DamageInfo_Precache();
 	Vehicles_Precache();
+	turrets_precache();
 
 	if(autocvar_cl_announcer != cl_announcer_prev) {
 		Announcer_Precache();
@@ -826,8 +827,6 @@ void Ent_ClientData()
 
 	if(newspectatee_status != spectatee_status)
 	{
-		float i;
-
 		// clear race stuff
 		race_laptime = 0;
 		race_checkpointtime = 0;
@@ -848,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)
 	{
@@ -980,6 +999,7 @@ void(float bIsNewEntity) CSQC_Ent_Update =
 		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));
@@ -1293,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();
@@ -1321,6 +1325,17 @@ void Net_Notify() {
 	{
 		HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
 	}
+	else if(type == CSQC_CENTERPRINT_GENERIC)
+	{
+		float id;
+		string s;
+		id = ReadByte();
+		s = ReadString();
+		if (id != 0 && s != "")
+			centerprint_generic(id, s, ReadByte(), ReadByte());
+		else
+			centerprint_generic(id, s, 0, 0);
+	}
 }
 
 void Net_WeaponComplain() {
@@ -1378,14 +1393,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;