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

Codechange: use std::unique_ptr to manager GRFErrors in GRFConfig

Browse Source
This commit is contained in:
Rubidium
2023-04-27 20:28:09 +02:00
committed by rubidium42
parent a312a6c1b2
commit f78aa1e720
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_config.cpp
View File

@@ -64,7 +64,7 @@ GRFConfig::GRFConfig(const GRFConfig &config) :
MemCpyT<uint8>(this->original_md5sum, config.original_md5sum, lengthof(this->original_md5sum));
MemCpyT<uint32>(this->param, config.param, lengthof(this->param));
if (config.filename != nullptr) this->filename = stredup(config.filename);
if (config.error != nullptr) this->error = new GRFError(*config.error);
if (config.error != nullptr) this->error = std::make_unique<GRFError>(*config.error);
for (uint i = 0; i < config.param_info.size(); i++) {
if (config.param_info[i] == nullptr) {
this->param_info.push_back(nullptr);
@@ -80,7 +80,6 @@ GRFConfig::~GRFConfig()
/* GCF_COPY as in NOT stredupped/alloced the filename */
if (!HasBit(this->flags, GCF_COPY)) {
free(this->filename);
delete this->error;
}
for (uint i = 0; i < this->param_info.size(); i++) delete this->param_info[i];