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/company_gui.cpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2023-08-19 01:13:00 +01:00
parent ef168b7d46 6eb51666bc
commit 5a28405ced
22 changed files with 109 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tracerestrict_gui.cpp
View File

@@ -46,6 +46,7 @@
#include "core/geometry_func.hpp"
#include "infrastructure_func.h"
#include "zoom_func.h"
#include "group_gui_list.h"
#include "core/span_type.hpp"
#include "3rdparty/cpp-btree/btree_map.h"
@@ -641,9 +642,6 @@ static const TraceRestrictDropDownListSet *GetSortedCargoTypeDropDownListSet()
*/
static DropDownList GetGroupDropDownList(Owner owner, GroupID group_id, int &selected)
{
typedef GUIList<const Group*> GUIGroupList;
extern bool GroupNameSorter(const Group * const &a, const Group * const &b);
GUIGroupList list;
for (const Group *g : Group::Iterate()) {
@@ -653,7 +651,7 @@ static DropDownList GetGroupDropDownList(Owner owner, GroupID group_id, int &sel
}
list.ForceResort();
list.Sort(&GroupNameSorter);
SortGUIGroupList(list);
DropDownList dlist;
selected = -1;