Merge pull request #1327 from drzel/flag-pickup-notification

Remove flag pickup notification when flag thrown

Author: drzel

csqc/events.qc

@@ -359,6 +359,9 @@ void() CSQC_Parse_Event = {
             flag_team = readfloat();
             pick_up_time = time;
             break;
+        case MSG_FLAG_DROP:
+            pick_up_time = FALSE;
+            break;
     }
 }
 

share/commondefs.qc

@@ -214,6 +214,7 @@ const float SERVER_FRAME_MS = SERVER_FRAME_DT * 1000.0;
 #define MSG_HITFLAG         27
 #define MSG_RELOADSOUND     28
 #define MSG_FLAG_PICKUP     29
+#define MSG_FLAG_DROP       30
 
 #define FLAGINFO_HOME       1
 #define FLAGINFO_CARRIED    2

ssqc/status.qc

@@ -975,6 +975,16 @@ void (entity pl, float flag_team) UpdateClientFlagPickUp = {
     multicast('0 0 0', MULTICAST_ONE_NOSPECS);
 }
 
+void (entity pl) UpdateClientFlagDrop = {
+    if(!infokeyf(pl, INFOKEY_P_CSQCACTIVE))
+        return;
+
+    msg_entity = pl;
+    WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
+    WriteByte(MSG_MULTICAST, MSG_FLAG_DROP);
+    multicast('0 0 0', MULTICAST_ONE_NOSPECS);
+}
+
 void (entity pl) RefreshStatusBar = {
     local string pad;
     local string s1 = ""; // will be used for grenade timers

ssqc/tfortmap.qc

@@ -3003,4 +3003,6 @@ void () DropGoalItems = {
                 break;
         }
     }
+
+    UpdateClientFlagDrop(self);
 };