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

Merge branch 'master' into jgrpp

Browse Source 
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
This commit is contained in:
Jonathan G Rennison
2024-01-09 16:30:06 +00:00
parent 14db9b2854 c86d918921
commit 914b92b21f
45 changed files with 1406 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ship_cmd.cpp
View File

@@ -567,22 +567,22 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr
path_found = false;
} else {
/* Attempt to follow cached path. */
if (v->cached_path != nullptr && !v->cached_path->empty()) {
track = TrackdirToTrack(v->cached_path->front());
if (!v->cached_path.empty()) {
track = TrackdirToTrack(v->cached_path.front());
if (HasBit(tracks, track)) {
v->cached_path->pop_front();
v->cached_path.pop_front();
/* HandlePathfindResult() is not called here because this is not a new pathfinder result. */
return track;
}
/* Cached path is invalid so continue with pathfinder. */
v->cached_path->clear();
v->cached_path.clear();
}
switch (_settings_game.pf.pathfinder_for_ships) {
case VPF_NPF: track = NPFShipChooseTrack(v, path_found); break;
case VPF_YAPF: track = YapfShipChooseTrack(v, tile, enterdir, tracks, path_found, v->GetOrCreatePathCache()); break;
case VPF_YAPF: track = YapfShipChooseTrack(v, tile, enterdir, tracks, path_found, v->cached_path); break;
default: NOT_REACHED();
}
}
@@ -882,7 +882,7 @@ static void ReverseShipIntoTrackdir(Ship *v, Trackdir trackdir)
v->rotation_x_pos = v->x_pos;
v->rotation_y_pos = v->y_pos;
UpdateShipSpeed(v, 0);
if (v->cached_path != nullptr) v->cached_path->clear();
v->cached_path.clear();
v->UpdatePosition();
v->UpdateViewport(true, true);
@@ -896,7 +896,7 @@ static void ReverseShip(Ship *v)
v->rotation_x_pos = v->x_pos;
v->rotation_y_pos = v->y_pos;
UpdateShipSpeed(v, 0);
if (v->cached_path != nullptr) v->cached_path->clear();
v->cached_path.clear();
v->UpdatePosition();
v->UpdateViewport(true, true);
@@ -1081,7 +1081,7 @@ static void ShipController(Ship *v)
/* Ship is back on the bridge head, we need to consume its path
* cache entry here as we didn't have to choose a ship track. */
if (v->cached_path != nullptr && !v->cached_path->empty()) v->cached_path->pop_front();
if (!v->cached_path.empty()) v->cached_path.pop_front();
}
/* update image of ship, as well as delta XY */
@@ -1107,7 +1107,7 @@ bool Ship::Tick()
void Ship::SetDestTile(TileIndex tile)
{
if (tile == this->dest_tile) return;
if (this->cached_path != nullptr) this->cached_path->clear();
this->cached_path.clear();
this->dest_tile = tile;
}