cpp/openttd-patchpack/source File Diff

File diff r12009:28cf5f05f012 → r12010:5513d8f8e97d

src/npf.cpp

➞

Show inline comments

@@ @@ -422,13 +422,13 @@ static int32 NPFFindDepot(AyStar *as, Op @@
 		AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
+}
 /** Find any safe and free tile. */
 static int32 NPFFindSafeTile(AyStar *as, OpenListNode *current)
+{
 	const Train *v = (Train *)((NPFFindStationOrTileData*)as->user_target)->v;
+	const Train *v = (const Train *)((NPFFindStationOrTileData*)as->user_target)->v;
 	return
 		IsSafeWaitingPosition(v, current->path.node.tile, current->path.node.direction, true, _settings_game.pf.forbid_90_deg) &&
 		IsWaitingPositionFree(v, current->path.node.tile, current->path.node.direction, _settings_game.pf.forbid_90_deg) ?
 			AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
+}
@@ @@ -503,13 +503,13 @@ static void NPFSaveTargetData(AyStar *as @@
 	ftd->best_bird_dist = 0;
 	ftd->node = current->path.node;
 	ftd->res_okay = false;
 	if (as->user_target != NULL && ((NPFFindStationOrTileData*)as->user_target)->reserve_path && as->user_data[NPF_TYPE] == TRANSPORT_RAIL) {
 		/* Path reservation is requested. */
 		const Train *v = (Train *)((NPFFindStationOrTileData*)as->user_target)->v;
+		const Train *v = (const Train *)((NPFFindStationOrTileData*)as->user_target)->v;
 		const PathNode *target = FindSafePosition(&current->path, v);
 		ftd->node = target->node;
 		/* If the target is a station skip to platform end. */
 		if (IsRailwayStationTile(target->node.tile)) {