gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Changing group parent did not properly update partially-default liveries.

Browse Source
This commit is contained in:
Peter Nelson 2023-12-27 20:25:38 +00:00 committed by Peter Nelson
parent bfb4254226
commit 5d2ed80c95
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/group_cmd.cpp
View File

@ -466,10 +466,11 @@ CommandCost CmdAlterGroup(DoCommandFlag flags, AlterGroupMode mode, GroupID grou
g->parent = (pg == nullptr) ? INVALID_GROUP : pg->index; g->parent = (pg == nullptr) ? INVALID_GROUP : pg->index;
GroupStatistics::UpdateAutoreplace(g->owner); GroupStatistics::UpdateAutoreplace(g->owner);
if (g->livery.in_use == 0) { if (!HasBit(g->livery.in_use, 0) || !HasBit(g->livery.in_use, 1)) {
/* Update livery with new parent's colours if either colour is default. */
const Livery *livery = GetParentLivery(g); const Livery *livery = GetParentLivery(g);
g->livery.colour1 = livery->colour1; if (!HasBit(g->livery.in_use, 0)) g->livery.colour1 = livery->colour1;
g->livery.colour2 = livery->colour2; if (!HasBit(g->livery.in_use, 1)) g->livery.colour2 = livery->colour2;
PropagateChildLivery(g, true); PropagateChildLivery(g, true);
MarkWholeScreenDirty(); MarkWholeScreenDirty();