Add a spawned player count to the scoreboard (#316)

* Add player count to scoreboard in all gamemodes

* replace "WITH" with pipe

* Add spawned players to the scoreboard

* Update CHANGELOG.md

* Update gr_font.cpp

* Update multi_scoreboard.cpp

* Update multi.h

* Update multi_scoreboard.cpp

* Update multi.h

* Update multi.{cpp,h}

* Update multi_scoreboard.cpp

* Update multi.{cpp,h}

* Inline closure

* Update multi.h

* Update multi_scoreboard.cpp

* Update multi.cpp

* Update multi.{cpp,h}

* Update multi_scoreboard.cpp

* Update multi.cpp

---------

Co-authored-by: Goober <[email protected]>
Co-authored-by: Rafał Harabień <[email protected]>

Author: 3 people

docs/CHANGELOG.md

@@ -54,6 +54,7 @@ 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
@@ -65,10 +66,11 @@ Version 1.9.0 (not released yet)
 - Remove level editor popups that stop user from navigating between modes until rebuilding
 
 [@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",
+            multi_game_type_name(game_type),
+            multi_num_alive_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/multi/multi.cpp

@@ -1,6 +1,8 @@
+#include <algorithm>
 #include <regex>
 #include <xlog/xlog.h>
 #include <winsock2.h>
+#include <common/utils/list-utils.h>
 #include <patch_common/FunHook.h>
 #include <patch_common/CodeInjection.h>
 #include <patch_common/AsmWriter.h>
@@ -14,6 +16,8 @@
 #include "../rf/os/console.h"
 #include "../rf/weapon.h"
 #include "../rf/entity.h"
+#include "../rf/player/player.h"
+#include "../rf/localize.h"
 #include "../rf/ai.h"
 #include "../rf/item.h"
 
@@ -332,6 +336,28 @@ void multi_init_player(rf::Player* player)
     multi_kill_init_player(player);
 }
 
+std::string_view multi_game_type_name(const rf::NetGameType game_type) {
+    if (game_type == rf::NG_TYPE_DM) {
+        return std::string_view{rf::strings::deathmatch};
+    } else if (game_type == rf::NG_TYPE_CTF) {
+        return std::string_view{rf::strings::capture_the_flag};
+    } else {
+        if (game_type != rf::NG_TYPE_TEAMDM) {
+            xlog::warn(
+                "`multi_game_type_name`: {} is an invalid `NetGameType`",
+                static_cast<int>(game_type)
+            );
+        }
+        return std::string_view{rf::strings::team_deathmatch};
+    }
+};
+
+int multi_num_alive_players() {
+    return std::ranges::count_if(SinglyLinkedList{rf::player_list}, [] (const auto& p) {
+        return !rf::player_is_dead(&p) && !rf::player_is_dying(&p);
+    });
+}
+
 void multi_do_patch()
 {
     multi_limbo_init.install();

game_patch/multi/multi.h

@@ -2,6 +2,7 @@
 
 #include <optional>
 #include "../rf/player/player.h"
+#include "../rf/multi.h"
 
 struct PlayerStatsNew : rf::PlayerLevelStats
 {
@@ -90,3 +91,5 @@ void multi_level_download_do_frame();
 void multi_level_download_abort();
 void multi_ban_apply_patch();
 std::optional<std::string> multi_ban_unban_last();
+std::string_view multi_game_type_name(rf::NetGameType game_type);
+[[nodiscard]] int multi_num_alive_players();

game_patch/rf/player/player.h

@@ -163,8 +163,8 @@ namespace rf
     static auto& local_player = addr_as_ref<Player*>(0x007C75D4);
 
     static auto& player_from_entity_handle = addr_as_ref<Player*(int entity_handle)>(0x004A3740);
-    static auto& player_is_dead = addr_as_ref<bool(Player *player)>(0x004A4920);
-    static auto& player_is_dying = addr_as_ref<bool(Player *player)>(0x004A4940);
+    static auto& player_is_dead = addr_as_ref<bool(const Player *player)>(0x004A4920);
+    static auto& player_is_dying = addr_as_ref<bool(const Player *player)>(0x004A4940);
     static auto& player_add_score = addr_as_ref<void(Player *player, int delta)>(0x004A7460);
     static auto& player_get_ai = addr_as_ref<AiInfo*(Player *player)>(0x004A3260);
     static auto& player_get_weapon_total_ammo = addr_as_ref<int(Player *player, int weapon_type)>(0x004A3280);