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 bac1fdaef9c2719bf3c0438f6f5af51e1aeec43a..506c37eda80390f1fe25372148cebc869df504aa 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -848,6 +848,13 @@ void Ent_Nagger()
 
        nags = ReadByte();
 
+       if(!(nags & 4))
+       {
+               if(vote_called_vote)
+                       strunzone(vote_called_vote);
+               vote_called_vote = string_null;
+       }
+
        if(nags & 128)
        {
                if(vote_called_vote)
@@ -1095,7 +1102,7 @@ void Ent_Init()
        g_balance_electro_secondary_bouncestop = ReadCoord();
 
        nex_scope = !ReadByte();
-       sniperrifle_scope = !ReadByte();
+       rifle_scope = !ReadByte();
 
        serverflags = ReadByte();
 
@@ -1318,6 +1325,16 @@ void Net_Notify() {
        {
                HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
        }
+       else if(type == CSQC_CENTERPRINT_GENERIC)
+       {
+                                                               //      id                      string          time    countdown_num
+               float id;
+               id = ReadByte();
+               if (id == 0)
+                       centerprint_generic(id, ReadString(), 0, 0);
+               else
+                       centerprint_generic(id, ReadString(), ReadByte(), ReadByte());
+       }
 }
 
 void Net_WeaponComplain() {