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/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h
This commit is contained in:
Jonathan G Rennison
2023-11-09 01:35:31 +00:00
parent 3da9f521a5 790c1b1b02
commit 3436e0a781
130 changed files with 1460 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/window.cpp
View File

@@ -1372,6 +1372,15 @@ static uint GetWindowZPriority(WindowClass wc)
uint z_priority = 0;
switch (wc) {
case WC_TOOLTIPS:
++z_priority;
FALLTHROUGH;
case WC_ERRMSG:
case WC_CONFIRM_POPUP_QUERY:
++z_priority;
FALLTHROUGH;
case WC_ENDSCREEN:
++z_priority;
FALLTHROUGH;
@@ -1380,10 +1389,6 @@ static uint GetWindowZPriority(WindowClass wc)
++z_priority;
FALLTHROUGH;
case WC_TOOLTIPS:
++z_priority;
FALLTHROUGH;
case WC_DROPDOWN_MENU:
++z_priority;
FALLTHROUGH;
@@ -1402,8 +1407,6 @@ static uint GetWindowZPriority(WindowClass wc)
++z_priority;
FALLTHROUGH;
case WC_ERRMSG:
case WC_CONFIRM_POPUP_QUERY:
case WC_NETWORK_ASK_RELAY:
case WC_MODAL_PROGRESS:
case WC_NETWORK_STATUS_WINDOW: