And now we can remove the legacy shit

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 94626f26d566a62cffb6290ee05a5387956ad551..ff3614e24efcd3680c3f2af168ea9f82423281ba 100644 (file)
--- 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 6f50a08a5586404152917203bd874a3ea1e1a398..a3fc83367e5dbb866fa31c6e457c3b84a0a103ff 100644 (file)
--- 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 ba1ea6896694eaec89c0d12db36465e78ebe50c4..19b782ff75e4d3b7c0333c0422f8e8c51b22ef9b 100644 (file)
--- 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 0ab52d6c74cb0ebb623eabf81c77932ecde47e19..69949bafa9432ca2f65ec7095af0909c902741af 100644 (file)
--- 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