cpp/openttd-patchpack/source Changeset - r8928:b99c60f72521

Changeset - r8928:b99c60f72521

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 16 years ago 2008-04-14 07:08:43
rubidium@openttd.org

(svn r12698) -Codechange: skip orders to stations that do not have a train part anymore, just like is done for road vehicles and ships.

2 files changed with 9 insertions and 2 deletions:

src/ship_cmd.cpp

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/ship_cmd.cpp

➞

Show inline comments

@@ @@ -234,25 +234,25 @@ static void PlayShipSound(const Vehicle @@
+	}
+}
 void Ship::PlayLeaveStationSound() const
+{
 	PlayShipSound(this);
+}
 TileIndex Ship::GetOrderStationLocation(StationID station)
+{
 	if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION;
 	Station *st = GetStation(station);
+	const Station *st = GetStation(station);
 	if (st->dock_tile != 0) {
 		return TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile)));
 	} else {
 		this->cur_order_index++;
 		return 0;
+	}
+}
 void Ship::UpdateDeltaXY(Direction direction)
+{
 #define MKIT(a, b, c, d) ((a & 0xFF) << 24) | ((b & 0xFF) << 16) | ((c & 0xFF) << 8) | ((d & 0xFF) << 0)
 	static const uint32 _delta_xy_table[8] = {

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -2554,25 +2554,32 @@ bad:; @@
 				reverse = 2;
+			}
 		} break;
+	}
 	return reverse_best != 0;
+}
 TileIndex Train::GetOrderStationLocation(StationID station)
+{
 	if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION;
 	return GetStation(station)->xy;
 	const Station *st = GetStation(station);
 	if (!(st->facilities & FACIL_TRAIN)) {
 		/* The destination station has no trainstation tiles. */
 		this->cur_order_index++;
 		return 0;
+	}
 	return st->xy;
+}
 void Train::MarkDirty()
+{
 	Vehicle *v = this;
 	do {
 		v->cur_image = v->GetImage(v->direction);
 		MarkSingleVehicleDirty(v);
 	} while ((v = v->Next()) != NULL);
 	/* need to update acceleration and cached values since the goods on the train changed. */
 	TrainCargoChanged(this);

0 comments (0 inline, 0 general)