Use format_target for crashlog and related areas

Scope info format, version info, gamelog, setting value format, etc
JGRennison · Sep 29, 2024 · be02805 · be02805
1 parent 7e748a3
commit be02805
Show file tree

Hide file tree

Showing 35 changed files with 803 additions and 901 deletions.
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
@@ -86,7 +86,7 @@
 	Backup<CompanyID> cur_company(_current_company, FILE_LINE);
 	for (const Company *c : Company::Iterate()) {
 		if (c->is_ai) {
-			SCOPE_INFO_FMT([&], "AI::GameLoop: %i: %s (v%d)\n", (int)c->index, c->ai_info->GetName().c_str(), c->ai_info->GetVersion());
+			SCOPE_INFO_FMT([&], "AI::GameLoop: {}: {} (v{})\n", (int)c->index, c->ai_info->GetName(), c->ai_info->GetVersion());
 			PerformanceMeasurer framerate((PerformanceElement)(PFE_AI0 + c->index));
 			cur_company.Change(c->index);
 			c->ai_instance->GameLoop();

diff --git a/src/cachecheck.cpp b/src/cachecheck.cpp
@@ -101,7 +101,7 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log, CheckC
 		if (desync_level == 1 && _state_ticks.base() % 500 != 0) return;
 	}
 
-	SCOPE_INFO_FMT([flags], "CheckCaches: %X", flags);
+	SCOPE_INFO_FMT([flags], "CheckCaches: {:X}", flags);
 
 	std::vector<std::string> saved_messages;
 	std::function<void(const char *)> log_orig;

diff --git a/src/command.cpp b/src/command.cpp
@@ -851,7 +851,7 @@ struct cmd_text_info_dumper {
  */
 CommandCost DoCommandEx(TileIndex tile, uint32_t p1, uint32_t p2, uint64_t p3, DoCommandFlag flags, uint32_t cmd, const char *text, const CommandAuxiliaryBase *aux_data)
 {
-	SCOPE_INFO_FMT([=], "DoCommand: tile: %X (%d x %d), p1: 0x%X, p2: 0x%X, p3: " OTTD_PRINTFHEX64 ", flags: 0x%X, company: %s, cmd: 0x%X (%s)%s",
+	SCOPE_INFO_FMT([=], "DoCommand: tile: {:X} ({} x {}), p1: 0x{:X}, p2: 0x{:X}, p3: 0x{:X}, flags: 0x{:X}, company: {}, cmd: 0x{:X} ({}){}",
 			tile, TileX(tile), TileY(tile), p1, p2, p3, flags, scope_dumper().CompanyInfo(_current_company), cmd, GetCommandName(cmd), cmd_text_info_dumper().CommandTextInfo(text, aux_data));
 
 	CommandCost res;
@@ -971,7 +971,7 @@ static void AppendCommandLogEntry(const CommandCost &res, TileIndex tile, uint32
  */
 bool DoCommandPEx(TileIndex tile, uint32_t p1, uint32_t p2, uint64_t p3, uint32_t cmd, CommandCallback *callback, const char *text, const CommandAuxiliaryBase *aux_data, bool my_cmd)
 {
-	SCOPE_INFO_FMT([=], "DoCommandP: tile: %X (%d x %d), p1: 0x%X, p2: 0x%X, p3: 0x" OTTD_PRINTFHEX64 ", company: %s, cmd: 0x%X (%s), my_cmd: %d%s",
+	SCOPE_INFO_FMT([=], "DoCommandP: tile: {:X} ({} x {}), p1: 0x{:X}, p2: 0x{:X}, p3: 0x{:X}, company: {}, cmd: 0x{:X} ({}), my_cmd: {}{}",
 			tile, TileX(tile), TileY(tile), p1, p2, p3, scope_dumper().CompanyInfo(_current_company), cmd, GetCommandName(cmd), my_cmd, cmd_text_info_dumper().CommandTextInfo(text, aux_data));
 
 	/* Cost estimation is generally only done when the

diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
@@ -3495,8 +3495,8 @@ DEF_CONSOLE_CMD(ConDumpVersion)
 		return true;
 	}
 
-	char buffer[65536];
-	CrashLog::VersionInfoLog(buffer, lastof(buffer));
+	format_buffer buffer;
+	CrashLog::VersionInfoLog(buffer);
 	PrintLineByLine(buffer);
 	return true;
 }