Header includes cleanup + more std::format

Author: rafalh

game_patch/bmpman/bmpman.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cassert>
 #include <xlog/xlog.h>
 #include "../rf/bmpman.h"
 #include "../rf/gr/gr.h"

game_patch/graphics/d3d11/gr_d3d11_texture.cpp

@@ -1,4 +1,5 @@
 #include <cstring>
+#include <cassert>
 #include "gr_d3d11.h"
 #include "gr_d3d11_texture.h"
 #include "../../bmpman/bmpman.h"

game_patch/graphics/gr.cpp

@@ -1,6 +1,5 @@
 #include <algorithm>
 #include <common/error/d3d-error.h>
-#include <common/utils/string-utils.h>
 #include <common/utils/list-utils.h>
 #include <common/utils/os-utils.h>
 #include <common/config/BuildConfig.h>

game_patch/hud/hud_status.cpp

@@ -8,6 +8,7 @@
 #include "../rf/localize.h"
 #include <patch_common/FunHook.h>
 #include <patch_common/MemUtils.h>
+#include <algorithm>
 
 bool g_big_health_armor_hud = false;
 

game_patch/misc/player.cpp

@@ -13,7 +13,6 @@
 #include "../multi/multi.h"
 #include "../hud/multi_spectate.h"
 #include <common/utils/list-utils.h>
-#include <common/utils/string-utils.h>
 #include <common/config/GameConfig.h>
 #include <patch_common/FunHook.h>
 #include <patch_common/CallHook.h>

game_patch/misc/ui.cpp

@@ -3,6 +3,7 @@
 #include <patch_common/FunHook.h>
 #include <patch_common/CallHook.h>
 #include <format>
+#include <algorithm>
 #include "../rf/ui.h"
 #include "../rf/input.h"
 #include "../rf/misc.h"

game_patch/multi/faction_files.cpp

@@ -6,7 +6,6 @@
 #include <functional>
 #include <stdexcept>
 #include <xlog/xlog.h>
-#include <common/utils/string-utils.h>
 #include "faction_files.h"
 
 static const char level_download_agent_name[] = "Dash Faction";
@@ -55,7 +54,7 @@ std::optional<FactionFilesClient::LevelInfo> FactionFilesClient::parse_level_inf
 
 std::optional<FactionFilesClient::LevelInfo> FactionFilesClient::find_map(const char* file_name)
 {
-    auto url = std::string{level_download_base_url} + "/findmap.php?rflName=" + encode_uri_component(file_name);
+    auto url = std::format("{}/findmap.php?rflName={}", level_download_base_url, encode_uri_component(file_name));
 
     xlog::trace("Fetching level info: %s", file_name);
     HttpRequest req{url, "GET", session_};

game_patch/multi/level_download.cpp

@@ -549,15 +549,15 @@ void multi_level_download_do_frame()
         unsigned bytes_received = operation.get_bytes_received();
         float bytes_per_sec = operation.get_bytes_per_sec();
 
-        auto level_name_str = std::string{"Level name: "} + info.name;
+        auto level_name_str = std::format("Level name: {}", info.name);
         int str_w, str_h;
         rf::gr::get_string_size(&str_w, &str_h, level_name_str.c_str(), -1, medium_font);
         int info_x = center_x - str_w / 2;
         int info_spacing = medium_font_h * 3 / 2;
         rf::gr::string(info_x, y, level_name_str.c_str(), medium_font);
         y += info_spacing;
 
-        auto created_by_str = std::string{"Created by: "} + info.author;
+        auto created_by_str = std::format("Created by: {}", info.author);
         rf::gr::string(info_x, y, created_by_str.c_str(), medium_font);
         y += info_spacing;
 
@@ -570,7 +570,7 @@ void multi_level_download_do_frame()
         if (bytes_per_sec > 0) {
             int remaining_size = info.size_in_bytes - bytes_received;
             int secs_left = static_cast<int>(remaining_size / bytes_per_sec);
-            auto time_left_str = std::to_string(secs_left) + " seconds left";
+            auto time_left_str = std::format("{} seconds left", secs_left);
             rf::gr::string(info_x, y, time_left_str.c_str(), medium_font);
         }
 

game_patch/multi/votes.cpp

@@ -245,7 +245,7 @@ struct VoteLevel : public Vote
 
     bool process_vote_arg([[maybe_unused]] std::string_view arg, rf::Player* source) override
     {
-        m_level_name = std::string{arg} + ".rfl";
+        m_level_name = std::format("{}.rfl", arg);
         if (!rf::get_file_checksum(m_level_name.c_str())) {
             send_chat_line_packet("Cannot find specified level!", source);
             return false;

game_patch/purefaction/pf.cpp

@@ -1,6 +1,5 @@
 #include <cstddef>
 #include <cstring>
-#include <sstream>
 #include <cassert>
 #include <common/config/BuildConfig.h>
 #include <common/utils/list-utils.h>

game_patch/rf/os/console.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include <common/utils/string-utils.h>
 #include <patch_common/MemUtils.h>
 #include <memory>
-#include <common/utils/string-utils.h>
 #include "string.h" // NOLINT(modernize-deprecated-headers)
 #include "../gr/gr.h"
 

game_patch/rf/os/string.h

@@ -3,7 +3,6 @@
 #include <cstring>
 #include <format>
 #include <utility>
-#include <common/utils/string-utils.h>
 
 namespace rf
 {

launcher/stdafx.h

@@ -19,5 +19,4 @@
 #include <string>
 #include <set>
 #include <vector>
-#include <sstream>
 #include <thread>