Support milestones in multiplayer

Additionally, some reformatting.
MrAlaux · Mar 29, 2024 · 7234f47 · 7234f47
1 parent bf2f5ba
commit 7234f47
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 ## Changes
 
-None.
+- **Support for _Milestone Completion Announcements_ in multiplayer**
 
 ## Bug Fixes
 

diff --git a/src/p_inter.c b/src/p_inter.c
@@ -687,16 +687,28 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
       return;      // killough 12/98: suppress error message
     }
 
-  if (special->flags & MF_COUNTITEM) {
+  if (special->flags & MF_COUNTITEM)
+  {
     player->itemcount++;
+
     // [Nugget] Announce milestone completion
-    if (!(complete_milestones & MILESTONE_ITEMS)
-        && (player->itemcount >= totalitems))
+    if (!(complete_milestones & MILESTONE_ITEMS))
     {
-      complete_milestones |= MILESTONE_ITEMS;
-      if (announce_milestones) {
-        player->secretmessage = "All items acquired!";
-        S_StartSound(NULL, sfx_secret);
+      int itemcount = 0;
+
+      for (int pl = 0;  pl < MAXPLAYERS;  ++pl) {
+        if (playeringame[pl])
+        { itemcount += players[pl].itemcount; }
+      }
+
+      if (itemcount >= totalitems)
+      {
+        complete_milestones |= MILESTONE_ITEMS;
+
+        if (announce_milestones) {
+          players[displayplayer].secretmessage = "All items acquired!";
+          S_StartSound(NULL, sfx_secret);
+        }
       }
     }
   }
@@ -864,13 +876,23 @@ static void P_KillMobj(mobj_t *source, mobj_t *target, method_t mod)
 #endif
 
   // [Nugget] Announce milestone completion
-  if (!(complete_milestones & MILESTONE_KILLS)
-      && ((players->killcount - players->maxkilldiscount) >= max_kill_requirement))
+  if (!(complete_milestones & MILESTONE_KILLS))
   {
-    complete_milestones |= MILESTONE_KILLS;
-    if (announce_milestones) {
-      players->secretmessage = "All enemies killed!";
-      S_StartSound(NULL, sfx_secret);
+    int killcount = 0;
+
+    for (int pl = 0;  pl < MAXPLAYERS;  ++pl) {
+      if (playeringame[pl])
+      { killcount += players[pl].killcount - players[pl].maxkilldiscount; }
+    }
+
+    if (killcount >= max_kill_requirement)
+    {
+      complete_milestones |= MILESTONE_KILLS;
+
+      if (announce_milestones) {
+        players[displayplayer].secretmessage = "All enemies killed!";
+        S_StartSound(NULL, sfx_secret);
+      }
     }
   }
 

diff --git a/src/p_setup.c b/src/p_setup.c
@@ -458,12 +458,16 @@ void P_LoadThings (int lump)
       P_SpawnMapThing (mt);
     }
 
-  // [Nugget] Reset milestones
+  // [Nugget] Reset milestones / ---------------------------------------------
+
   if (totalkills) { complete_milestones &= ~MILESTONE_KILLS; }
   else            { complete_milestones |=  MILESTONE_KILLS; }
+
   if (totalitems) { complete_milestones &= ~MILESTONE_ITEMS; }
   else            { complete_milestones |=  MILESTONE_ITEMS; }
 
+  // [Nugget] ---------------------------------------------------------------/
+
   Z_Free (data);
 }
 

diff --git a/src/p_spec.c b/src/p_spec.c
@@ -2161,28 +2161,36 @@ int disable_nuke;  // killough 12/98: nukage disabling cheat
 
 static void P_SecretRevealed(player_t *player)
 {
-  if (player == &players[consoleplayer])
+  // [Nugget] Announce milestone completion
+  if (!(complete_milestones & MILESTONE_SECRETS))
   {
-    // [Nugget] Announce milestone completion
-    if (!(complete_milestones & MILESTONE_SECRETS)
-        && player->secretcount >= totalsecret)
+    int secretcount = 0;
+
+    for (int pl = 0;  pl < MAXPLAYERS;  ++pl) {
+      if (playeringame[pl])
+      { secretcount += players[pl].secretcount; }
+    }
+
+    if (secretcount >= totalsecret)
     {
       complete_milestones |= MILESTONE_SECRETS;
+
       if (announce_milestones) {
-        player->secretmessage = "All secrets revealed!";
+        players[displayplayer].secretmessage = "All secrets revealed!";
         S_StartSound(NULL, sfx_secret);
         return; // Skip the normal "Secret revealed" message
       }
     }
+  }
 
-    if (hud_secret_message) {
-      // [Nugget] Secret count in secret revealed message, from Crispy Doom
-      static char str_count[32];
-      M_snprintf(str_count, sizeof(str_count), "Secret %d of %d revealed!", player->secretcount, totalsecret);
+  if (hud_secret_message && player == &players[consoleplayer])
+  {
+    // [Nugget] Secret count in secret revealed message, from Crispy Doom
+    static char str_count[32];
+    M_snprintf(str_count, sizeof(str_count), "Secret %d of %d revealed!", player->secretcount, totalsecret);
 
-      player->secretmessage = (hud_secret_message == secretmessage_count) ? str_count : s_HUSTR_SECRETFOUND;
-      S_StartSound(NULL, sfx_secret);
-    }
+    player->secretmessage = (hud_secret_message == secretmessage_count) ? str_count : s_HUSTR_SECRETFOUND;
+    S_StartSound(NULL, sfx_secret);
   }
 }