Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: Allow only one ship to leave depot at a time.

Browse Source
This commit is contained in:
Peter Nelson 2018-05-18 18:02:53 +01:00 committed by Charles Pigott
parent ebddd596c7
commit b98887c4a0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ship_cmd.cpp
View File

@ -319,6 +319,14 @@ void Ship::UpdateDeltaXY()
this->z_extent = 6; this->z_extent = 6;
} }
/**
* Test-procedure for HasVehicleOnPos to check for a ship.
*/
static Vehicle *EnsureNoVisibleShipProc(Vehicle *v, void *data)
{
return v->type == VEH_SHIP && (v->vehstatus & VS_HIDDEN) == 0 ? v : NULL;
}
static bool CheckShipLeaveDepot(Ship *v) static bool CheckShipLeaveDepot(Ship *v)
{ {
if (!v->IsChainInDepot()) return false; if (!v->IsChainInDepot()) return false;
@ -333,6 +341,10 @@ static bool CheckShipLeaveDepot(Ship *v)
/* Don't leave depot if no destination set */ /* Don't leave depot if no destination set */
if (v->dest_tile == 0) return true; if (v->dest_tile == 0) return true;
/* Don't leave depot if another vehicle is already entering/leaving */
/* This helps avoid CPU load if many ships are set to start at the same time */
if (HasVehicleOnPos(v->tile, NULL, &EnsureNoVisibleShipProc)) return true;
TileIndex tile = v->tile; TileIndex tile = v->tile;
Axis axis = GetShipDepotAxis(tile); Axis axis = GetShipDepotAxis(tile);