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

Codechange: Use std::optional for GRFConfig::GRFError (#11066)

Browse Source 
This changes the semantics from "object pointer ownership" to "optional object", and simplifies copies.
This commit is contained in:
PeterN
2023-06-25 11:57:58 +01:00
committed by GitHub
parent 71f241ffe1
commit 509471f7f8
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_config.cpp
View File

@@ -51,6 +51,7 @@ GRFConfig::GRFConfig(const GRFConfig &config) :
name(config.name),
info(config.info),
url(config.url),
error(config.error),
version(config.version),
min_loadable_version(config.min_loadable_version),
flags(config.flags & ~(1 << GCF_COPY)),
@@ -63,7 +64,6 @@ GRFConfig::GRFConfig(const GRFConfig &config) :
param_info(config.param_info),
has_param_defaults(config.has_param_defaults)
{
if (config.error != nullptr) this->error = std::make_unique<GRFError>(*config.error);
}
/**
@@ -495,7 +495,7 @@ compatible_grf:
c->ident.md5sum = f->ident.md5sum;
c->name = f->name;
c->info = f->name;
c->error = nullptr;
c->error.reset();
c->version = f->version;
c->min_loadable_version = f->min_loadable_version;
c->num_valid_params = f->num_valid_params;