Codechange: [Script] Use std::unique_ptr for Company::ai_instance (Op…

…enTTD#12544)
glx22 · Apr 20, 2024 · c5ef47e · c5ef47e
1 parent 1dfd0c1
commit c5ef47e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
@@ -60,7 +60,7 @@
 
 	c->ai_info = info;
 	assert(c->ai_instance == nullptr);
-	c->ai_instance = new AIInstance();
+	c->ai_instance = std::make_unique<AIInstance>();
 	c->ai_instance->Initialize(info);
 	c->ai_instance->LoadOnStack(config->GetToLoadData());
 	config->SetToLoadData(nullptr);
@@ -112,8 +112,7 @@
 	Backup<CompanyID> cur_company(_current_company, company);
 	Company *c = Company::Get(company);
 
-	delete c->ai_instance;
-	c->ai_instance = nullptr;
+	c->ai_instance.reset();
 	c->ai_info = nullptr;
 	c->ai_config.reset();
 

diff --git a/src/company_base.h b/src/company_base.h
@@ -134,7 +134,7 @@ struct Company : CompanyProperties, CompanyPool::PoolItem<&_company_pool> {
 	RailTypes avail_railtypes;         ///< Rail types available to this company.
 	RoadTypes avail_roadtypes;         ///< Road types available to this company.
 
-	class AIInstance *ai_instance;
+	std::unique_ptr<class AIInstance> ai_instance;
 	class AIInfo *ai_info;
 	std::unique_ptr<class AIConfig> ai_config;
 

diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
@@ -20,6 +20,7 @@
 #include "network/network_base.h"
 #include "network/network_admin.h"
 #include "ai/ai.hpp"
+#include "ai/ai_instance.hpp"
 #include "ai/ai_config.hpp"
 #include "company_manager_face.h"
 #include "window_func.h"