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

Codechange: set VLI.index through accessor function

pull/13494/head
Rubidium 2025-02-02 08:55:14 +01:00 committed by rubidium42
parent 4e84d032b8
commit ac54ff368c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/group_gui.cpp
View File

@ -395,7 +395,7 @@ public:
this->vscroll = this->GetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR);
this->group_sb = this->GetScrollbar(WID_GL_LIST_GROUP_SCROLLBAR); this->group_sb = this->GetScrollbar(WID_GL_LIST_GROUP_SCROLLBAR);
this->vli.index = ALL_GROUP; this->vli.SetIndex(ALL_GROUP);
this->group_sel = INVALID_GROUP; this->group_sel = INVALID_GROUP;
this->group_rename = INVALID_GROUP; this->group_rename = INVALID_GROUP;
this->group_over = INVALID_GROUP; this->group_over = INVALID_GROUP;
@ -505,7 +505,7 @@ public:
GroupID group = this->vli.ToGroupID(); GroupID group = this->vli.ToGroupID();
if (!(IsAllGroupID(group) || IsDefaultGroupID(group) || Group::IsValidID(group))) { if (!(IsAllGroupID(group) || IsDefaultGroupID(group) || Group::IsValidID(group))) {
this->vli.index = ALL_GROUP; this->vli.SetIndex(ALL_GROUP);
this->CloseChildWindows(WC_DROPDOWN_MENU); this->CloseChildWindows(WC_DROPDOWN_MENU);
} }
this->SetDirty(); this->SetDirty();
@ -689,7 +689,7 @@ public:
{ {
if (confirmed) { if (confirmed) {
VehicleGroupWindow *w = (VehicleGroupWindow*)win; VehicleGroupWindow *w = (VehicleGroupWindow*)win;
w->vli.index = ALL_GROUP; w->vli.SetIndex(ALL_GROUP);
Command<CMD_DELETE_GROUP>::Post(STR_ERROR_GROUP_CAN_T_DELETE, w->group_confirm); Command<CMD_DELETE_GROUP>::Post(STR_ERROR_GROUP_CAN_T_DELETE, w->group_confirm);
} }
} }
@ -725,7 +725,7 @@ public:
case WID_GL_ALL_VEHICLES: // All vehicles button case WID_GL_ALL_VEHICLES: // All vehicles button
if (!IsAllGroupID(this->vli.ToGroupID())) { if (!IsAllGroupID(this->vli.ToGroupID())) {
this->vli.index = ALL_GROUP; this->vli.SetIndex(ALL_GROUP);
this->vehgroups.ForceRebuild(); this->vehgroups.ForceRebuild();
this->SetDirty(); this->SetDirty();
} }
@ -733,7 +733,7 @@ public:
case WID_GL_DEFAULT_VEHICLES: // Ungrouped vehicles button case WID_GL_DEFAULT_VEHICLES: // Ungrouped vehicles button
if (!IsDefaultGroupID(this->vli.ToGroupID())) { if (!IsDefaultGroupID(this->vli.ToGroupID())) {
this->vli.index = DEFAULT_GROUP; this->vli.SetIndex(DEFAULT_GROUP);
this->vehgroups.ForceRebuild(); this->vehgroups.ForceRebuild();
this->SetDirty(); this->SetDirty();
} }
@ -756,7 +756,7 @@ public:
do { do {
g = Group::Get(g)->parent; g = Group::Get(g)->parent;
if (g == it->group->index) { if (g == it->group->index) {
this->vli.index = g; this->vli.SetIndex(g);
break; break;
} }
} while (g != INVALID_GROUP); } while (g != INVALID_GROUP);
@ -770,7 +770,8 @@ public:
} }
} }
this->group_sel = this->vli.index = it->group->index; this->vli.SetIndex(it->group->index);
this->group_sel = it->group->index;
SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this); SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
@ -1128,7 +1129,7 @@ public:
{ {
if (g_id == INVALID_GROUP || g_id == this->vli.ToGroupID()) return; if (g_id == INVALID_GROUP || g_id == this->vli.ToGroupID()) return;
this->vli.index = g_id; this->vli.SetIndex(g_id);
if (g_id != ALL_GROUP && g_id != DEFAULT_GROUP) { if (g_id != ALL_GROUP && g_id != DEFAULT_GROUP) {
const Group *g = Group::Get(g_id); const Group *g = Group::Get(g_id);

2
src/vehicle_gui.cpp
View File

@ -2270,7 +2270,7 @@ public:
{ {
if (!gui_scope && HasBit(data, 31) && this->vli.type == VL_SHARED_ORDERS) { if (!gui_scope && HasBit(data, 31) && this->vli.type == VL_SHARED_ORDERS) {
/* Needs to be done in command-scope, so everything stays valid */ /* Needs to be done in command-scope, so everything stays valid */
this->vli.index = GB(data, 0, 20); this->vli.SetIndex(GB(data, 0, 20));
this->window_number = this->vli.ToWindowNumber(); this->window_number = this->vli.ToWindowNumber();
this->vehgroups.ForceRebuild(); this->vehgroups.ForceRebuild();
return; return;

2
src/vehiclelist.h
View File

@ -45,6 +45,8 @@ struct VehicleListIdentifier {
constexpr StationID ToStationID() const { assert(this->type == VL_STATION_LIST); return StationID(this->index); } constexpr StationID ToStationID() const { assert(this->type == VL_STATION_LIST); return StationID(this->index); }
constexpr VehicleID ToVehicleID() const { assert(this->type == VL_SHARED_ORDERS); return VehicleID(this->index); } constexpr VehicleID ToVehicleID() const { assert(this->type == VL_SHARED_ORDERS); return VehicleID(this->index); }
constexpr void SetIndex(uint32_t index) { this->index = index; }
/** /**
* Create a simple vehicle list. * Create a simple vehicle list.
* @param type List type. * @param type List type.