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

7
src/ship_cmd.cpp
View File

@@ -318,6 +318,13 @@ static bool CheckShipLeaveDepot(Ship *v)
{
if (!v->IsChainInDepot()) return false;
if (v->current_order.IsWaitTimetabled()) {
v->HandleWaiting(false);
}
if (v->current_order.IsType(OT_WAITING)) {
return true;
}
/* We are leaving a depot, but have to go to the exact same one; re-enter */
if (v->current_order.IsType(OT_GOTO_DEPOT) &&
IsShipDepotTile(v->tile) && GetDepotIndex(v->tile) == v->current_order.GetDestination()) {