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

Codechange: Replace Group::replace_protection with Group::flags

Browse Source
This commit is contained in:
peter1138
2019-03-29 23:24:40 +00:00
committed by Michael Lutz
parent 37222c3fa2
commit 27a956ba62
6 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/group_cmd.cpp
View File

@@ -315,7 +315,7 @@ CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
if (flags & DC_EXEC) {
Group *g = new Group(_current_company);
g->replace_protection = false;
ClrBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION);
g->vehicle_type = vt;
g->parent = INVALID_GROUP;
@@ -668,12 +668,18 @@ CommandCost CmdSetGroupLivery(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
* @param g initial group.
* @param protect 1 to set or 0 to clear protection.
*/
static void SetGroupReplaceProtection(Group *g, bool protect)
static void SetGroupReplaceProtection(Group *g, bool protect, bool children)
{
g->replace_protection = protect;
if (protect) {
SetBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION);
} else {
ClrBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION);
}
if (!children) return;
for (Group *pg : Group::Iterate()) {
if (pg->parent == g->index) SetGroupReplaceProtection(pg, protect);
if (pg->parent == g->index) SetGroupReplaceProtection(pg, protect, true);
}
}
@@ -695,11 +701,7 @@ CommandCost CmdSetGroupReplaceProtection(TileIndex tile, DoCommandFlag flags, ui
if (g == nullptr || g->owner != _current_company) return CMD_ERROR;
if (flags & DC_EXEC) {
if (HasBit(p2, 1)) {
SetGroupReplaceProtection(g, HasBit(p2, 0));
} else {
g->replace_protection = HasBit(p2, 0);
}
SetGroupReplaceProtection(g, HasBit(p2, 0), HasBit(p2, 1));
SetWindowDirty(GetWindowClassForVehicleType(g->vehicle_type), VehicleListIdentifier(VL_GROUP_LIST, g->vehicle_type, _current_company).Pack());
InvalidateWindowData(WC_REPLACE_VEHICLE, g->vehicle_type);