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

Merge branch 'wait_in_depot-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
This commit is contained in:
Jonathan G Rennison
2015-08-03 01:12:16 +01:00
parent a2eac188de 1fbd4a9d1d
commit e4ccea350b
14 changed files with 92 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/timetable_cmd.cpp
View File

@@ -145,6 +145,9 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_ERROR_TIMETABLE_NOT_STOPPING_HERE);
break;
case OT_GOTO_DEPOT:
break;
case OT_CONDITIONAL:
break;