Merge branch 'master' into terencehill/centerprint_stuff

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index fb9a1bb74db3e4725911dacbbd8d50327579b1fb..6d90e1080363324f89edd644f2f4d20ad1c1ebee 100644 (file)
--- 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;
@@ -1330,6 +1328,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() {