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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/dropdown.cpp
#	src/dropdown_type.h
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/main_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/news_gui.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/signs.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/texteff.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
#	src/zoom_type.h
This commit is contained in:
Jonathan G Rennison
2024-05-30 17:54:01 +01:00
parent cb1e41fc88 97bea563d7
commit 853ed272be
142 changed files with 1255 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tracerestrict_gui.cpp
View File

@@ -658,13 +658,13 @@ static DropDownList GetGroupDropDownList(Owner owner, GroupID group_id, int &sel
selected = -1;
if (group_id == DEFAULT_GROUP) selected = DEFAULT_GROUP;
dlist.emplace_back(new DropDownListStringItem(STR_GROUP_DEFAULT_TRAINS, DEFAULT_GROUP, false));
dlist.push_back(MakeDropDownListStringItem(STR_GROUP_DEFAULT_TRAINS, DEFAULT_GROUP, false));
for (size_t i = 0; i < list.size(); ++i) {
const Group *g = list[i];
if (group_id == g->index) selected = group_id;
SetDParam(0, g->index | GROUP_NAME_HIERARCHY);
dlist.emplace_back(new DropDownListStringItem(STR_GROUP_NAME, g->index, false));
dlist.push_back(MakeDropDownListStringItem(STR_GROUP_NAME, g->index, false));
}
return dlist;
@@ -717,11 +717,11 @@ DropDownList GetSlotDropDownList(Owner owner, TraceRestrictSlotID slot_id, int &
if (slot_id == s->index) selected = slot_id;
if (s->vehicle_type == vehtype) {
SetDParam(0, s->index);
dlist.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_SLOT_NAME, s->index, false));
dlist.push_back(MakeDropDownListStringItem(STR_TRACE_RESTRICT_SLOT_NAME, s->index, false));
} else {
SetDParam(0, STR_REPLACE_VEHICLE_TRAIN + s->vehicle_type);
SetDParam(1, s->index);
dlist.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_SLOT_NAME_PREFIXED, s->index, false));
dlist.push_back(MakeDropDownListStringItem(STR_TRACE_RESTRICT_SLOT_NAME_PREFIXED, s->index, false));
}
}
@@ -761,7 +761,7 @@ DropDownList GetCounterDropDownList(Owner owner, TraceRestrictCounterID ctr_id,
const TraceRestrictCounter *s = list[i];
if (ctr_id == s->index) selected = ctr_id;
SetDParam(0, s->index);
dlist.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_COUNTER_NAME, s->index, false));
dlist.push_back(MakeDropDownListStringItem(STR_TRACE_RESTRICT_COUNTER_NAME, s->index, false));
}
return dlist;
@@ -1982,7 +1982,7 @@ public:
DropDownList dlist;
for (const TraceRestrictDropDownListItem &item : GetTypeDropDownListItems(type)) {
if (!ShouldHideTypeDropDownListItem(item.flags)) {
dlist.emplace_back(new DropDownListStringItem(item.str, item.type, false));
dlist.push_back(MakeDropDownListStringItem(item.str, item.type, false));
}
}
ShowDropDownList(this, std::move(dlist), type, widget, 0);
@@ -3440,7 +3440,7 @@ private:
list.emplace_back(MakeCompanyDropDownListItem(c->index));
if (c->index == value) missing_ok = true;
}
list.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_UNDEFINED_COMPANY, INVALID_COMPANY, false));
list.push_back(MakeDropDownListStringItem(STR_TRACE_RESTRICT_UNDEFINED_COMPANY, INVALID_COMPANY, false));
if (INVALID_COMPANY == value) missing_ok = true;
assert(missing_ok == true);