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

Codechange: Use std::copy/fill pattern to initialize rail and road specs. (#11285)

Browse Source 
This avoids use of lengthof and array indices.
This commit is contained in:
PeterN
2023-09-11 00:01:08 +01:00
committed by GitHub
parent 7e3cdbaf62
commit a0b2f28f9c
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rail_cmd.cpp
View File

@@ -66,18 +66,8 @@ void ResetRailTypes()
{
static_assert(lengthof(_original_railtypes) <= lengthof(_railtypes));
uint i = 0;
for (; i < lengthof(_original_railtypes); i++) _railtypes[i] = _original_railtypes[i];
static const RailtypeInfo empty_railtype = {
{0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,{}},
{0,0,0,0,0,0,0,0},
{0,0,0,0,0,0},
0, RAILTYPES_NONE, RAILTYPES_NONE, 0, 0, 0, RTFB_NONE, 0, 0, 0, 0, 0,
RailTypeLabelList(), 0, 0, RAILTYPES_NONE, RAILTYPES_NONE, 0,
{}, {} };
for (; i < lengthof(_railtypes); i++) _railtypes[i] = empty_railtype;
auto insert = std::copy(std::begin(_original_railtypes), std::end(_original_railtypes), std::begin(_railtypes));
std::fill(insert, std::end(_railtypes), RailtypeInfo{});
_railtypes_hidden_mask = RAILTYPES_NONE;
}