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

Allow building multiple docks per station.

Browse Source 
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
This commit is contained in:
keldorkatarn
2017-09-11 22:48:19 +02:00
committed by Jonathan G Rennison
parent d486d58d86
commit 1d3cf59d8a
26 changed files with 412 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ship_cmd.cpp
View File

@@ -11,6 +11,7 @@
#include "stdafx.h"
#include "ship.h"
#include "dock_base.h"
#include "landscape.h"
#include "timetable.h"
#include "news_func.h"
@@ -285,13 +286,50 @@ void Ship::PlayLeaveStationSound() const
PlayShipSound(this);
}
/**
* Of all the docks a station has, return the best destination for a ship.
* @param v The ship.
* @param st Station the ship \a v is heading for.
* @return The free and closest (if none is free, just closest) dock of station \a st to ship \a v.
*/
const Dock* GetBestDock(const Ship *v, const Station *st)
{
assert(st != NULL && st->HasFacilities(FACIL_DOCK) && st->docks != NULL);
if (st->docks->next == NULL) return st->docks;
Dock *best_dock = NULL;
uint best_distance = UINT_MAX;
for (Dock *dock = st->docks; dock != NULL; dock = dock->next) {
uint new_distance = DistanceManhattan(v->tile, dock->flat);
if (new_distance < best_distance) {
best_dock = dock;
best_distance = new_distance;
}
}
assert(best_dock != NULL);
return best_dock;
}
TileIndex Ship::GetOrderStationLocation(StationID station)
{
if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION;
const Station *st = Station::Get(station);
if (st->dock_tile != INVALID_TILE) {
return TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile)));
if (st->HasFacilities(FACIL_DOCK)) {
if (st->docks == NULL) {
return st->xy; // A buoy
} else {
const Dock* dock = GetBestDock(this, st);
DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(dock->sloped));
direction = ReverseDiagDir(direction);
return dock->flat + TileOffsByDiagDir(direction);
}
} else {
this->IncrementRealOrderIndex();
return 0;