mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-17 01:12:39 +01:00
Code Issues Releases Wiki Activity

Codechange: Use std::unique_ptr for script info/library instances. (#13892)

Browse Source
This commit is contained in:
Peter Nelson
2025-03-25 21:07:02 +00:00
committed by GitHub
parent 47d078c033
commit fb008436b8
4 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ai/ai.hpp
View File

@@ -138,9 +138,9 @@ public:
static bool HasAI(const struct ContentInfo *ci, bool md5sum);
static bool HasAILibrary(const ContentInfo *ci, bool md5sum);
private:
static uint frame_counter; ///< Tick counter for the AI code
static class AIScannerInfo *scanner_info; ///< ScriptScanner instance that is used to find AIs
static class AIScannerLibrary *scanner_library; ///< ScriptScanner instance that is used to find AI Libraries
static uint frame_counter; ///< Tick counter for the AI code
static std::unique_ptr<AIScannerInfo> scanner_info; ///< ScriptScanner instance that is used to find AIs
static std::unique_ptr<AIScannerLibrary> scanner_library; ///< ScriptScanner instance that is used to find AI Libraries
};
#endif /* AI_HPP */

18
src/ai/ai_core.cpp
View File

@@ -24,8 +24,8 @@
#include "../safeguards.h"
/* static */ uint AI::frame_counter = 0;
/* static */ AIScannerInfo *AI::scanner_info = nullptr;
/* static */ AIScannerLibrary *AI::scanner_library = nullptr;
/* static */ std::unique_ptr<AIScannerInfo> AI::scanner_info = nullptr;
/* static */ std::unique_ptr<AIScannerLibrary> AI::scanner_library = nullptr;
/* static */ bool AI::CanStartNew()
{
@@ -169,9 +169,9 @@
AI::frame_counter = 0;
if (AI::scanner_info == nullptr) {
TarScanner::DoScan(TarScanner::Mode::AI);
AI::scanner_info = new AIScannerInfo();
AI::scanner_info = std::make_unique<AIScannerInfo>();
AI::scanner_info->Initialize();
AI::scanner_library = new AIScannerLibrary();
AI::scanner_library = std::make_unique<AIScannerLibrary>();
AI::scanner_library->Initialize();
}
}
@@ -185,10 +185,8 @@
* still load all the AIS, while keeping the configs in place */
Rescan();
} else {
delete AI::scanner_info;
delete AI::scanner_library;
AI::scanner_info = nullptr;
AI::scanner_library = nullptr;
AI::scanner_info.reset();
AI::scanner_library.reset();
for (CompanyID c = CompanyID::Begin(); c < MAX_COMPANIES; ++c) {
if (_settings_game.ai_config[c] != nullptr) {
@@ -354,11 +352,11 @@
/* static */ AIScannerInfo *AI::GetScannerInfo()
{
return AI::scanner_info;
return AI::scanner_info.get();
}
/* static */ AIScannerLibrary *AI::GetScannerLibrary()
{
return AI::scanner_library;
return AI::scanner_library.get();
}