mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use unique_ptr for fios company properties. 

This is the data used to show company names in the saveload window.
pull/10839/head
Peter Nelson 2023-05-18 08:38:35 +01:00 committed by PeterN
parent bf8f24f9a8
commit 91e140c722
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fios.h
View File

@ -25,7 +25,7 @@ enum SaveLoadInvalidateWindowData {
SLIWD_FILTER_CHANGES, ///< The filename filter has changed (via the editbox) SLIWD_FILTER_CHANGES, ///< The filename filter has changed (via the editbox)
}; };
using CompanyPropertiesMap = std::map<uint, CompanyProperties *>; using CompanyPropertiesMap = std::map<uint, std::unique_ptr<CompanyProperties>>;
/** /**
* Container for loading in mode SL_LOAD_CHECK. * Container for loading in mode SL_LOAD_CHECK.

3
src/fios_gui.cpp
View File

@ -55,9 +55,6 @@ void LoadCheckData::Clear()
this->current_date = 0; this->current_date = 0;
this->settings = {}; this->settings = {};
for (auto &pair : this->companies) {
delete pair.second;
}
companies.clear(); companies.clear();
this->gamelog.Reset(); this->gamelog.Reset();

8
src/saveload/company_sl.cpp
View File

@ -527,8 +527,8 @@ struct PLYRChunkHandler : ChunkHandler {
int index; int index;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
CompanyProperties *cprops = new CompanyProperties(); std::unique_ptr<CompanyProperties> cprops = std::make_unique<CompanyProperties>();
SlObject(cprops, slt); SlObject(cprops.get(), slt);
/* We do not load old custom names */ /* We do not load old custom names */
if (IsSavegameVersionBefore(SLV_84)) { if (IsSavegameVersionBefore(SLV_84)) {
@ -549,9 +549,7 @@ struct PLYRChunkHandler : ChunkHandler {
} }
if (_load_check_data.companies.count(index) == 0) { if (_load_check_data.companies.count(index) == 0) {
_load_check_data.companies[index] = cprops; _load_check_data.companies[index] = std::move(cprops);
} else {
delete cprops;
} }
} }
} }