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

Codechange: Use vector for GRFFile parameters instead of array. (#13157) 

This simplifies assigning default parameters and removes the param_end member.
pull/13160/head
Peter Nelson 2024-12-07 22:08:59 +00:00 committed by GitHub
parent 3d73c95080
commit 7af16bff11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/newgrf.cpp
View File

@ -6824,7 +6824,7 @@ static void CfgApply(ByteReader &buf)
/* If the parameter is a GRF parameter (not an internal variable) check
* if it (and all further sequential parameters) has been defined. */
if (param_num < 0x80 && (param_num + (param_size - 1) / 4) >= _cur.grffile->param_end) {
if (param_num < 0x80 && (param_num + (param_size - 1) / 4) >= std::size(_cur.grffile->param)) {
GrfMsg(2, "CfgApply: Ignoring (param {} not set)", (param_num + (param_size - 1) / 4));
break;
}
@ -6897,7 +6897,7 @@ static void SkipIf(ByteReader &buf)
default: break;
}
if (param < 0x80 && _cur.grffile->param_end <= param) {
if (param < 0x80 && std::size(_cur.grffile->param) <= param) {
GrfMsg(7, "SkipIf: Param {} undefined, skipping test", param);
return;
}
@ -7489,7 +7489,7 @@ static void ParamSet(ByteReader &buf)
* - it OR A PARAMETER WITH HIGHER NUMBER has been set to any value by
* an earlier action D */
if (HasBit(oper, 7)) {
if (target < 0x80 && target < _cur.grffile->param_end) {
if (target < 0x80 && target < std::size(_cur.grffile->param)) {
GrfMsg(7, "ParamSet: Param {} already defined, skipping", target);
return;
}
@ -7741,9 +7741,9 @@ static void ParamSet(ByteReader &buf)
default:
if (target < 0x80) {
/* Resize (and fill with zeroes) if needed. */
if (target >= std::size(_cur.grffile->param)) _cur.grffile->param.resize(target + 1);
_cur.grffile->param[target] = res;
/* param is zeroed by default */
if (target + 1U > _cur.grffile->param_end) _cur.grffile->param_end = target + 1;
} else {
GrfMsg(7, "ParamSet: Skipping unknown target 0x{:02X}", target);
}
@ -9003,12 +9003,8 @@ GRFFile::GRFFile(const GRFConfig *config)
this->tramtype_map.fill(INVALID_ROADTYPE);
this->tramtype_map[0] = ROADTYPE_TRAM;
/* Copy the initial parameter list
* 'Uninitialised' parameters are zeroed as that is their default value when dynamically creating them. */
this->param = {};
auto last = std::begin(config->param) + std::min<size_t>(std::size(config->param), GRFConfig::MAX_NUM_PARAMS);
std::copy(std::begin(config->param), last, std::begin(this->param));
/* Copy the initial parameter list */
this->param = config->param;
}
/**

6
src/newgrf.h
View File

@ -122,8 +122,7 @@ struct GRFFile : ZeroedMemoryAllocator {
std::vector<std::unique_ptr<struct AirportTileSpec>> airtspec;
std::vector<std::unique_ptr<struct RoadStopSpec>> roadstops;
std::array<uint32_t, 0x80> param;
uint param_end; ///< one more than the highest set parameter
std::vector<uint32_t> param;
std::vector<GRFLabel> labels; ///< List of labels
@ -156,8 +155,7 @@ struct GRFFile : ZeroedMemoryAllocator {
{
/* Note: We implicitly test for number < this->param.size() and return 0 for invalid parameters.
* In fact this is the more important test, as param is zeroed anyway. */
assert(this->param_end <= this->param.size());
return (number < this->param_end) ? this->param[number] : 0;
return (number < std::size(this->param)) ? this->param[number] : 0;
}
};