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/build_vehicle_gui.cpp
View File

@@ -3263,7 +3263,7 @@ void CcMoveNewVirtualEngine(const CommandCost &result, TileIndex tile, uint32 p1
InvalidateWindowClassesData(WC_CREATE_TEMPLATE);
}
static WindowDesc _build_vehicle_desc(
static WindowDesc _build_vehicle_desc(__FILE__, __LINE__,
WDP_AUTO, "build_vehicle", 240, 268,
WC_BUILD_VEHICLE, WC_NONE,
WDF_CONSTRUCTION,
@@ -3271,7 +3271,7 @@ static WindowDesc _build_vehicle_desc(
&BuildVehicleWindow::hotkeys
);
static WindowDesc _build_template_vehicle_desc(
static WindowDesc _build_template_vehicle_desc(__FILE__, __LINE__,
WDP_AUTO, nullptr, 240, 268,
WC_BUILD_VIRTUAL_TRAIN, WC_CREATE_TEMPLATE,
WDF_CONSTRUCTION,
@@ -3279,7 +3279,7 @@ static WindowDesc _build_template_vehicle_desc(
&BuildVehicleWindow::hotkeys, &_build_vehicle_desc
);
static WindowDesc _build_vehicle_desc_train_advanced(
static WindowDesc _build_vehicle_desc_train_advanced(__FILE__, __LINE__,
WDP_AUTO, "build_vehicle_dual", 480, 268,
WC_BUILD_VEHICLE, WC_NONE,
WDF_CONSTRUCTION,
@@ -3287,7 +3287,7 @@ static WindowDesc _build_vehicle_desc_train_advanced(
&BuildVehicleWindow::hotkeys
);
static WindowDesc _build_template_vehicle_desc_advanced(
static WindowDesc _build_template_vehicle_desc_advanced(__FILE__, __LINE__,
WDP_AUTO, nullptr, 480, 268,
WC_BUILD_VIRTUAL_TRAIN, WC_CREATE_TEMPLATE,
WDF_CONSTRUCTION,