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

Codechange: Use member initialisation for GRFConfig instead of ZeroedMemoryAllocator. (#13343)

pull/13345/head
Peter Nelson 2025-01-19 23:31:15 +00:00 committed by GitHub
parent 51529b83b1
commit 40efc6be00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_config.cpp
View File

@ -29,19 +29,11 @@
#include "safeguards.h" #include "safeguards.h"
/**
* Create a new GRFConfig.
* @param filename Set the filename of this GRFConfig to filename.
*/
GRFConfig::GRFConfig(const std::string &filename) : filename(filename), num_valid_params(MAX_NUM_PARAMS) {}
/** /**
* Create a new GRFConfig that is a deep copy of an existing config. * Create a new GRFConfig that is a deep copy of an existing config.
* @param config The GRFConfig object to make a copy of. * @param config The GRFConfig object to make a copy of.
*/ */
GRFConfig::GRFConfig(const GRFConfig &config) : GRFConfig::GRFConfig(const GRFConfig &config) :
ZeroedMemoryAllocator(),
ident(config.ident), ident(config.ident),
original_md5sum(config.original_md5sum), original_md5sum(config.original_md5sum),
filename(config.filename), filename(config.filename),

38
src/newgrf_config.h
View File

@ -11,7 +11,6 @@
#define NEWGRF_CONFIG_H #define NEWGRF_CONFIG_H
#include "strings_type.h" #include "strings_type.h"
#include "core/alloc_type.hpp"
#include "fileio_type.h" #include "fileio_type.h"
#include "textfile_type.h" #include "textfile_type.h"
#include "newgrf_text.h" #include "newgrf_text.h"
@ -152,35 +151,36 @@ struct GRFParameterInfo {
}; };
/** Information about GRF, used in the game and (part of it) in savegames */ /** Information about GRF, used in the game and (part of it) in savegames */
struct GRFConfig : ZeroedMemoryAllocator { struct GRFConfig {
static constexpr uint8_t MAX_NUM_PARAMS = 0x80; static constexpr uint8_t MAX_NUM_PARAMS = 0x80;
GRFConfig(const std::string &filename = std::string{}); GRFConfig() = default;
GRFConfig(const std::string &filename) : filename(filename) {}
GRFConfig(const GRFConfig &config); GRFConfig(const GRFConfig &config);
/* Remove the copy assignment, as the default implementation will not do the right thing. */ /* Remove the copy assignment, as the default implementation will not do the right thing. */
GRFConfig &operator=(GRFConfig &rhs) = delete; GRFConfig &operator=(GRFConfig &rhs) = delete;
GRFIdentifier ident; ///< grfid and md5sum to uniquely identify newgrfs GRFIdentifier ident{}; ///< grfid and md5sum to uniquely identify newgrfs
MD5Hash original_md5sum; ///< MD5 checksum of original file if only a 'compatible' file was loaded MD5Hash original_md5sum{}; ///< MD5 checksum of original file if only a 'compatible' file was loaded
std::string filename; ///< Filename - either with or without full path std::string filename{}; ///< Filename - either with or without full path
GRFTextWrapper name; ///< NOSAVE: GRF name (Action 0x08) GRFTextWrapper name{}; ///< NOSAVE: GRF name (Action 0x08)
GRFTextWrapper info; ///< NOSAVE: GRF info (author, copyright, ...) (Action 0x08) GRFTextWrapper info{}; ///< NOSAVE: GRF info (author, copyright, ...) (Action 0x08)
GRFTextWrapper url; ///< NOSAVE: URL belonging to this GRF. GRFTextWrapper url{}; ///< NOSAVE: URL belonging to this GRF.
std::optional<GRFError> error; ///< NOSAVE: Error/Warning during GRF loading (Action 0x0B) std::optional<GRFError> error = std::nullopt; ///< NOSAVE: Error/Warning during GRF loading (Action 0x0B)
uint32_t version; ///< NOSAVE: Version a NewGRF can set so only the newest NewGRF is shown uint32_t version = 0; ///< NOSAVE: Version a NewGRF can set so only the newest NewGRF is shown
uint32_t min_loadable_version; ///< NOSAVE: Minimum compatible version a NewGRF can define uint32_t min_loadable_version = 0; ///< NOSAVE: Minimum compatible version a NewGRF can define
uint8_t flags; ///< NOSAVE: GCF_Flags, bitset uint8_t flags = 0; ///< NOSAVE: GCF_Flags, bitset
GRFStatus status; ///< NOSAVE: GRFStatus, enum GRFStatus status = GCS_UNKNOWN; ///< NOSAVE: GRFStatus, enum
uint32_t grf_bugs; ///< NOSAVE: bugs in this GRF in this run, @see enum GRFBugs uint32_t grf_bugs = 0; ///< NOSAVE: bugs in this GRF in this run, @see enum GRFBugs
uint8_t num_valid_params; ///< NOSAVE: Number of valid parameters (action 0x14) uint8_t num_valid_params = MAX_NUM_PARAMS; ///< NOSAVE: Number of valid parameters (action 0x14)
uint8_t palette; ///< GRFPalette, bitset uint8_t palette = 0; ///< GRFPalette, bitset
bool has_param_defaults; ///< NOSAVE: did this newgrf specify any defaults for it's parameters bool has_param_defaults = false; ///< NOSAVE: did this newgrf specify any defaults for it's parameters
std::vector<std::optional<GRFParameterInfo>> param_info; ///< NOSAVE: extra information about the parameters std::vector<std::optional<GRFParameterInfo>> param_info; ///< NOSAVE: extra information about the parameters
std::vector<uint32_t> param; ///< GRF parameters std::vector<uint32_t> param; ///< GRF parameters
struct GRFConfig *next; ///< NOSAVE: Next item in the linked list struct GRFConfig *next = nullptr; ///< NOSAVE: Next item in the linked list
bool IsCompatible(uint32_t old_version) const; bool IsCompatible(uint32_t old_version) const;
void SetParams(std::span<const uint32_t> pars); void SetParams(std::span<const uint32_t> pars);