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/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/base_media_base.h
#	src/base_media_func.h
#	src/build_vehicle_gui.cpp
#	src/dock_gui.cpp
#	src/main_gui.cpp
#	src/music_gui.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_roadstop.cpp
#	src/os/windows/string_uniscribe.h
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/strings.cpp
#	src/terraform_gui.cpp
#	src/tests/test_script_admin.cpp
#	src/tests/test_window_desc.cpp
#	src/timer/timer_game_calendar.h
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/viewport.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2023-11-29 20:32:54 +00:00
parent b10a22218f ab535c0a86
commit 88670a230f
154 changed files with 1094 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/script_gui.cpp
View File

@@ -268,7 +268,7 @@ static const NWidgetPart _nested_script_list_widgets[] = {
};
/** Window definition for the ai list window. */
static WindowDesc _script_list_desc(
static WindowDesc _script_list_desc(__FILE__, __LINE__,
WDP_CENTER, "settings_script_list", 200, 234,
WC_SCRIPT_LIST, WC_NONE,
0,
@@ -623,7 +623,7 @@ static const NWidgetPart _nested_script_settings_widgets[] = {
};
/** Window definition for the Script settings window. */
static WindowDesc _script_settings_desc(
static WindowDesc _script_settings_desc(__FILE__, __LINE__,
WDP_CENTER, "settings_script", 500, 208,
WC_SCRIPT_SETTINGS, WC_NONE,
0,
@@ -1128,7 +1128,7 @@ CompanyID ScriptDebugWindow::script_debug_company = INVALID_COMPANY;
std::string ScriptDebugWindow::break_string;
bool ScriptDebugWindow::break_check_enabled = true;
bool ScriptDebugWindow::case_sensitive_break_check = false;
StringFilter ScriptDebugWindow::break_string_filter(&ScriptDebugWindow::case_sensitive_break_check);
StringFilter ScriptDebugWindow::break_string_filter(&ScriptDebugWindow::case_sensitive_break_check, false);
/** Make a number of rows with buttons for each company for the Script debug window. */
NWidgetBase *MakeCompanyButtonRowsScriptDebug(int *biggest_index)
@@ -1222,7 +1222,7 @@ EndContainer(),
};
/** Window definition for the Script debug window. */
static WindowDesc _script_debug_desc(
static WindowDesc _script_debug_desc(__FILE__, __LINE__,
WDP_AUTO, "script_debug", 600, 450,
WC_SCRIPT_DEBUG, WC_NONE,
0,

2
src/script/squirrel.cpp
View File

@@ -34,7 +34,7 @@
* If changing the call paths into the scripting engine, define this symbol to enable full debugging of allocations.
* This lets you track whether the allocator context is being switched correctly in all call paths.
#define SCRIPT_DEBUG_ALLOCATIONS
*/
*/
struct ScriptAllocator {
size_t allocated_size; ///< Sum of allocated data size