# HG changeset patch
# User smatz <smatz@openttd.org>
# Date 2011-01-21 16:20:55
# Node ID 8e7f5d0ba4e40733841fb56cce55170b9915b0be
# Parent  b566a5a5d36c717ad70604e899645af3179a291f

(svn r21879) -Codechange: reset vehicle's GOINGUP/DOWN bits when it crashes

diff --git a/src/ground_vehicle.hpp b/src/ground_vehicle.hpp
--- a/src/ground_vehicle.hpp
+++ b/src/ground_vehicle.hpp
@@ -87,6 +87,21 @@ struct GroundVehicle : public Specialize
 	int GetAcceleration() const;
 
 	/**
+	 * Common code executed for crashed ground vehicles
+	 * @param flooded was this vehicle flooded?
+	 * @return number of victims
+	 */
+	/* virtual */ uint Crash(bool flooded)
+	{
+		/* Crashed vehicles aren't going up or down */
+		for (T *v = T::From(this); v != NULL; v = v->Next()) {
+			ClrBit(v->gv_flags, GVF_GOINGUP_BIT);
+			ClrBit(v->gv_flags, GVF_GOINGDOWN_BIT);
+		}
+		return this->Vehicle::Crash(flooded);
+	}
+
+	/**
 	 * Calculates the total slope resistance for this vehicle.
 	 * @return Slope resistance.
 	 */
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -460,7 +460,7 @@ static Vehicle *EnumCheckRoadVehCrashTra
 
 uint RoadVehicle::Crash(bool flooded)
 {
-	uint pass = Vehicle::Crash(flooded);
+	uint pass = this->GroundVehicleBase::Crash(flooded);
 	if (this->IsFrontEngine()) {
 		pass += 1; // driver
 
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2780,7 +2780,7 @@ uint Train::Crash(bool flooded)
 		HideFillingPercent(&this->fill_percent_te_id);
 	}
 
-	pass += Vehicle::Crash(flooded);
+	pass += this->GroundVehicleBase::Crash(flooded);
 
 	this->crash_anim_pos = flooded ? 4000 : 1; // max 4440, disappear pretty fast when flooded
 	return pass;