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/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
This commit is contained in:
Jonathan G Rennison
2021-02-19 15:38:34 +00:00
parent bebe3acaa8 cb8e1706b2
commit e95216b59d
176 changed files with 4275 additions and 3826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/genworld_widget.h
View File

@@ -21,6 +21,7 @@ enum GenerateLandscapeWidgets {
WID_GL_MAPSIZE_Y_PULLDOWN, ///< Dropdown 'map Y size'.
WID_GL_TOWN_PULLDOWN, ///< Dropdown 'No. of towns'.
WID_GL_TOWNNAME_DROPDOWN, ///< Dropdown 'Townnames'.
WID_GL_INDUSTRY_PULLDOWN, ///< Dropdown 'No. of industries'.
WID_GL_GENERATE_BUTTON, ///< 'Generate' button.
@@ -37,7 +38,6 @@ enum GenerateLandscapeWidgets {
WID_GL_SNOW_LEVEL_TEXT, ///< Snow level.
WID_GL_SNOW_LEVEL_UP, ///< Increase snow level.
WID_GL_TREE_PULLDOWN, ///< Dropdown 'Tree algorithm'.
WID_GL_LANDSCAPE_PULLDOWN, ///< Dropdown 'Land generator'.
WID_GL_HEIGHTMAP_NAME_TEXT, ///< Heightmap name.

13
src/widgets/goal_widget.h
View File

@@ -20,12 +20,13 @@ enum GoalListWidgets {
/** Widgets of the #GoalQuestionWindow class. */
enum GoalQuestionWidgets {
WID_GQ_CAPTION, ///< Caption of the window.
WID_GQ_QUESTION, ///< Question text.
WID_GQ_BUTTONS, ///< Buttons selection (between 1, 2 or 3).
WID_GQ_BUTTON_1, ///< First button.
WID_GQ_BUTTON_2, ///< Second button.
WID_GQ_BUTTON_3, ///< Third button.
WID_GQ_CAPTION, ///< Caption of the window.
WID_GQ_QUESTION, ///< Question text.
WID_GQ_BUTTONS, ///< Buttons selection (between 1, 2 or 3).
WID_GQ_BUTTON_1, ///< First button.
WID_GQ_BUTTON_2, ///< Second button.
WID_GQ_BUTTON_3, ///< Third button.
WID_GQ_BUTTON_SPACER, ///< Selection to hide extra padding if there are no buttons
};
#endif /* WIDGETS_GOAL_WIDGET_H */

13
src/widgets/industry_widget.h
View File

@@ -12,11 +12,14 @@
/** Widgets of the #BuildIndustryWindow class. */
enum DynamicPlaceIndustriesWidgets {
WID_DPI_MATRIX_WIDGET, ///< Matrix of the industries.
WID_DPI_SCROLLBAR, ///< Scrollbar of the matrix.
WID_DPI_INFOPANEL, ///< Info panel about the industry.
WID_DPI_DISPLAY_WIDGET, ///< Display chain button.
WID_DPI_FUND_WIDGET, ///< Fund button.
WID_DPI_SCENARIO_EDITOR_PANE, ///< Pane containing SE-only widgets.
WID_DPI_REMOVE_ALL_INDUSTRIES_WIDGET, ///< Remove all industries button.
WID_DPI_CREATE_RANDOM_INDUSTRIES_WIDGET, ///< Create random industries button.
WID_DPI_MATRIX_WIDGET, ///< Matrix of the industries.
WID_DPI_SCROLLBAR, ///< Scrollbar of the matrix.
WID_DPI_INFOPANEL, ///< Info panel about the industry.
WID_DPI_DISPLAY_WIDGET, ///< Display chain button.
WID_DPI_FUND_WIDGET, ///< Fund button.
};
/** Widgets of the #IndustryViewWindow class. */

1
src/widgets/object_widget.h
View File

@@ -12,6 +12,7 @@
/** Widgets of the #BuildObjectWindow class. */
enum BuildObjectWidgets {
WID_BO_FILTER, ///< The filter text box for the object list.
WID_BO_CLASS_LIST, ///< The list with classes.
WID_BO_SCROLLBAR, ///< The scrollbar associated with the list.
WID_BO_OBJECT_MATRIX, ///< The matrix with preview sprites.

2
src/widgets/settings_widget.h
View File

@@ -15,8 +15,6 @@ enum GameOptionsWidgets {
WID_GO_BACKGROUND, ///< Background of the window.
WID_GO_CURRENCY_DROPDOWN, ///< Currency dropdown.
WID_GO_DISTANCE_DROPDOWN, ///< Measuring unit dropdown.
WID_GO_ROADSIDE_DROPDOWN, ///< Dropdown to select the road side (to set the right side ;)).
WID_GO_TOWNNAME_DROPDOWN, ///< Town name dropdown.
WID_GO_AUTOSAVE_DROPDOWN, ///< Dropdown to say how often to autosave.
WID_GO_LANG_DROPDOWN, ///< Language dropdown.
WID_GO_RESOLUTION_DROPDOWN, ///< Dropdown for the resolution.