dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'progsig-sx' into jgrpp

Browse Source 
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:15:18 +01:00
parent de76316634 de14c210db
commit 2bcbeea011
31 changed files with 2914 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/rail_widget.h
View File

@@ -82,16 +82,19 @@ enum BuildSignalWidgets {
WID_BS_SEMAPHORE_ENTRY, ///< Build a semaphore entry block signal
WID_BS_SEMAPHORE_EXIT, ///< Build a semaphore exit block signal
WID_BS_SEMAPHORE_COMBO, ///< Build a semaphore combo block signal
WID_BS_SEMAPHORE_PROG, ///< Build a semahore programmable signal
WID_BS_SEMAPHORE_PBS, ///< Build a semaphore path signal.
WID_BS_SEMAPHORE_PBS_OWAY, ///< Build a semaphore one way path signal.
WID_BS_ELECTRIC_NORM, ///< Build an electric normal block signal
WID_BS_ELECTRIC_ENTRY, ///< Build an electric entry block signal
WID_BS_ELECTRIC_EXIT, ///< Build an electric exit block signal
WID_BS_ELECTRIC_COMBO, ///< Build an electric combo block signal
WID_BS_ELECTRIC_PROG, ///< Build an electric programmable signal
WID_BS_ELECTRIC_PBS, ///< Build an electric path signal.
WID_BS_ELECTRIC_PBS_OWAY, ///< Build an electric one way path signal.
WID_BS_CONVERT, ///< Convert the signal.
WID_BS_TRACE_RESTRICT, ///< Open trace restrict window.
WID_BS_PROGRAM, ///< Enter program to prog signal
WID_BS_DRAG_SIGNALS_DENSITY_LABEL, ///< The current signal density.
WID_BS_DRAG_SIGNALS_DENSITY_DECREASE, ///< Decrease the signal density.
WID_BS_DRAG_SIGNALS_DENSITY_INCREASE, ///< Increase the signal density.