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

Ensure new signal style mapping array is zero-inited

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-12-05 17:55:03 +00:00
parent 3a38eb6861
commit 4f8a7382ca
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/signal.cpp
View File

@@ -1766,6 +1766,8 @@ static bool RemapNewSignalStyles(const std::array<NewSignalStyleMapping, MAX_NEW
static void DetermineSignalStyleMapping(std::array<NewSignalStyleMapping, MAX_NEW_SIGNAL_STYLES> &mapping) static void DetermineSignalStyleMapping(std::array<NewSignalStyleMapping, MAX_NEW_SIGNAL_STYLES> &mapping)
{ {
mapping.fill({});
for (uint i = 0; i < _num_new_signal_styles; i++) { for (uint i = 0; i < _num_new_signal_styles; i++) {
mapping[i].grfid = _new_signal_styles[i].grffile->grfid; mapping[i].grfid = _new_signal_styles[i].grffile->grfid;
mapping[i].grf_local_id = _new_signal_styles[i].grf_local_id; mapping[i].grf_local_id = _new_signal_styles[i].grf_local_id;

2
src/sl/newsignals_sl.cpp
View File

@@ -26,6 +26,8 @@ static void Save_NSID()
static void Load_NSID() static void Load_NSID()
{ {
_new_signal_style_mapping.fill({});
uint count = SlReadUint32(); uint count = SlReadUint32();
for (uint i = 0; i < count; i++) { for (uint i = 0; i < count; i++) {
NewSignalStyleMapping mapping; NewSignalStyleMapping mapping;