cpp/openttd-patchpack/source Changeset - r10223:6d5e55caf12b

Changeset - r10223:6d5e55caf12b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-10-07 18:46:12
rubidium@openttd.org

(svn r14446) -Fix [FS#2330]: when a road stop gets moved make sure to update the destination of RVs going to that road stop.

1 file changed with 12 insertions and 0 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -1523,24 +1523,36 @@ static CommandCost RemoveRoadStop(Statio @@
 			if (*primary_stop == NULL) {
 				st->facilities &= (is_truck ? ~FACIL_TRUCK_STOP : ~FACIL_BUS_STOP);
+			}
 		} else {
 			/* tell the predecessor in the list to skip this stop */
 			RoadStop *pred = *primary_stop;
 			while (pred->next != cur_stop) pred = pred->next;
 			pred->next = cur_stop->next;
+		}
 		InvalidateWindowWidget(WC_STATION_VIEW, st->index, SVW_ROADVEHS);
 		delete cur_stop;
 		/* Make sure no vehicle is going to the old roadstop */
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 			if (v->type == VEH_ROAD &&
 					v->First() == v &&
 					v->current_order.IsType(OT_GOTO_STATION) &&
 					v->dest_tile == tile) {
 				v->dest_tile = v->GetOrderStationLocation(st->index);
+			}
+		}
 		DoClearSquare(tile);
 		st->rect.AfterRemoveTile(st, tile);
 		UpdateStationVirtCoordDirty(st);
 		DeleteStationIfEmpty(st);
+	}
 	return CommandCost(EXPENSES_CONSTRUCTION, (is_truck) ? _price.remove_truck_station : _price.remove_bus_station);
+}
 /** Remove a bus or truck stop
  * @param tile tile to remove the stop from

0 comments (0 inline, 0 general)