Add a spawned player count to the scoreboard

docs/CHANGELOG.md

@@ -44,17 +44,19 @@ Version 1.9.0 (not released yet)
 [@GooberRF](https://github.com/GooberRF)
 - Fix crash when `verify_level` command is run without a level being loaded
 - Fix cockpit not rendering for any jeeps after the first one entered each level load
+- Add current server player count to scoreboard
 - Add `server_password` command
 - Add `$DF CTF Flag Return Time` option in dedicated server config
 - Add mod name to main menu
 - Make value of `spectate_mode_minimal_ui` persist between game launches
 - Add `version` command
 
 [@is-this-c](https://github.com/is-this-c)
-- Support `©` in TrueType fonts
+- Support `©` and `•` in TrueType fonts
 - Improve frag message format
 - Search command descriptions in `.` command
 - Improve PF network protocol compatibility
+- Add a spawned player count to the scoreboard
 
 [@Mystyle-48](https://github.com/Mystyle-48)
 - Simplify installation detection in setup and launcher

game_patch/graphics/gr_font.cpp

@@ -250,6 +250,7 @@ GrNewFont::GrNewFont(std::string_view name) :
     static std::pair<int, int> win_1252_char_ranges[]{
         {0x20, 0x7E},
         {0x8C, 0x8C},
+        {0x95, 0x95},
         {0x99, 0x99},
         {0x9C, 0x9C},
         {0x9F, 0x9F},

game_patch/hud/multi_scoreboard.cpp

@@ -53,14 +53,13 @@ int draw_scoreboard_header(int x, int y, int w, rf::NetGameType game_type, bool
 
     // Draw Game Type name
     if (!dry_run) {
-        const char* game_type_name;
-        if (game_type == rf::NG_TYPE_DM)
-            game_type_name = rf::strings::deathmatch;
-        else if (game_type == rf::NG_TYPE_CTF)
-            game_type_name = rf::strings::capture_the_flag;
-        else
-            game_type_name = rf::strings::team_deathmatch;
-        rf::gr::string_aligned(rf::gr::ALIGN_CENTER, x_center, cur_y, game_type_name);
+        const std::string game_info = std::format(
+            "{} \x95 {}/{} PLAYING",
+            rf::multi_game_type_name(game_type),
+            rf::multi_num_spawned_players(),
+            rf::multi_num_players()
+        );
+        rf::gr::string_aligned(rf::gr::ALIGN_CENTER, x_center, cur_y, game_info.c_str());
     }
     int font_h = rf::gr::get_font_height(-1);
     cur_y += font_h + 8;

game_patch/rf/multi.h

@@ -1,10 +1,14 @@
 #pragma once
 
+#include <algorithm>
 #include <patch_common/MemUtils.h>
+#include "localize.h"
+#include "player/player.h"
 #include "os/vtypes.h"
 #include "os/timestamp.h"
 #include "os/string.h"
 #include "os/array.h"
+#include <common/utils/list-utils.h>
 
 namespace rf
 {
@@ -88,6 +92,16 @@ namespace rf
         NG_TYPE_TEAMDM = 2,
     };
 
+    inline std::string_view multi_game_type_name(const NetGameType game_type) {
+        if (game_type == NG_TYPE_DM) {
+            return std::string_view{strings::deathmatch};
+        } else if (game_type == NG_TYPE_CTF) {
+            return std::string_view{strings::capture_the_flag};
+        } else {
+            return std::string_view{strings::team_deathmatch};
+        }
+    };
+
     enum NetGameFlags
     {
         NG_FLAG_DEBUG_SCOREBOARD = 0x1,
@@ -151,6 +165,10 @@ namespace rf
     static auto& multi_tdm_get_red_team_score = addr_as_ref<int()>(0x004828F0); // returns ubyte in vanilla game
     static auto& multi_tdm_get_blue_team_score = addr_as_ref<int()>(0x00482900); // returns ubyte in vanilla game
     static auto& multi_num_players = addr_as_ref<int()>(0x00484830);
+    [[nodiscard]] inline int32_t multi_num_spawned_players() {
+        const auto f = [] (auto& p) { return !player_is_dead(&p) && !player_is_dying(&p); };
+        return std::ranges::count_if(SinglyLinkedList{player_list}, f);
+    }
     static auto& multi_kick_player = addr_as_ref<void(Player *player)>(0x0047BF00);
     static auto& multi_ban_ip = addr_as_ref<void(const NetAddr& addr)>(0x0046D0F0);
     static auto& multi_set_next_weapon = addr_as_ref<void(int weapon_type)>(0x0047FCA0);