Merge branch 'build-better' into staging

FortressOne · Apr 30, 2024 · 95cd841 · 95cd841
2 parents 08fd6ff + 0d1785d
commit 95cd841
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
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_BUILDING:
+            SentryPreviewStop();
+            break;
     }
 }
 

diff --git a/share/commondefs.qc b/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_BUILDING        30
 
 #define FLAGINFO_HOME       1
 #define FLAGINFO_CARRIED    2

diff --git a/ssqc/engineer.qc b/ssqc/engineer.qc
@@ -615,6 +615,8 @@ void (float objtobuild, float offset) TeamFortress_Build = {
             return;
         }
     }
+
+    UpdateClientBuilding(self);
     self.is_building = 1;
     if (!engineer_move) {
         self.immune_to_check = time + 5;

diff --git a/ssqc/status.qc b/ssqc/status.qc
@@ -757,6 +757,16 @@ string GetSBClassInfo(entity pl, float csqcactive)
     return st1;
 }
 
+void UpdateClientBuilding(entity pl) {
+    if(!infokeyf(pl, INFOKEY_P_CSQCACTIVE))
+        return;
+
+    msg_entity = pl;
+    WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
+    WriteByte(MSG_MULTICAST, MSG_BUILDING);
+    multicast('0 0 0', MULTICAST_ONE_NOSPECS);
+}
+
 void UpdateClientReloadSound(entity pl, float weapon) {
     if(!infokeyf(pl, INFOKEY_P_CSQCACTIVE))
         return;