From 1e0a84a969382dd22ba65a6ea22d8c8806337135 Mon Sep 17 00:00:00 2001 From: Goober Date: Mon, 16 Sep 2024 16:03:11 -0230 Subject: [PATCH 1/2] Add player count to scoreboard in all gamemodes --- docs/CHANGELOG.md | 1 + game_patch/hud/multi_scoreboard.cpp | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1c2cb258..97e048e8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -43,6 +43,7 @@ Version 1.9.0 (not released yet) - Do not load unnecessary VPPs in dedicated server mode - Add level filename to "Level Initializing" console message - Properly handle WM_PAINT in dedicated server, may improve performance (DF bug) +- Add current server player count to scoreboard Version 1.8.0 (released 2022-09-17) ----------------------------------- diff --git a/game_patch/hud/multi_scoreboard.cpp b/game_patch/hud/multi_scoreboard.cpp index 67342b0b..fa4738f5 100644 --- a/game_patch/hud/multi_scoreboard.cpp +++ b/game_patch/hud/multi_scoreboard.cpp @@ -52,14 +52,17 @@ 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); + int num_players = rf::multi_num_players(); + std::string player_count_str = + " WITH " + std::to_string(num_players) + (num_players > 1 ? " PLAYERS" : " PLAYER"); + + std::string game_type_name = (game_type == rf::NG_TYPE_DM) ? rf::strings::deathmatch + : (game_type == rf::NG_TYPE_CTF) ? rf::strings::capture_the_flag + : rf::strings::team_deathmatch; + + game_type_name += player_count_str; + + rf::gr::string_aligned(rf::gr::ALIGN_CENTER, x_center, cur_y, game_type_name.c_str()); } int font_h = rf::gr::get_font_height(-1); cur_y += font_h + 8; From d1deb7425acbf41c98b9c81909db5a2b4a8921c9 Mon Sep 17 00:00:00 2001 From: Goober Date: Tue, 17 Sep 2024 10:59:57 -0230 Subject: [PATCH 2/2] replace "WITH" with pipe --- game_patch/hud/multi_scoreboard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_patch/hud/multi_scoreboard.cpp b/game_patch/hud/multi_scoreboard.cpp index c9ab001d..84804a68 100644 --- a/game_patch/hud/multi_scoreboard.cpp +++ b/game_patch/hud/multi_scoreboard.cpp @@ -55,7 +55,7 @@ int draw_scoreboard_header(int x, int y, int w, rf::NetGameType game_type, bool if (!dry_run) { int num_players = rf::multi_num_players(); std::string player_count_str = - " WITH " + std::to_string(num_players) + (num_players > 1 ? " PLAYERS" : " PLAYER"); + " | " + std::to_string(num_players) + (num_players > 1 ? " PLAYERS" : " PLAYER"); std::string game_type_name = (game_type == rf::NG_TYPE_DM) ? rf::strings::deathmatch : (game_type == rf::NG_TYPE_CTF) ? rf::strings::capture_the_flag