mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use C++ strings over C-strings

pull/14105/head
Rubidium 2025-04-24 23:26:13 +02:00 committed by rubidium42
parent 4a09860c53
commit 498a0f1c1b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/console_cmds.cpp
View File

@ -440,8 +440,7 @@ static bool ConSave([[maybe_unused]] uint8_t argc, [[maybe_unused]] char *argv[]
} }
if (argc == 2) { if (argc == 2) {
std::string filename = argv[1]; std::string filename = fmt::format("{}.sav", argv[1]);
filename += ".sav";
IConsolePrint(CC_DEFAULT, "Saving map..."); IConsolePrint(CC_DEFAULT, "Saving map...");
if (SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, SAVE_DIR) != SL_OK) { if (SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, SAVE_DIR) != SL_OK) {
@ -481,7 +480,7 @@ static bool ConLoad([[maybe_unused]] uint8_t argc, [[maybe_unused]] char *argv[]
if (argc != 2) return false; if (argc != 2) return false;
const char *file = argv[1]; std::string_view file = argv[1];
_console_file_list_savegame.ValidateFileList(); _console_file_list_savegame.ValidateFileList();
const FiosItem *item = _console_file_list_savegame.FindItem(file); const FiosItem *item = _console_file_list_savegame.FindItem(file);
if (item != nullptr) { if (item != nullptr) {
@ -507,7 +506,7 @@ static bool ConLoadScenario([[maybe_unused]] uint8_t argc, [[maybe_unused]] char
if (argc != 2) return false; if (argc != 2) return false;
const char *file = argv[1]; std::string_view file = argv[1];
_console_file_list_scenario.ValidateFileList(); _console_file_list_scenario.ValidateFileList();
const FiosItem *item = _console_file_list_scenario.FindItem(file); const FiosItem *item = _console_file_list_scenario.FindItem(file);
if (item != nullptr) { if (item != nullptr) {
@ -533,7 +532,7 @@ static bool ConLoadHeightmap([[maybe_unused]] uint8_t argc, [[maybe_unused]] cha
if (argc != 2) return false; if (argc != 2) return false;
const char *file = argv[1]; std::string_view file = argv[1];
_console_file_list_heightmap.ValidateFileList(); _console_file_list_heightmap.ValidateFileList();
const FiosItem *item = _console_file_list_heightmap.FindItem(file); const FiosItem *item = _console_file_list_heightmap.FindItem(file);
if (item != nullptr) { if (item != nullptr) {
@ -559,7 +558,7 @@ static bool ConRemove([[maybe_unused]] uint8_t argc, [[maybe_unused]] char *argv
if (argc != 2) return false; if (argc != 2) return false;
const char *file = argv[1]; std::string_view file = argv[1];
_console_file_list_savegame.ValidateFileList(); _console_file_list_savegame.ValidateFileList();
const FiosItem *item = _console_file_list_savegame.FindItem(file); const FiosItem *item = _console_file_list_savegame.FindItem(file);
if (item != nullptr) { if (item != nullptr) {
@ -633,7 +632,7 @@ static bool ConChangeDirectory([[maybe_unused]] uint8_t argc, [[maybe_unused]] c
if (argc != 2) return false; if (argc != 2) return false;
const char *file = argv[1]; std::string_view file = argv[1];
_console_file_list_savegame.ValidateFileList(true); _console_file_list_savegame.ValidateFileList(true);
const FiosItem *item = _console_file_list_savegame.FindItem(file); const FiosItem *item = _console_file_list_savegame.FindItem(file);
if (item != nullptr) { if (item != nullptr) {
@ -1308,7 +1307,7 @@ static bool ConEcho([[maybe_unused]] uint8_t argc, [[maybe_unused]] char *argv[]
} }
if (argc < 2) return false; if (argc < 2) return false;
IConsolePrint(CC_DEFAULT, argv[1]); IConsolePrint(CC_DEFAULT, "{}", argv[1]);
return true; return true;
} }
@ -2190,7 +2189,7 @@ static bool ConNetworkAuthorizedKey([[maybe_unused]] uint8_t argc, [[maybe_unuse
#include "network/network_content.h" #include "network/network_content.h"
/** Resolve a string to a content type. */ /** Resolve a string to a content type. */
static ContentType StringToContentType(const char *str) static ContentType StringToContentType(std::string_view str)
{ {
static const std::initializer_list<std::pair<std::string_view, ContentType>> content_types = { static const std::initializer_list<std::pair<std::string_view, ContentType>> content_types = {
{"base", CONTENT_TYPE_BASE_GRAPHICS}, {"base", CONTENT_TYPE_BASE_GRAPHICS},