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

Import ship collision-avoidance patch.

Browse Source 
https://github.com/KeldorKatarn/OpenTTD_PatchPack
This commit is contained in:
patch-import
2016-01-19 22:01:12 +00:00
committed by Jonathan G Rennison
parent 25bda8a417
commit 917391102b
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ship_cmd.cpp
View File

@@ -509,6 +509,24 @@ static const byte _ship_subcoord[4][6][3] = {
} }
}; };
/* Used to find DiagDirection from tile to next tile if track is followed */
static const DiagDirection _diagdir_to_next_tile[6][4] = {
{ DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_NW },
{ DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_NW },
{ DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_NW, DIAGDIR_SW },
{ DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_NE, DIAGDIR_SW },
{ DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_SE, DIAGDIR_NE },
{ DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_SE, DIAGDIR_NE }
};
/** Helper function for collision avoidance. */
static Vehicle *FindShipOnTile(Vehicle *v, void *data)
{
if (v->type != VEH_SHIP || v->vehstatus & VS_STOPPED) return NULL;
return v;
}
static void ShipController(Ship *v) static void ShipController(Ship *v)
{ {
uint32 r; uint32 r;
@@ -601,6 +619,25 @@ static void ShipController(Ship *v)
track = ChooseShipTrack(v, gp.new_tile, diagdir, tracks); track = ChooseShipTrack(v, gp.new_tile, diagdir, tracks);
if (track == INVALID_TRACK) goto reverse_direction; if (track == INVALID_TRACK) goto reverse_direction;
/* Try to avoid collision and keep distance between each other. */
if (_settings_game.pf.forbid_90_deg && DistanceManhattan(v->dest_tile, gp.new_tile) > 3) {
if (HasVehicleOnPos(gp.new_tile, NULL, &FindShipOnTile) ||
HasVehicleOnPos(TileAddByDiagDir(gp.new_tile, _diagdir_to_next_tile[track][diagdir]), NULL, &FindShipOnTile)) {
v->cur_speed /= 4; // Go quarter speed.
Track old = track;
switch (tracks) {
default: break;
case TRACK_BIT_3WAY_NE: track == TRACK_RIGHT ? track = TRACK_X : track = TRACK_UPPER; break;
case TRACK_BIT_3WAY_SE: track == TRACK_LOWER ? track = TRACK_Y : track = TRACK_RIGHT; break;
case TRACK_BIT_3WAY_SW: track == TRACK_LEFT ? track = TRACK_X : track = TRACK_LOWER; break;
case TRACK_BIT_3WAY_NW: track == TRACK_UPPER ? track = TRACK_Y : track = TRACK_LEFT; break;
}
if (!IsWaterTile(gp.new_tile) || !IsWaterTile(TileAddByDiagDir(gp.new_tile, _diagdir_to_next_tile[track][diagdir]))) track = old; // Don't bump in coast, don't get stuck.
}
}
b = _ship_subcoord[diagdir][track]; b = _ship_subcoord[diagdir][track];
gp.x = (gp.x & ~0xF) | b[0]; gp.x = (gp.x & ~0xF) | b[0];