From: Samual Lenks <samual@xonotic.org>
Date: Sun, 3 Mar 2013 01:01:07 +0000 (-0500)
Subject: And now we can remove the legacy shit
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f1935c7e3b9fab12d142cb10b9f153d8e770aed2;p=xonotic%2Fxonotic-data.pk3dir.git

And now we can remove the legacy shit
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 94626f26d..ff3614e24 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1205,17 +1205,6 @@ float CSQC_Parse_TempEntity()
 			Announcer_Play(ReadString());
 			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:
 			Net_WeaponComplain();
 			bHandled = true;
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 6f50a08a5..a3fc83367 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -36,15 +36,14 @@ const float TE_CSQC_NEXGUNBEAMPARTICLE = 104;
 const float TE_CSQC_LIGHTNINGARC = 105;
 const float TE_CSQC_TEAMNAGGER = 106;
 const float TE_CSQC_PINGPLREPORT = 107;
-const float TE_CSQC_ANNOUNCE = 110;
-const float TE_CSQC_TARGET_MUSIC = 111;
-const float TE_CSQC_CENTERPRINT_GENERIC = 112;
-const float TE_CSQC_WEAPONCOMPLAIN = 113;
-const float TE_CSQC_NEX_SCOPE = 114;
-const float TE_CSQC_MINELAYER_MAXMINES = 115;
-const float TE_CSQC_HAGAR_MAXROCKETS = 116;
-const float TE_CSQC_VEHICLESETUP = 117;
-const float TE_CSQC_SVNOTICE = 118;
+const float TE_CSQC_ANNOUNCE = 108;
+const float TE_CSQC_TARGET_MUSIC = 109;
+const float TE_CSQC_WEAPONCOMPLAIN = 110;
+const float TE_CSQC_NEX_SCOPE = 111;
+const float TE_CSQC_MINELAYER_MAXMINES = 112;
+const float TE_CSQC_HAGAR_MAXROCKETS = 113;
+const float TE_CSQC_VEHICLESETUP = 114;
+const float TE_CSQC_SVNOTICE = 115;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index ba1ea6896..19b782ff7 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1397,28 +1397,4 @@ void Send_Notification_WOVA(
 	#undef VARITEM
 	Send_Notification(broadcast, client, net_type, net_name); // some notifications don't have any arguments at all
 }
-
-
-// =============================
-//  LEGACY NOTIFICATION SYSTEMS
-// =============================
-
-void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, float countdown_num)
-{
-	if ((clienttype(e) == CLIENTTYPE_REAL) && (e.flags & FL_CLIENT))
-	{
-		msg_entity = e;
-		WRITESPECTATABLE_MSG_ONE({
-			WriteByte(MSG_ONE, SVC_TEMPENTITY);
-			WriteByte(MSG_ONE, TE_CSQC_CENTERPRINT_GENERIC);
-			WriteByte(MSG_ONE, id);
-			WriteString(MSG_ONE, s);
-			if (id != 0 && s != "")
-			{
-				WriteByte(MSG_ONE, duration);
-				WriteByte(MSG_ONE, countdown_num);
-			}
-		});
-	}
-}
 #endif // ifdef SVQC
diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 0ab52d6c7..69949bafa 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -94,10 +94,6 @@ void Send_Notification_WOVA(
 	float net_type, float net_name,
 	string s1, string s2, string s3, string s4,
 	float f1, float f2, float f3, float f4);
-
-// legacy stuff
-void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, float countdown_num);
-#define Send_CSQC_Centerprint_Generic_Expire(e,id) Send_CSQC_Centerprint_Generic(e, id, "", 1, 0)
 #endif