dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use std::string for getting a script's name

Browse Source
This commit is contained in:
Rubidium
2023-05-05 14:00:00 +02:00
committed by rubidium42
parent f1fb6c95fe
commit 72082aa7d3
6 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/game_scanner.cpp
View File

@@ -13,6 +13,8 @@
#include "game_info.hpp"
#include "game_scanner.hpp"
#include "../3rdparty/fmt/format.h"
#include "../safeguards.h"
@@ -21,9 +23,9 @@ void GameScannerInfo::Initialize()
ScriptScanner::Initialize("GSScanner");
}
void GameScannerInfo::GetScriptName(ScriptInfo *info, char *name, const char *last)
std::string GameScannerInfo::GetScriptName(ScriptInfo *info)
{
seprintf(name, last, "%s", info->GetName());
return info->GetName();
}
void GameScannerInfo::RegisterAPI(class Squirrel *engine)
@@ -77,10 +79,10 @@ void GameScannerLibrary::Initialize()
ScriptScanner::Initialize("GSScanner");
}
void GameScannerLibrary::GetScriptName(ScriptInfo *info, char *name, const char *last)
std::string GameScannerLibrary::GetScriptName(ScriptInfo *info)
{
GameLibrary *library = static_cast<GameLibrary *>(info);
seprintf(name, last, "%s.%s", library->GetCategory(), library->GetInstanceName());
return fmt::format("{}.{}", library->GetCategory(), library->GetInstanceName());
}
void GameScannerLibrary::RegisterAPI(class Squirrel *engine)

4
src/game/game_scanner.hpp
View File

@@ -26,7 +26,7 @@ public:
class GameInfo *FindInfo(const char *nameParam, int versionParam, bool force_exact_match);
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 GAME_DIR; }
const char *GetScannerName() const override { return "Game Scripts"; }
@@ -47,7 +47,7 @@ public:
class GameLibrary *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 GAME_LIBRARY_DIR; }
const char *GetScannerName() const override { return "GS Libraries"; }