Remove unnecessary c_str() calls

game_patch/debug/obj_debug.cpp

@@ -79,7 +79,7 @@ ConsoleCommand2 dbg_target_uid_cmd{
         }
         rf::Object* obj = rf::obj_from_handle(rf::target_obj_handle);
         if (obj)
-            rf::console::print("Target object: uid {}, name '{}'", obj->uid, obj->name.c_str());
+            rf::console::print("Target object: uid {}, name '{}'", obj->uid, obj->name);
         else
             rf::console::print("Target object not found");
     },
@@ -91,7 +91,7 @@ ConsoleCommand2 dbg_target_closest_cmd{
         rf::Object* obj = find_closest_object();
         rf::target_obj_handle = obj ? obj->handle : 0;
         if (obj)
-            rf::console::print("Target object: uid {}, name '{}'", obj->uid, obj->name.c_str());
+            rf::console::print("Target object: uid {}, name '{}'", obj->uid, obj->name);
         else
             rf::console::print("Target object not found");
     },
@@ -103,7 +103,7 @@ ConsoleCommand2 dbg_target_reticle_cmd{
         rf::Object* obj = find_object_in_reticle();
         rf::target_obj_handle = obj ? obj->handle : 0;
         if (obj)
-            rf::console::print("Target object: uid {}, name '{}'", obj->uid, obj->name.c_str());
+            rf::console::print("Target object: uid {}, name '{}'", obj->uid, obj->name);
         else
             rf::console::print("Target object not found");
     },

game_patch/misc/vpackfile.cpp

@@ -174,7 +174,7 @@ static int vpackfile_add_new(const char* filename, const char* dir)
     }
 #endif // CHECK_PACKFILE_CHECKSUM
 
-    std::ifstream file(full_path.c_str(), std::ios_base::in | std::ios_base::binary);
+    std::ifstream file(full_path, std::ios_base::in | std::ios_base::binary);
     if (!file) {
         xlog::error("Failed to open packfile {}", full_path);
         return 0;

game_patch/multi/kill.cpp

@@ -63,18 +63,16 @@ void print_kill_message(rf::Player* killed_player, rf::Player* killer_player)
         else {
             mui_msg = null_to_empty(rf::strings::you_were_killed_by);
 
-            const char* weapon_name = nullptr;
+            auto& killer_name = killer_player->name;
             int killer_weapon_cls_id = killer_entity ? killer_entity->ai.current_primary_weapon : -1;
             if (killer_weapon_cls_id >= 0 && killer_weapon_cls_id < 64) {
                 auto& weapon_cls = rf::weapon_types[killer_weapon_cls_id];
-                weapon_name = weapon_cls.display_name.c_str();
-            }
-
-            const char* killer_name = killer_player->name.c_str();
-            if (weapon_name)
+                auto& weapon_name = weapon_cls.display_name;
                 msg = rf::String::format("{}{} ({})!", mui_msg, killer_name, weapon_name);
-            else
+            }
+            else {
                 msg = rf::String::format("{}{}!", mui_msg, killer_name);
+            }
         }
     }
     else if (killer_player == rf::local_player) {

game_patch/multi/level_download.cpp

@@ -280,11 +280,11 @@ class LevelDownloadOperation
     std::unique_ptr<Listener> listener_;
 
 public:
-    LevelDownloadOperation(const char* level_filename, std::unique_ptr<Listener>&& listener) :
+    LevelDownloadOperation(std::string level_filename, std::unique_ptr<Listener>&& listener) :
         listener_(std::move(listener))
     {
         shared_data_ = std::make_shared<LevelDownloadWorker::SharedData>();
-        future_ = std::async(std::launch::async, LevelDownloadWorker{level_filename, shared_data_});
+        future_ = std::async(std::launch::async, LevelDownloadWorker{std::move(level_filename), shared_data_});
     }
 
     ~LevelDownloadOperation()
@@ -391,10 +391,10 @@ class LevelDownloadManager
         }
     }
 
-    LevelDownloadOperation& start(const char* level_filename, std::unique_ptr<LevelDownloadOperation::Listener>&& listener)
+    LevelDownloadOperation& start(std::string level_filename, std::unique_ptr<LevelDownloadOperation::Listener>&& listener)
     {
         xlog::info("Starting level download: {}", level_filename);
-        return operation_.emplace(level_filename, std::move(listener));
+        return operation_.emplace(std::move(level_filename), std::move(listener));
     }
 
     [[nodiscard]] const std::optional<LevelDownloadOperation>& get_operation() const
@@ -659,7 +659,7 @@ static void do_download_level(std::string filename, bool force)
             xlog::error("Level already exists on disk! Use download_level_force to download anyway.");
             return;
         }
-        LevelDownloadManager::instance().start(filename.c_str(),
+        LevelDownloadManager::instance().start(filename,
             std::make_unique<ConsoleReportingDownloadListener>());
     }
 }

game_patch/multi/server.cpp

@@ -223,7 +223,7 @@ std::pair<std::string_view, std::string_view> strip_by_space(std::string_view st
 void handle_next_map_command(rf::Player* player)
 {
     int next_idx = (rf::netgame.current_level_index + 1) % rf::netgame.levels.size();
-    auto msg = std::format("Next level: {}", rf::netgame.levels[next_idx].c_str());
+    auto msg = std::format("Next level: {}", rf::netgame.levels[next_idx]);
     send_chat_line_packet(msg.c_str(), player);
 }
 

game_patch/rf/os/string.h

@@ -51,6 +51,11 @@ namespace rf
             return c_str();
         }
 
+        operator std::string() const
+        {
+            return {c_str()};
+        }
+
         operator Pod() const
         {
             // Make a copy

launcher_common/PatchedAppLauncher.cpp

@@ -122,7 +122,7 @@ void PatchedAppLauncher::verify_before_launch()
 {
     std::string app_path = get_app_path();
     xlog::info("Verifying {} SHA1", app_path);
-    std::ifstream file(app_path.c_str(), std::fstream::in | std::fstream::binary);
+    std::ifstream file(app_path, std::fstream::in | std::fstream::binary);
     if (!file.is_open()) {
         throw FileNotFoundException(app_path);
     }
@@ -209,7 +209,7 @@ void PatchedAppLauncher::check_installation()
     std::string root_dir = get_dir_from_path(app_path);
 
     auto tables_vpp_path = root_dir + "\\tables.vpp";
-    std::ifstream file(tables_vpp_path.c_str(), std::fstream::in | std::fstream::binary);
+    std::ifstream file(tables_vpp_path, std::fstream::in | std::fstream::binary);
     if (!file.is_open()) {
         throw FileNotFoundException("tables.vpp");
     }