Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp

src/ai/ai.hpp

@@ -11,7 +11,6 @@
 #define AI_HPP
 
 #include "../script/api/script_event_types.hpp"
-#include "../core/string_compare_type.hpp"
 #include "ai_scanner.hpp"
 
 /**

src/ai/ai_scanner.cpp

@@ -17,6 +17,7 @@
 #include "../script/api/script_object.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
+#include "../3rdparty/fmt/format.h"
 
 #include "../safeguards.h"
 
@@ -48,9 +49,9 @@ AIScannerInfo::~AIScannerInfo()
 	delete this->info_dummy;
 }
 
-void AIScannerInfo::GetScriptName(ScriptInfo *info, char *name, const char *last)
+std::string AIScannerInfo::GetScriptName(ScriptInfo *info)
 {
-	seprintf(name, last, "%s", info->GetName());
+	return info->GetName();
 }
 
 void AIScannerInfo::RegisterAPI(class Squirrel *engine)
@@ -92,39 +93,35 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 #undef GetAIInfo
 }
 
-AIInfo *AIScannerInfo::FindInfo(const char *nameParam, int versionParam, bool force_exact_match)
+AIInfo *AIScannerInfo::FindInfo(const char *name, int version, bool force_exact_match)
 {
 	if (this->info_list.size() == 0) return nullptr;
-	if (nameParam == nullptr) return nullptr;
+	if (name == nullptr) return nullptr;
 
-	char ai_name[1024];
-	strecpy(ai_name, nameParam, lastof(ai_name));
-	strtolower(ai_name);
-
-	if (versionParam == -1) {
+	if (version == -1) {
 		/* We want to load the latest version of this AI; so find it */
-		if (this->info_single_list.find(ai_name) != this->info_single_list.end()) return static_cast<AIInfo *>(this->info_single_list[ai_name]);
+		auto it = this->info_single_list.find(name);
+		if (it != this->info_single_list.end()) return static_cast<AIInfo *>(it->second);
 		return nullptr;
 	}
 
 	if (force_exact_match) {
 		/* Try to find a direct 'name.version' match */
-		char ai_name_tmp[1024];
-		seprintf(ai_name_tmp, lastof(ai_name_tmp), "%s.%d", ai_name, versionParam);
-		strtolower(ai_name_tmp);
-		if (this->info_list.find(ai_name_tmp) != this->info_list.end()) return static_cast<AIInfo *>(this->info_list[ai_name_tmp]);
+		std::string name_with_version = fmt::format("{}.{}", name, version);
+		auto it = this->info_list.find(name_with_version);
+		if (it != this->info_list.end()) return static_cast<AIInfo *>(it->second);
 		return nullptr;
 	}
 
 	AIInfo *info = nullptr;
-	int version = -1;
+	int highest_version = -1;
 
 	/* See if there is a compatible AI which goes by that name, with the highest
 	 *  version which allows loading the requested version */
 	for (const auto &item : this->info_list) {
 		AIInfo *i = static_cast<AIInfo *>(item.second);
-		if (StrEqualsIgnoreCase(ai_name, i->GetName()) && i->CanLoadFromVersion(versionParam) && (version == -1 || i->GetVersion() > version)) {
-			version = item.second->GetVersion();
+		if (StrEqualsIgnoreCase(name, i->GetName()) && i->CanLoadFromVersion(version) && (highest_version == -1 || i->GetVersion() > highest_version)) {
+			highest_version = item.second->GetVersion();
 			info = i;
 		}
 	}
@@ -138,10 +135,10 @@ void AIScannerLibrary::Initialize()
 	ScriptScanner::Initialize("AIScanner");
 }
 
-void AIScannerLibrary::GetScriptName(ScriptInfo *info, char *name, const char *last)
+std::string AIScannerLibrary::GetScriptName(ScriptInfo *info)
 {
 	AILibrary *library = static_cast<AILibrary *>(info);
-	seprintf(name, last, "%s.%s", library->GetCategory(), library->GetInstanceName());
+	return fmt::format("{}.{}", library->GetCategory(), library->GetInstanceName());
 }
 
 void AIScannerLibrary::RegisterAPI(class Squirrel *engine)
@@ -152,9 +149,7 @@ void AIScannerLibrary::RegisterAPI(class Squirrel *engine)
 AILibrary *AIScannerLibrary::FindLibrary(const char *library, int version)
 {
 	/* Internally we store libraries as 'library.version' */
-	char library_name[1024];
-	seprintf(library_name, lastof(library_name), "%s.%d", library, version);
-	strtolower(library_name);
+	std::string library_name = fmt::format("{}.{}", library, version);
 
 	/* Check if the library + version exists */
 	ScriptInfoList::iterator it = this->info_list.find(library_name);

src/ai/ai_scanner.hpp

@@ -27,12 +27,12 @@ public:
 
 	/**
 	 * Check if we have an AI by name and version available in our list.
-	 * @param nameParam The name of the AI.
-	 * @param versionParam The version of the AI, or -1 if you want the latest.
+	 * @param name The name of the AI.
+	 * @param version The version of the AI, or -1 if you want the latest.
 	 * @param force_exact_match Only match name+version, never latest.
 	 * @return nullptr if no match found, otherwise the AI that matched.
 	 */
-	class AIInfo *FindInfo(const char *nameParam, int versionParam, bool force_exact_match);
+	class AIInfo *FindInfo(const char *name, int version, bool force_exact_match);
 
 	/**
 	 * Set the Dummy AI.
@@ -40,7 +40,7 @@ public:
 	void SetDummyAI(class AIInfo *info);
 
 protected:
-	void GetScriptName(ScriptInfo *info, char *name, const char *last) override;
+	std::string GetScriptName(ScriptInfo *info) override;
 	const char *GetFileName() const override { return PATHSEP "info.nut"; }
 	Subdirectory GetDirectory() const override { return AI_DIR; }
 	const char *GetScannerName() const override { return "AIs"; }
@@ -63,7 +63,7 @@ public:
 	class AILibrary *FindLibrary(const char *library, int version);
 
 protected:
-	void GetScriptName(ScriptInfo *info, char *name, const char *last) override;
+	std::string GetScriptName(ScriptInfo *info) override;
 	const char *GetFileName() const override { return PATHSEP "library.nut"; }
 	Subdirectory GetDirectory() const override { return AI_LIBRARY_DIR; }
 	const char *GetScannerName() const override { return "AI Libraries"; }