Changeset - r19165:1353a268dd5f
[Not reviewed]
master
0 1 0
michi_cc - 12 years ago 2012-03-20 13:11:20
michi_cc@openttd.org
(svn r24053) -Fix (r23947) [FS#5111]: Crash when timetabling a maximum travel speed of 0.
1 file changed with 1 insertions and 0 deletions:
0 comments (0 inline, 0 general)
src/timetable_cmd.cpp
Show inline comments
 
@@ -97,48 +97,49 @@ CommandCost CmdChangeTimetable(TileIndex
 
	CommandCost ret = CheckOwnership(v->owner);
 
	if (ret.Failed()) return ret;
 

	
 
	VehicleOrderID order_number = GB(p1, 20, 8);
 
	Order *order = v->GetOrder(order_number);
 
	if (order == NULL || order->IsType(OT_IMPLICIT)) return CMD_ERROR;
 

	
 
	ModifyTimetableFlags mtf = Extract<ModifyTimetableFlags, 28, 2>(p1);
 
	if (mtf >= MTF_END) return CMD_ERROR;
 

	
 
	int wait_time   = order->wait_time;
 
	int travel_time = order->travel_time;
 
	int max_speed   = order->max_speed;
 
	switch (mtf) {
 
		case MTF_WAIT_TIME:
 
			wait_time = GB(p2, 0, 16);
 
			break;
 

	
 
		case MTF_TRAVEL_TIME:
 
			travel_time = GB(p2, 0, 16);
 
			break;
 

	
 
		case MTF_TRAVEL_SPEED:
 
			max_speed = GB(p2, 0, 16);
 
			if (max_speed == 0) max_speed = UINT16_MAX; // Disable speed limit.
 
			break;
 

	
 
		default:
 
			NOT_REACHED();
 
	}
 

	
 
	if (wait_time != order->wait_time) {
 
		switch (order->GetType()) {
 
			case OT_GOTO_STATION:
 
				if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_ERROR_TIMETABLE_NOT_STOPPING_HERE);
 
				break;
 

	
 
			case OT_CONDITIONAL:
 
				break;
 

	
 
			default: return_cmd_error(STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS);
 
		}
 
	}
 

	
 
	if (travel_time != order->travel_time && order->IsType(OT_CONDITIONAL)) return CMD_ERROR;
 
	if (max_speed != order->max_speed && (order->IsType(OT_CONDITIONAL) || v->type == VEH_AIRCRAFT)) return CMD_ERROR;
 

	
 
	if (flags & DC_EXEC) {
 
		if (wait_time   != order->wait_time)   ChangeTimetable(v, order_number, wait_time,   MTF_WAIT_TIME);
0 comments (0 inline, 0 general)