cpp/openttd-patchpack/source Changeset - r26015:62da647d3454

Changeset - r26015:62da647d3454

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

glx22 - 3 years ago 2021-10-05 15:58:19
glx@openttd.org

Fix: Try all possible reverse directions when a ship reaches a dead end

5 files changed with 49 insertions and 15 deletions:

src/pathfinder/npf/npf.cpp

src/pathfinder/npf/npf_func.h

src/pathfinder/yapf/yapf.h

src/pathfinder/yapf/yapf_ship.cpp

src/ship_cmd.cpp

0 comments (0 inline, 0 general)

src/pathfinder/npf/npf.cpp

➞

Show inline comments

@@ @@ -1208,26 +1208,40 @@ Track NPFShipChooseTrack(const Ship *v, @@
 	 * we did not find our target, but ftd.best_trackdir contains the direction leading
 	 * to the tile closest to our target. */
 	path_found = (ftd.best_bird_dist == 0);
 	return TrackdirToTrack(ftd.best_trackdir);
+}
 bool NPFShipCheckReverse(const Ship *v)
+bool NPFShipCheckReverse(const Ship *v, Trackdir *best_td)
+{
 	NPFFindStationOrTileData fstd;
 	NPFFoundTargetData ftd;
 	NPFFillWithOrderData(&fstd, v);
 	Trackdir trackdir = v->GetVehicleTrackdir();
 	Trackdir trackdir_rev = ReverseTrackdir(trackdir);
 	assert(trackdir != INVALID_TRACKDIR);
 	assert(trackdir_rev != INVALID_TRACKDIR);
 	AyStarUserData user = { v->owner, TRANSPORT_WATER, RAILTYPES_NONE, ROADTYPES_NONE, 0 };
 	ftd = NPFRouteToStationOrTileTwoWay(v->tile, trackdir, false, v->tile, trackdir_rev, false, &fstd, &user);
 	if (best_td != nullptr) {
 		TrackdirBits rtds = DiagdirReachesTrackdirs(ReverseDiagDir(VehicleExitDir(v->direction, v->state)));
 		Trackdir best = (Trackdir)FindFirstBit2x64(rtds);
 		for (rtds = KillFirstBit(rtds); rtds != TRACKDIR_BIT_NONE; rtds = KillFirstBit(rtds)) {
 			Trackdir td = (Trackdir)FindFirstBit2x64(rtds);
 			ftd = NPFRouteToStationOrTileTwoWay(v->tile, best, false, v->tile, td, false, &fstd, &user);
 			if (ftd.best_bird_dist == 0 && NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE)) best = td;
+		}
 		if (ftd.best_bird_dist == 0) {
 			*best_td = best;
 			return true;
+		}
 	} else {
 		ftd = NPFRouteToStationOrTileTwoWay(v->tile, trackdir, false, v->tile, trackdir_rev, false, &fstd, &user);
+	}
 	/* If we didn't find anything, just keep on going straight ahead, otherwise take the reverse flag */
 	return ftd.best_bird_dist == 0 && NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE);
+}
 /*** Trains ***/

src/pathfinder/npf/npf_func.h

➞

Show inline comments

@@ @@ -43,15 +43,16 @@ Trackdir NPFRoadVehicleChooseTrack(const @@
  */
 Track NPFShipChooseTrack(const Ship *v, bool &path_found);
 /**
  * Returns true if it is better to reverse the ship before leaving depot using NPF.
  * @param v the ship leaving the depot
  * @param trackdir [out] the best of all possible reversed trackdirs
  * @return true if reversing is better
  */
 bool NPFShipCheckReverse(const Ship *v);
+bool NPFShipCheckReverse(const Ship *v, Trackdir *trackdir);
 /**
  * Used when user sends train to the nearest depot or if train needs servicing using NPF
  * @param v            train that needs to go to some depot
  * @param max_penalty  max max_penalty (in pathfinder penalty) from the current train position
  *                     (used also as optimization - the pathfinder can stop path finding if max_penalty

src/pathfinder/yapf/yapf.h

➞

Show inline comments

@@ @@ -28,15 +28,16 @@ @@
  */
 Track YapfShipChooseTrack(const Ship *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, ShipPathCache &path_cache);
 /**
  * Returns true if it is better to reverse the ship before leaving depot using YAPF.
  * @param v the ship leaving the depot
  * @param trackdir [out] the best of all possible reversed trackdirs
  * @return true if reversing is better
  */
 bool YapfShipCheckReverse(const Ship *v);
+bool YapfShipCheckReverse(const Ship *v, Trackdir *trackdir);
 /**
  * Finds the best path for given road vehicle using YAPF.
  * @param v         the RV that needs to find a path
  * @param tile      the tile to find the path from (should be next tile the RV is about to enter)
  * @param enterdir  diagonal direction which the RV will enter this new tile from

src/pathfinder/yapf/yapf_ship.cpp

➞

Show inline comments

@@ @@ -201,20 +201,21 @@ public: @@
 	 * Check whether a ship should reverse to reach its destination.
 	 * Called when leaving depot.
 	 * @param v Ship
 	 * @param tile Current position
 	 * @param td1 Forward direction
 	 * @param td2 Reverse direction
 	 * @param trackdir [out] the best of all possible reversed trackdirs
 	 * @return true if the reverse direction is better
 	 */
 	static bool CheckShipReverse(const Ship *v, TileIndex tile, Trackdir td1, Trackdir td2)
+	static bool CheckShipReverse(const Ship *v, TileIndex tile, Trackdir td1, Trackdir td2, Trackdir *trackdir)
+	{
 		/* create pathfinder instance */
 		Tpf pf;
 		/* set origin and destination nodes */
 		pf.SetOrigin(tile, TrackdirToTrackdirBits(td1) | TrackdirToTrackdirBits(td2));
+		pf.SetOrigin(tile, trackdir == nullptr ? TrackdirToTrackdirBits(td1) | TrackdirToTrackdirBits(td2) : DiagdirReachesTrackdirs(ReverseDiagDir(VehicleExitDir(v->direction, v->state))));
 		pf.SetDestination(v);
 		/* find best path */
 		if (!pf.FindPath(v)) return false;
 		Node *pNode = pf.GetBestNode();
 		if (pNode == nullptr) return false;
@@ @@ -223,14 +224,18 @@ public: @@
 		 * walk through the path back to the origin */
 		while (pNode->m_parent != nullptr) {
 			pNode = pNode->m_parent;
+		}
 		Trackdir best_trackdir = pNode->GetTrackdir();
 		assert(best_trackdir == td1 || best_trackdir == td2);
 		return best_trackdir == td2;
 		if (trackdir != nullptr) {
 			*trackdir = best_trackdir;
 		} else {
 			assert(best_trackdir == td1 || best_trackdir == td2);
+		}
 		return best_trackdir != td1;
+	}
 };
 /** Cost Provider module of YAPF for ships */
 template <class Types>
 class CYapfCostShipT
@@ @@ -350,24 +355,24 @@ Track YapfShipChooseTrack(const Ship *v, @@
+	}
 	Trackdir td_ret = pfnChooseShipTrack(v, tile, enterdir, tracks, path_found, path_cache);
 	return (td_ret != INVALID_TRACKDIR) ? TrackdirToTrack(td_ret) : INVALID_TRACK;
+}
 bool YapfShipCheckReverse(const Ship *v)
+bool YapfShipCheckReverse(const Ship *v, Trackdir *trackdir)
+{
 	Trackdir td = v->GetVehicleTrackdir();
 	Trackdir td_rev = ReverseTrackdir(td);
 	TileIndex tile = v->tile;
 	typedef bool (*PfnCheckReverseShip)(const Ship*, TileIndex, Trackdir, Trackdir);
+	typedef bool (*PfnCheckReverseShip)(const Ship*, TileIndex, Trackdir, Trackdir, Trackdir*);
 	PfnCheckReverseShip pfnCheckReverseShip = CYapfShip2::CheckShipReverse; // default: ExitDir
 	/* check if non-default YAPF type needed */
 	if (_settings_game.pf.yapf.disable_node_optimization) {
 		pfnCheckReverseShip = &CYapfShip1::CheckShipReverse; // Trackdir
+	}
 	bool reverse = pfnCheckReverseShip(v, tile, td, td_rev);
+	bool reverse = pfnCheckReverseShip(v, tile, td, td_rev, trackdir);
 	return reverse;
+}

src/ship_cmd.cpp

➞

Show inline comments

@@ @@ -332,19 +332,19 @@ void Ship::UpdateDeltaXY() @@
  */
 static Vehicle *EnsureNoMovingShipProc(Vehicle *v, void *data)
+{
 	return v->type == VEH_SHIP && (v->vehstatus & (VS_HIDDEN | VS_STOPPED)) == 0 ? v : nullptr;
+}
 static bool CheckReverseShip(const Ship *v)
+static bool CheckReverseShip(const Ship *v, Trackdir *trackdir = nullptr)
+{
 	/* Ask pathfinder for best direction */
 	bool reverse = false;
 	switch (_settings_game.pf.pathfinder_for_ships) {
 		case VPF_NPF: reverse = NPFShipCheckReverse(v); break;
 		case VPF_YAPF: reverse = YapfShipCheckReverse(v); break;
 		case VPF_NPF: reverse = NPFShipCheckReverse(v, trackdir); break;
 		case VPF_YAPF: reverse = YapfShipCheckReverse(v, trackdir); break;
 		default: NOT_REACHED();
+	}
 	return reverse;
+}
 static bool CheckShipLeaveDepot(Ship *v)
@@ @@ -722,13 +722,25 @@ static void ShipController(Ship *v) @@
 			/* New tile */
 			if (!IsValidTile(gp.new_tile)) goto reverse_direction;
 			DiagDirection diagdir = DiagdirBetweenTiles(gp.old_tile, gp.new_tile);
 			assert(diagdir != INVALID_DIAGDIR);
 			tracks = GetAvailShipTracks(gp.new_tile, diagdir);
 			if (tracks == TRACK_BIT_NONE) goto reverse_direction;
 			if (tracks == TRACK_BIT_NONE) {
 				Trackdir trackdir = INVALID_TRACKDIR;
 				CheckReverseShip(v, &trackdir);
 				if (trackdir == INVALID_TRACKDIR) goto reverse_direction;
 				static const Direction _trackdir_to_direction[] = {
 					DIR_NE, DIR_SE, DIR_E, DIR_E, DIR_S, DIR_S, INVALID_DIR, INVALID_DIR,
 					DIR_SW, DIR_NW, DIR_W, DIR_W, DIR_N, DIR_N, INVALID_DIR, INVALID_DIR,
 				};
 				v->direction = _trackdir_to_direction[trackdir];
 				assert(v->direction != INVALID_DIR);
 				v->state = TrackdirBitsToTrackBits(TrackdirToTrackdirBits(trackdir));
 				goto direction_changed;
+			}
 			/* Choose a direction, and continue if we find one */
 			track = ChooseShipTrack(v, gp.new_tile, diagdir, tracks);
 			if (track == INVALID_TRACK) goto reverse_direction;
 			b = _ship_subcoord[diagdir][track];
@@ @@ -793,12 +805,13 @@ getout: @@
 	v->UpdatePosition();
 	v->UpdateViewport(true, true);
 	return;
 reverse_direction:
 	v->direction = ReverseDir(v->direction);
 direction_changed:
 	/* Remember our current location to avoid movement glitch */
 	v->rotation_x_pos = v->x_pos;
 	v->rotation_y_pos = v->y_pos;
 	v->cur_speed = 0;
 	v->path.clear();
 	goto getout;

0 comments (0 inline, 0 general)