Merge branch 'master' into jgrpp

# 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
148 changed files with 2253 additions and 1910 deletions

View File

@@ -168,10 +168,10 @@ enum WindowClass {
/**
* AI settings; %Window numbers:
* - 0 = #AISettingsWidgets
* Script settings; %Window numbers:
* - 0 = #ScriptSettingsWidgets
*/
WC_AI_SETTINGS,
WC_SCRIPT_SETTINGS,
/**
* NewGRF parameters; %Window numbers:
@@ -295,10 +295,10 @@ enum WindowClass {
WC_SIGN_LIST,
/**
* AI list; %Window numbers:
* - 0 = #AIListWidgets
* Scripts list; %Window numbers:
* - 0 = #ScriptListWidgets
*/
WC_AI_LIST,
WC_SCRIPT_LIST,
/**
* Goals list; %Window numbers:
@@ -686,10 +686,10 @@ enum WindowClass {
/**
* AI debug window; %Window numbers:
* - 0 = #AIDebugWidgets
* Script debug window; %Window numbers:
* - 0 = #ScriptDebugWidgets
*/
WC_AI_DEBUG,
WC_SCRIPT_DEBUG,
/**
* NewGRF inspect (debug); %Window numbers: