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/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-02-11 22:11:21 +00:00
parent 36722592b4 09f7f32b8d
commit ae9b416684
148 changed files with 2253 additions and 1910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.cpp
View File

@@ -18,6 +18,7 @@
#include "blitter/factory.hpp"
#include "zoom_func.h"
#include "vehicle_base.h"
#include "depot_func.h"
#include "window_func.h"
#include "tilehighlight_func.h"
#include "network/network.h"
@@ -1397,8 +1398,8 @@ static uint GetWindowZPriority(WindowClass wc)
case WC_CUSTOM_CURRENCY:
case WC_NETWORK_WINDOW:
case WC_GRF_PARAMETERS:
case WC_AI_LIST:
case WC_AI_SETTINGS:
case WC_SCRIPT_LIST:
case WC_SCRIPT_SETTINGS:
case WC_TEXTFILE:
++z_priority;
FALLTHROUGH;
@@ -3264,7 +3265,6 @@ void UpdateWindows()
PerformanceMeasurer framerate(PFE_DRAWING);
PerformanceAccumulator::Reset(PFE_DRAWWORLD);
extern void ProcessPendingPerformanceMeasurements();
ProcessPendingPerformanceMeasurements();
CallWindowRealtimeTickEvent(delta_ms);
@@ -3578,7 +3578,6 @@ void ReInitAllWindows(bool zoom_changed)
NWidgetLeaf::InvalidateDimensionCache(); // Reset cached sizes of several widgets.
NWidgetScrollbar::InvalidateDimensionCache();
extern void InitDepotWindowBlockSizes();
InitDepotWindowBlockSizes();
/* When _gui_zoom has changed, we need to resize toolbar and statusbar first,
@@ -3590,7 +3589,6 @@ void ReInitAllWindows(bool zoom_changed)
ReInitWindow(w, zoom_changed);
}
void NetworkReInitChatBoxSize();
NetworkReInitChatBoxSize();
/* Make sure essential parts of all windows are visible */