Merge branch 'departure-boards-sx' into jgrpp

Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:23:25 +01:00
34 changed files with 2471 additions and 43 deletions

View File

@@ -0,0 +1,29 @@
/* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file waypoint_widget.h Types related to the waypoint widgets. */
#ifndef WIDGETS_DEPARTURES_WIDGET_H
#define WIDGETS_DEPARTURES_WIDGET_H
/** Widgets of the WC_DEPARTURES_BOARD. */
enum DeparturesWindowWidgets {
WID_DB_CAPTION, ///< Window caption
WID_DB_LIST, ///< List of departures
WID_DB_SCROLLBAR, ///< List scrollbar
WID_DB_SHOW_DEPS, ///< Toggle departures button
WID_DB_SHOW_ARRS, ///< Toggle arrivals button
WID_DB_SHOW_VIA, ///< Toggle via button
WID_DB_SHOW_TRAINS, ///< Toggle trains button
WID_DB_SHOW_ROADVEHS, ///< Toggle road vehicles button
WID_DB_SHOW_SHIPS, ///< Toggle ships button
WID_DB_SHOW_PLANES, ///< Toggle planes button
};
#endif /* WIDGETS_DEPARTURES_WIDGET_H */

View File

@@ -30,6 +30,7 @@ enum StationViewWidgets {
WID_SV_ROADVEHS, ///< List of scheduled road vehs button.
WID_SV_SHIPS, ///< List of scheduled ships button.
WID_SV_PLANES, ///< List of scheduled planes button.
WID_SV_DEPARTURES, ///< Departures button.
};
/** Widgets of the #CompanyStationsWindow class. */

View File

@@ -19,6 +19,7 @@ enum WaypointWidgets {
WID_W_CENTER_VIEW, ///< Center the main view on this waypoint.
WID_W_RENAME, ///< Rename this waypoint.
WID_W_SHOW_VEHICLES, ///< Show the vehicles visiting this waypoint.
WID_W_DEPARTURES, ///< Departures button.
};
#endif /* WIDGETS_WAYPOINT_WIDGET_H */