cpp/openttd-patchpack/source Changeset - r11235:a53af700581a

Changeset - r11235:a53af700581a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 16 years ago 2009-02-26 14:10:57
smatz@openttd.org

(svn r15589) -Fix: drawing of waypoints with invalid owner was broken
-Change: don't take over waypoints without owner, it could belong to a bankrupted company (and the code was broken) - savegame conversion code is a bit more liberal now, too

2 files changed with 5 insertions and 2 deletions:

src/waypoint.cpp

src/waypoint_gui.cpp

0 comments (0 inline, 0 general)

src/waypoint.cpp

➞

Show inline comments

@@ @@ -133,7 +133,7 @@ static Waypoint *FindDeletedWaypointClos @@
 	uint thres = 8;
 	FOR_ALL_WAYPOINTS(wp) {
-		if (wp->deleted && (wp->owner == OWNER_NONE || wp->owner == _current_company)) {
 		if (wp->deleted && wp->owner == _current_company) {
 			uint cur_dist = DistanceManhattan(tile, wp->xy);
 			if (cur_dist < thres) {

src/waypoint_gui.cpp

➞

Show inline comments

@@ @@ -36,7 +36,7 @@ public: @@
 	WaypointWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
+	{
 		this->wp = GetWaypoint(this->window_number);
 		this->owner = this->wp->owner;
+		if (this->wp->owner != OWNER_NONE) this->owner = this->wp->owner;
 		this->flags4 |= WF_DISABLE_VP_SCROLL;
 		InitializeWindowViewport(this, 3, 17, 254, 86, this->wp->xy, ZOOM_LVL_MIN);
@@ @@ -53,6 +53,9 @@ public: @@
+	{
 		/* You can only change your own waypoints */
 		this->SetWidgetDisabledState(WAYPVW_RENAME, this->wp->owner != _local_company);
 		/* Disable the widget for waypoints with no owner (after company bankrupt) */
 		this->SetWidgetDisabledState(WAYPVW_SHOW_TRAINS, this->wp->owner == OWNER_NONE);
 		SetDParam(0, this->wp->index);
 		this->DrawWidgets();

0 comments (0 inline, 0 general)