(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.

1 files changed, 52 insertions, 10 deletions

diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 287386d72..41c61d347 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -162,6 +162,7 @@ struct TimetableWindow : Window {
 	uint deparr_time_width; ///< The width of the departure/arrival time
 	uint deparr_abbr_width; ///< The width of the departure/arrival abbreviation
 	Scrollbar *vscroll;
+	bool query_is_speed_query; ///< The currently open query window is a speed query and not a time query.
 
 	TimetableWindow(const WindowDesc *desc, WindowNumber window_number) :
 			Window(),
@@ -319,9 +320,12 @@ struct TimetableWindow : Window {
 					disable = order == NULL || ((!order->IsType(OT_GOTO_STATION) || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) && !order->IsType(OT_CONDITIONAL));
 				}
 			}
+			bool disable_speed = disable || selected % 2 != 1 || v->type == VEH_AIRCRAFT;
 
 			this->SetWidgetDisabledState(WID_VT_CHANGE_TIME, disable);
 			this->SetWidgetDisabledState(WID_VT_CLEAR_TIME, disable);
+			this->SetWidgetDisabledState(WID_VT_CHANGE_SPEED, disable_speed);
+			this->SetWidgetDisabledState(WID_VT_CLEAR_SPEED, disable_speed);
 			this->SetWidgetDisabledState(WID_VT_SHARED_ORDER_LIST, !v->IsOrderListShared());
 
 			this->EnableWidget(WID_VT_START_DATE);
@@ -331,6 +335,8 @@ struct TimetableWindow : Window {
 			this->DisableWidget(WID_VT_START_DATE);
 			this->DisableWidget(WID_VT_CHANGE_TIME);
 			this->DisableWidget(WID_VT_CLEAR_TIME);
+			this->DisableWidget(WID_VT_CHANGE_SPEED);
+			this->DisableWidget(WID_VT_CLEAR_SPEED);
 			this->DisableWidget(WID_VT_RESET_LATENESS);
 			this->DisableWidget(WID_VT_AUTOFILL);
 			this->DisableWidget(WID_VT_SHARED_ORDER_LIST);
@@ -391,11 +397,12 @@ struct TimetableWindow : Window {
 							string = STR_TIMETABLE_NOT_TIMETABLEABLE;
 							colour = ((i == selected) ? TC_SILVER : TC_GREY) | TC_NO_SHADE;
 						} else if (order->travel_time == 0) {
-							string = STR_TIMETABLE_TRAVEL_NOT_TIMETABLED;
+							string = order->max_speed != UINT16_MAX ? STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED : STR_TIMETABLE_TRAVEL_NOT_TIMETABLED;
 						} else {
 							SetTimetableParams(0, 1, order->travel_time);
-							string = STR_TIMETABLE_TRAVEL_FOR;
+							string = order->max_speed != UINT16_MAX ? STR_TIMETABLE_TRAVEL_FOR_SPEED : STR_TIMETABLE_TRAVEL_FOR;
 						}
+						SetDParam(2, order->max_speed);
 
 						DrawString(rtl ? r.left + WD_FRAMERECT_LEFT : middle, rtl ? middle : r.right - WD_FRAMERECT_LEFT, y, string, colour);
 
@@ -490,10 +497,10 @@ struct TimetableWindow : Window {
 		}
 	}
 
-	static inline uint32 PackTimetableArgs(const Vehicle *v, uint selected)
+	static inline uint32 PackTimetableArgs(const Vehicle *v, uint selected, bool speed)
 	{
 		uint order_number = (selected + 1) / 2;
-		ModifyTimetableFlags mtf = (selected % 2 == 1) ? MTF_TRAVEL_TIME : MTF_WAIT_TIME;
+		ModifyTimetableFlags mtf = (selected % 2 == 1) ? (speed ? MTF_TRAVEL_SPEED : MTF_TRAVEL_TIME) : MTF_WAIT_TIME;
 
 		if (order_number >= v->GetNumOrders()) order_number = 0;
 
@@ -540,16 +547,43 @@ struct TimetableWindow : Window {
 					}
 				}
 
+				this->query_is_speed_query = false;
 				ShowQueryString(current, STR_TIMETABLE_CHANGE_TIME, 31, this, CS_NUMERAL, QSF_NONE);
 				break;
 			}
 
-			case WID_VT_CLEAR_TIME: { // Clear waiting time button.
-				uint32 p1 = PackTimetableArgs(v, this->sel_index);
+			case WID_VT_CHANGE_SPEED: { // Change max speed button.
+				int selected = this->sel_index;
+				VehicleOrderID real = (selected + 1) / 2;
+
+				if (real >= v->GetNumOrders()) real = 0;
+
+				StringID current = STR_EMPTY;
+				const Order *order = v->GetOrder(real);
+				if (order != NULL) {
+					if (order->max_speed != UINT16_MAX) {
+						SetDParam(0, ConvertKmhishSpeedToDisplaySpeed(order->max_speed));
+						current = STR_JUST_INT;
+					}
+				}
+
+				this->query_is_speed_query = true;
+				ShowQueryString(current, STR_TIMETABLE_CHANGE_SPEED, 31, this, CS_NUMERAL, QSF_NONE);
+				break;
+			}
+
+			case WID_VT_CLEAR_TIME: { // Clear waiting time.
+				uint32 p1 = PackTimetableArgs(v, this->sel_index, false);
 				DoCommandP(0, p1, 0, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 				break;
 			}
 
+			case WID_VT_CLEAR_SPEED: { // Clear max speed button.
+				uint32 p1 = PackTimetableArgs(v, this->sel_index, true);
+				DoCommandP(0, p1, UINT16_MAX, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
+				break;
+			}
+
 			case WID_VT_RESET_LATENESS: // Reset the vehicle's late counter.
 				DoCommandP(0, v->index, 0, CMD_SET_VEHICLE_ON_TIME | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 				break;
@@ -580,12 +614,16 @@ struct TimetableWindow : Window {
 
 		const Vehicle *v = this->vehicle;
 
-		uint32 p1 = PackTimetableArgs(v, this->sel_index);
+		uint32 p1 = PackTimetableArgs(v, this->sel_index, this->query_is_speed_query);
 
-		uint64 time = StrEmpty(str) ? 0 : strtoul(str, NULL, 10);
-		if (!_settings_client.gui.timetable_in_ticks) time *= DAY_TICKS;
+		uint64 val = StrEmpty(str) ? 0 : strtoul(str, NULL, 10);
+		if (this->query_is_speed_query) {
+			val = ConvertDisplaySpeedToKmhishSpeed(val);
+		} else {
+			if (!_settings_client.gui.timetable_in_ticks) val *= DAY_TICKS;
+		}
 
-		uint32 p2 = minu(time, UINT16_MAX);
+		uint32 p2 = minu(val, UINT16_MAX);
 
 		DoCommandP(0, p1, p2, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 	}
@@ -629,6 +667,10 @@ static const NWidgetPart _nested_timetable_widgets[] = {
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_CLEAR_TIME), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_TIMETABLE_CLEAR_TIME, STR_TIMETABLE_CLEAR_TIME_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_VERTICAL, NC_EQUALSIZE),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_CHANGE_SPEED), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_TIMETABLE_CHANGE_SPEED, STR_TIMETABLE_CHANGE_SPEED_TOOLTIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_CLEAR_SPEED), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_TIMETABLE_CLEAR_SPEED, STR_TIMETABLE_CLEAR_SPEED_TOOLTIP),
+			EndContainer(),
+			NWidget(NWID_VERTICAL, NC_EQUALSIZE),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_START_DATE), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_TIMETABLE_STARTING_DATE, STR_TIMETABLE_STARTING_DATE_TOOLTIP),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_RESET_LATENESS), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_TIMETABLE_RESET_LATENESS, STR_TIMETABLE_RESET_LATENESS_TOOLTIP),
 			EndContainer(),