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/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
This commit is contained in:
Jonathan G Rennison
2024-01-25 18:37:23 +00:00
parent c320a3fd7f 28ef5146ba
commit 822ecae85d
49 changed files with 127 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tracerestrict_gui.cpp
View File

@@ -48,7 +48,6 @@
#include "zoom_func.h"
#include "group_gui_list.h"
#include "newgrf_debug.h"
#include "core/span_type.hpp"
#include "3rdparty/cpp-btree/btree_map.h"
#include "safeguards.h"
@@ -549,9 +548,9 @@ struct TraceRestrictDropDownListItem {
};
/**
* Return the appropriate type dropdown TraceRestrictDropDownListItem span for the given item type @p type
* Return the appropriate type dropdown TraceRestrictDropDownListItem std::span for the given item type @p type
*/
static span<const TraceRestrictDropDownListItem> GetTypeDropDownListItems(TraceRestrictGuiItemType type)
static std::span<const TraceRestrictDropDownListItem> GetTypeDropDownListItems(TraceRestrictGuiItemType type)
{
static const TraceRestrictDropDownListItem actions[] = {
{ TRIT_PF_DENY, STR_TRACE_RESTRICT_PF_DENY, TRDDLIF_NONE },
@@ -602,9 +601,9 @@ static span<const TraceRestrictDropDownListItem> GetTypeDropDownListItems(TraceR
};
if (IsTraceRestrictTypeConditional(ItemTypeFromGuiType(type))) {
return span<const TraceRestrictDropDownListItem>(conditions);
return std::span<const TraceRestrictDropDownListItem>(conditions);
} else {
return span<const TraceRestrictDropDownListItem>(actions);
return std::span<const TraceRestrictDropDownListItem>(actions);
}
}