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/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2018-05-03 23:54:51 +01:00
parent 315eff1112 228f8fba55
commit ad1c402ad8
161 changed files with 1702 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/api/script_window.hpp
View File

@@ -1463,6 +1463,7 @@ public:
WID_GL_DELETE_GROUP = ::WID_GL_DELETE_GROUP, ///< Delete group button.
WID_GL_RENAME_GROUP = ::WID_GL_RENAME_GROUP, ///< Rename group button.
WID_GL_REPLACE_PROTECTION = ::WID_GL_REPLACE_PROTECTION, ///< Replace protection button.
WID_GL_INFO = ::WID_GL_INFO, ///< Group info.
};
/* automatically generated from ../../widgets/highscore_widget.h */
@@ -1605,9 +1606,11 @@ public:
/* automatically generated from ../../widgets/music_widget.h */
/** Widgets of the #MusicTrackSelectionWindow class. */
enum MusicTrackSelectionWidgets {
WID_MTS_CAPTION = ::WID_MTS_CAPTION, ///< Window caption.
WID_MTS_LIST_LEFT = ::WID_MTS_LIST_LEFT, ///< Left button.
WID_MTS_PLAYLIST = ::WID_MTS_PLAYLIST, ///< Playlist.
WID_MTS_LIST_RIGHT = ::WID_MTS_LIST_RIGHT, ///< Right button.
WID_MTS_MUSICSET = ::WID_MTS_MUSICSET, ///< Music set selection.
WID_MTS_ALL = ::WID_MTS_ALL, ///< All button.
WID_MTS_OLD = ::WID_MTS_OLD, ///< Old button.
WID_MTS_NEW = ::WID_MTS_NEW, ///< New button.
@@ -2423,7 +2426,7 @@ public:
WID_TN_TRAINS = ::WID_TN_TRAINS, ///< Train menu.
WID_TN_ROADVEHS = ::WID_TN_ROADVEHS, ///< Road vehicle menu.
WID_TN_SHIPS = ::WID_TN_SHIPS, ///< Ship menu.
WID_TN_AIRCRAFTS = ::WID_TN_AIRCRAFTS, ///< Aircraft menu.
WID_TN_AIRCRAFT = ::WID_TN_AIRCRAFT, ///< Aircraft menu.
WID_TN_ZOOM_IN = ::WID_TN_ZOOM_IN, ///< Zoom in the main viewport.
WID_TN_ZOOM_OUT = ::WID_TN_ZOOM_OUT, ///< Zoom out the main viewport.
WID_TN_BUILDING_TOOLS_START = ::WID_TN_BUILDING_TOOLS_START, ///< Helper for the offset of the building tools