petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: String parameters can now be explicitly not initialised.

Browse Source 
As the visitor is now more complex this requires an unspecialised GetNextParameter() to avoid it being repeated for each return type.
This commit is contained in:
Peter Nelson
2024-12-03 23:02:43 +00:00
committed by Peter Nelson
parent 0c0e7606d9
commit 4010313180
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/strings_type.h
View File

@@ -72,7 +72,7 @@ static constexpr StringID SPECSTR_SILLY_NAME = 0x70E5; ///< Special string for s
static constexpr StringID SPECSTR_ANDCO_NAME = 0x70E6; ///< Special string for Surname & Co company names.
static constexpr StringID SPECSTR_PRESIDENT_NAME = 0x70E7; ///< Special string for the president's name.
using StringParameterData = std::variant<uint64_t, std::string>;
using StringParameterData = std::variant<std::monostate, uint64_t, std::string>;
/** The data required to format and validate a single parameter of a string. */
struct StringParameter {
@@ -82,6 +82,7 @@ struct StringParameter {
StringParameter() = default;
inline StringParameter(StringParameterData &&data) : data(std::move(data)), type(0) {}
inline StringParameter(const std::monostate &data) : data(data), type(0) {}
inline StringParameter(uint64_t data) : data(data), type(0) {}
inline StringParameter(const char *data) : data(std::string{data}), type(0) {}