(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.

6 files changed, 21 insertions, 9 deletions

diff --git a/src/openttd.cpp b/src/openttd.cpp
index dbc1ebaeb..95551dbb5 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -2516,6 +2516,15 @@ bool AfterLoadGame()
 				}
 			}
 		}
+
+		/* Give owners to waypoints, based on rail tracks it is sitting on.
+		 * If none is available, specify OWNER_NONE */
+		Waypoint *wp;
+		Owner owner;
+		FOR_ALL_WAYPOINTS(wp) {
+			owner = GetTileOwner(wp->xy);
+			wp->owner = IsValidPlayerID(owner) ? owner : OWNER_NONE;
+		}
 	}
 
 	GamelogPrintDebug(1);
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index b71fbc8c1..814d819b4 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -442,7 +442,7 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 			if (!IsValidWaypointID(new_order.GetDestination())) return CMD_ERROR;
 			const Waypoint *wp = GetWaypoint(new_order.GetDestination());
 
-			if (!CheckOwnership(GetTileOwner(wp->xy))) return CMD_ERROR;
+			if (!CheckOwnership(wp->owner)) return CMD_ERROR;
 
 			/* Order flags can be any of the following for waypoints:
 			 * [non-stop]
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 55f254532..821b15413 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1182,7 +1182,7 @@ void ShowVehicleListWindow(PlayerID player, VehicleType vehicle_type)
 void ShowVehicleListWindow(const Waypoint *wp)
 {
 	if (wp == NULL) return;
-	ShowVehicleListWindowLocal(GetTileOwner(wp->xy), VLW_WAYPOINT_LIST, VEH_TRAIN, wp->index);
+	ShowVehicleListWindowLocal(wp->owner, VLW_WAYPOINT_LIST, VEH_TRAIN, wp->index);
 }
 
 void ShowVehicleListWindow(const Vehicle *v)
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index 58dd92a9c..7343b9317 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -207,7 +207,8 @@ CommandCost CmdBuildTrainWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint3
 		return_cmd_error(STR_1005_NO_SUITABLE_RAILROAD_TRACK);
 	}
 
-	if (!CheckTileOwnership(tile)) return CMD_ERROR;
+	Owner owner = GetTileOwner(tile);
+	if (!CheckOwnership(owner)) return CMD_ERROR;
 	if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 
 	tileh = GetTileSlope(tile, NULL);
@@ -230,6 +231,7 @@ CommandCost CmdBuildTrainWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint3
 			wp->town_index = INVALID_TOWN;
 			wp->name = NULL;
 			wp->town_cn = 0;
+			wp->owner = owner;
 		} else {
 			/* Move existing (recently deleted) waypoint to the new location */
 
@@ -252,7 +254,7 @@ CommandCost CmdBuildTrainWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint3
 		const StationSpec* statspec;
 
 		bool reserved = HasBit(GetTrackReservation(tile), AxisToTrack(axis));
-		MakeRailWaypoint(tile, GetTileOwner(tile), axis, GetRailType(tile), wp->index);
+		MakeRailWaypoint(tile, owner, axis, GetRailType(tile), wp->index);
 		SetDepotWaypointReservation(tile, reserved);
 		MarkTileDirtyByTile(tile);
 
@@ -316,7 +318,6 @@ CommandCost RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
 
 	if (flags & DC_EXEC) {
 		Track track = GetRailWaypointTrack(tile);
-		Owner owner = GetTileOwner(tile); // cannot use _current_player because of possible floods
 		wp = GetWaypointByTile(tile);
 
 		wp->deleted = 30; // let it live for this many days before we do the actual deletion.
@@ -326,7 +327,7 @@ CommandCost RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
 		if (justremove) {
 			TrackBits tracks = GetRailWaypointBits(tile);
 			bool reserved = GetDepotWaypointReservation(tile);
-			MakeRailNormal(tile, GetTileOwner(tile), tracks, GetRailType(tile));
+			MakeRailNormal(tile, wp->owner, tracks, GetRailType(tile));
 			if (reserved) SetTrackReservation(tile, tracks);
 			MarkTileDirtyByTile(tile);
 		} else {
@@ -335,7 +336,7 @@ CommandCost RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
 				if (v != NULL) FreeTrainTrackReservation(v);
 			}
 			DoClearSquare(tile);
-			AddTrackToSignalBuffer(tile, track, owner);
+			AddTrackToSignalBuffer(tile, track, wp->owner);
 		}
 		YapfNotifyTrackLayoutChange(tile, track);
 		if (v != NULL) TryPathReserve(v, true);
@@ -505,6 +506,7 @@ static const SaveLoad _waypoint_desc[] = {
 	SLE_CONDVAR(Waypoint, build_date, SLE_INT32,                  31, SL_MAX_VERSION),
 	SLE_CONDVAR(Waypoint, localidx,   SLE_UINT8,                   3, SL_MAX_VERSION),
 	SLE_CONDVAR(Waypoint, grfid,      SLE_UINT32,                 17, SL_MAX_VERSION),
+	SLE_CONDVAR(Waypoint, owner,      SLE_UINT8,                 101, SL_MAX_VERSION),
 
 	SLE_END()
 };
diff --git a/src/waypoint.h b/src/waypoint.h
index ee664e605..1d0e64ca4 100644
--- a/src/waypoint.h
+++ b/src/waypoint.h
@@ -25,6 +25,7 @@ struct Waypoint : PoolItem<Waypoint, WaypointID, &_Waypoint_pool> {
 
 	ViewportSign sign; ///< Dimensions of sign (not saved)
 	Date build_date;   ///< Date of construction
+	Owner owner;       ///< Whom this waypoint belongs to
 
 	byte stat_id;      ///< ID of waypoint within the waypoint class (not saved)
 	uint32 grfid;      ///< ID of GRF file
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index 1f1b81f15..75d9d4798 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -37,7 +37,7 @@ public:
 	WaypointWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
 		this->wp = GetWaypoint(this->window_number);
-		this->caption_color = (byte)GetTileOwner(this->wp->xy);
+		this->caption_color = this->wp->owner;
 
 		this->flags4 |= WF_DISABLE_VP_SCROLL;
 		InitializeWindowViewport(this, 3, 17, 254, 86, this->wp->xy, ZOOM_LVL_MIN);
@@ -48,7 +48,7 @@ public:
 	virtual void OnPaint()
 	{
 		/* You can only change your own waypoints */
-		this->SetWidgetDisabledState(WAYPVW_RENAME, !CheckTileOwnership(this->wp->xy));
+		this->SetWidgetDisabledState(WAYPVW_RENAME, !CheckOwnership(this->wp->owner));
 		SetDParam(0, this->wp->index);
 		this->DrawWidgets();