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

Codechange: Use unique_ptr for fios company properties.

Browse Source 
This is the data used to show company names in the saveload window.
This commit is contained in:
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/saveload/company_sl.cpp
View File

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