X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=606123ad1c1d2c2ba4696b3f792bc8eb05a65e89;hb=5dd9b03eecb44879adc30de6f9a3f6a8417771a9;hp=fb9a1bb74db3e4725911dacbbd8d50327579b1fb;hpb=2e44f19e0c92cf7fab9e7d21f15abda16118765b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index fb9a1bb74..606123ad1 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -827,8 +827,6 @@ void Ent_ClientData()
 
 	if(newspectatee_status != spectatee_status)
 	{
-		float i;
-
 		// clear race stuff
 		race_laptime = 0;
 		race_checkpointtime = 0;
@@ -849,13 +847,26 @@ 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)
@@ -1302,36 +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();
-
-	if(type == CSQC_KILLNOTIFY)
-	{
-		HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
-	}
-	else if(type == CSQC_CENTERPRINT)
-	{
-		HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
-	}
-}
-
 void Net_WeaponComplain() {
 	complain_weapon = ReadByte();
 
@@ -1387,14 +1368,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;
@@ -1407,8 +1380,23 @@ float CSQC_Parse_TempEntity()
 			announce_snd = strzone(ReadString());
 			bHandled = true;
 			break;
-		case TE_CSQC_NOTIFY:
-			Net_Notify();
+		case TE_CSQC_KILLNOTIFY:
+			HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
+			bHandled = true;
+			break;
+		case TE_CSQC_KILLCENTERPRINT:
+			HUD_KillCenterprint(ReadString(), ReadString(), ReadShort(), ReadByte());
+			bHandled = true;
+			break;
+		case TE_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);
 			bHandled = true;
 			break;
 		case TE_CSQC_WEAPONCOMPLAIN: