diff options
| author | peter1138 <peter1138@openttd.org> | 2019-03-29 23:24:40 +0000 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-04-22 22:57:00 +0200 |
| commit | 27a956ba6204e400e82fe10056bf730f286b23fe (patch) | |
| tree | 7009ae20df0ecf558696f420e0ee6124774a5ba6 /src/group_gui.cpp | |
| parent | 37222c3fa2f558df5f7ef420ad583ba403ceda62 (diff) | |
| download | openttd-27a956ba6204e400e82fe10056bf730f286b23fe.tar.xz | |
Codechange: Replace Group::replace_protection with Group::flags
Diffstat (limited to 'src/group_gui.cpp')
| -rw-r--r-- | src/group_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 372053304..0f463e030 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -533,7 +533,7 @@ public: /* If not a default group and the group has replace protection, show an enabled replace sprite. */ uint16 protect_sprite = SPR_GROUP_REPLACE_OFF_TRAIN; - if (!IsDefaultGroupID(this->vli.index) && !IsAllGroupID(this->vli.index) && Group::Get(this->vli.index)->replace_protection) protect_sprite = SPR_GROUP_REPLACE_ON_TRAIN; + if (!IsDefaultGroupID(this->vli.index) && !IsAllGroupID(this->vli.index) && HasBit(Group::Get(this->vli.index)->flags, GroupFlags::GF_REPLACE_PROTECTION)) protect_sprite = SPR_GROUP_REPLACE_ON_TRAIN; this->GetWidget<NWidgetCore>(WID_GL_REPLACE_PROTECTION)->widget_data = protect_sprite + this->vli.vtype; /* Set text of "group by" dropdown widget. */ @@ -601,7 +601,7 @@ public: assert(g->owner == this->owner); - DrawGroupInfo(y1, r.left, r.right, g->index, this->indents[i] * LEVEL_WIDTH, g->replace_protection, g->folded || (i + 1 < (int)this->groups.size() && indents[i + 1] > this->indents[i])); + DrawGroupInfo(y1, r.left, r.right, g->index, this->indents[i] * LEVEL_WIDTH, HasBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION), g->folded || (i + 1 < (int)this->groups.size() && indents[i + 1] > this->indents[i])); y1 += this->tiny_step_height; } @@ -798,7 +798,7 @@ public: case WID_GL_REPLACE_PROTECTION: { const Group *g = Group::GetIfValid(this->vli.index); if (g != nullptr) { - DoCommandP(0, this->vli.index, (g->replace_protection ? 0 : 1) | (_ctrl_pressed << 1), CMD_SET_GROUP_REPLACE_PROTECTION); + DoCommandP(0, this->vli.index, (HasBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION) ? 0 : 1) | (_ctrl_pressed << 1), CMD_SET_GROUP_REPLACE_PROTECTION); } break; } |