Merge

FortressOne · Apr 30, 2024 · f1bb88a · f1bb88a
2 parents 95cd841 + 7d94dda
commit f1bb88a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/csqc/events.qc b/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;
         case MSG_BUILDING:
             SentryPreviewStop();
             break;

diff --git a/share/commondefs.qc b/share/commondefs.qc
@@ -214,7 +214,8 @@ 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_BUILDING        30
+#define MSG_FLAG_DROP       30
+#define MSG_BUILDING        31
 
 #define FLAGINFO_HOME       1
 #define FLAGINFO_CARRIED    2

diff --git a/ssqc/status.qc b/ssqc/status.qc
@@ -985,6 +985,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

diff --git a/ssqc/tfortmap.qc b/ssqc/tfortmap.qc
@@ -3003,4 +3003,6 @@ void () DropGoalItems = {
                 break;
         }
     }
+
+    UpdateClientFlagDrop(self);
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -3003,4 +3003,6 @@ void () DropGoalItems = { @@
                     break;
             }
         }
+        UpdateClientFlagDrop(self);
     };