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

Codechange: explicitly initialise EngineRenew member variables

pull/13602/head
Rubidium 2025-02-17 20:09:54 +01:00 committed by rubidium42
parent 0449dc48c8
commit b4a4ca83ff
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/autoreplace.cpp
View File

@ -109,13 +109,8 @@ CommandCost AddEngineReplacement(EngineRenewList *erl, EngineID old_engine, Engi
if (!EngineRenew::CanAllocateItem()) return CMD_ERROR; if (!EngineRenew::CanAllocateItem()) return CMD_ERROR;
if (flags.Test(DoCommandFlag::Execute)) { if (flags.Test(DoCommandFlag::Execute)) {
er = new EngineRenew(old_engine, new_engine);
er->group_id = group;
er->replace_when_old = replace_when_old;
/* Insert before the first element */ /* Insert before the first element */
er->next = (EngineRenew *)(*erl); *erl = new EngineRenew(old_engine, new_engine, group, replace_when_old, *erl);
*erl = (EngineRenewList)er;
} }
return CommandCost(); return CommandCost();

14
src/autoreplace_base.h
View File

@ -31,13 +31,15 @@ extern EngineRenewPool _enginerenew_pool;
* it. * it.
*/ */
struct EngineRenew : EngineRenewPool::PoolItem<&_enginerenew_pool> { struct EngineRenew : EngineRenewPool::PoolItem<&_enginerenew_pool> {
EngineID from; EngineID from = EngineID::Invalid();
EngineID to; EngineID to = EngineID::Invalid();
EngineRenew *next; EngineRenew *next = nullptr;
GroupID group_id; GroupID group_id = GroupID::Invalid();
bool replace_when_old; ///< Do replacement only when vehicle is old. bool replace_when_old = false; ///< Do replacement only when vehicle is old.
EngineRenew(EngineID from = EngineID::Invalid(), EngineID to = EngineID::Invalid()) : from(from), to(to) {} EngineRenew() {}
EngineRenew(EngineID from, EngineID to, GroupID group_id, bool replace_when_old, EngineRenew *next) :
from(from), to(to), next(next), group_id(group_id), replace_when_old(replace_when_old) {}
~EngineRenew() {} ~EngineRenew() {}
}; };