cpp/openttd-patchpack/source Changeset - r16499:ef8c79ee983e

Changeset - r16499:ef8c79ee983e

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 14 years ago 2010-11-18 14:09:39
rubidium@openttd.org

(svn r21235) -Codechange: Move Train::UpdateVisualEffect to the Vehicle class (Hirundo)

4 files changed with 47 insertions and 46 deletions:

src/train.h

src/train_cmd.cpp

src/vehicle.cpp

src/vehicle_base.h

0 comments (0 inline, 0 general)

src/train.h

➞

Show inline comments

@@ @@ -365,8 +365,6 @@ struct Train : public GroundVehicle<Trai @@
 protected: // These functions should not be called outside acceleration code.
 	void UpdateVisualEffect(bool allow_power_change);
 	/**
 	 * Allows to know the power value that this vehicle will use.
 	 * @return Power value from the engine in HP, or zero if the vehicle is not powered.

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -139,50 +139,6 @@ void Train::RailtypeChanged() @@
+}
 /**
  * Update the cached visual effect.
  * @param allow_power_change true if the wagon-is-powered-state may change.
  */
 void Train::UpdateVisualEffect(bool allow_power_change)
+{
 	bool powered_before = HasBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER);
 	this->vcache.cached_vis_effect = 0;
 	const Engine *e = Engine::Get(this->engine_type);
 	if (this->type == VEH_TRAIN) {
 		if (e->u.rail.visual_effect != 0) {
 			this->vcache.cached_vis_effect = e->u.rail.visual_effect;
 		} else {
 			Train *t = Train::From(this);
 			if (t->IsWagon() || t->IsArticulatedPart()) {
 				/* Wagons and articulated parts have no effect by default */
 				SetBit(this->vcache.cached_vis_effect, VE_DISABLE_EFFECT);
 			} else if (e->u.rail.engclass == 0) {
 				/* Steam is offset by -4 units */
 				SB(this->vcache.cached_vis_effect, VE_OFFSET_START, VE_OFFSET_COUNT, VE_OFFSET_CENTRE - 4);
 			} else {
 				/* Diesel fumes and sparks come from the centre */
 				SB(this->vcache.cached_vis_effect, VE_OFFSET_START, VE_OFFSET_COUNT, VE_OFFSET_CENTRE);
+			}
+		}
 	} else {
 		/* Non-trains do not have a visual effect by default. */
 		SetBit(this->vcache.cached_vis_effect, VE_DISABLE_EFFECT);
+	}
 	/* Check powered wagon / visual effect callback */
 	if (HasBit(e->info.callback_mask, CBM_VEHICLE_VISUAL_EFFECT)) {
 		uint16 callback = GetVehicleCallback(CBID_VEHICLE_VISUAL_EFFECT, 0, 0, this->engine_type, this);
 		if (callback != CALLBACK_FAILED) this->vcache.cached_vis_effect = GB(callback, 0, 8);
+	}
 	if (!allow_power_change && powered_before != HasBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER)) {
 		ToggleBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER);
 		ShowNewGrfVehicleError(this->engine_type, STR_NEWGRF_BROKEN, STR_NEWGRF_BROKEN_POWERED_WAGON, GBUG_VEH_POWERED_WAGON, false);
+	}
+}
 /**
  * Recalculates the cached stuff of a train. Should be called each time a vehicle is added
  * to/removed from the chain, and when the game is loaded.
  * Note: this needs to be called too for 'wagon chains' (in the depot, without an engine)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1855,6 +1855,47 @@ CommandCost Vehicle::SendToDepot(DoComma @@
+}
 void Vehicle::UpdateVisualEffect(bool allow_power_change)
+{
 	bool powered_before = HasBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER);
 	this->vcache.cached_vis_effect = 0;
 	const Engine *e = Engine::Get(this->engine_type);
 	if (this->type == VEH_TRAIN) {
 		if (e->u.rail.visual_effect != 0) {
 			this->vcache.cached_vis_effect = e->u.rail.visual_effect;
 		} else {
 			Train *t = Train::From(this);
 			if (t->IsWagon() || t->IsArticulatedPart()) {
 				/* Wagons and articulated parts have no effect by default */
 				SetBit(this->vcache.cached_vis_effect, VE_DISABLE_EFFECT);
 			} else if (e->u.rail.engclass == 0) {
 				/* Steam is offset by -4 units */
 				SB(this->vcache.cached_vis_effect, VE_OFFSET_START, VE_OFFSET_COUNT, VE_OFFSET_CENTRE - 4);
 			} else {
 				/* Diesel fumes and sparks come from the centre */
 				SB(this->vcache.cached_vis_effect, VE_OFFSET_START, VE_OFFSET_COUNT, VE_OFFSET_CENTRE);
+			}
+		}
 	} else {
 		/* Non-trains do not have a visual effect by default. */
 		SetBit(this->vcache.cached_vis_effect, VE_DISABLE_EFFECT);
+	}
 	/* Check powered wagon / visual effect callback */
 	if (HasBit(e->info.callback_mask, CBM_VEHICLE_VISUAL_EFFECT)) {
 		uint16 callback = GetVehicleCallback(CBID_VEHICLE_VISUAL_EFFECT, 0, 0, this->engine_type, this);
 		if (callback != CALLBACK_FAILED) this->vcache.cached_vis_effect = GB(callback, 0, 8);
+	}
 	if (!allow_power_change && powered_before != HasBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER)) {
 		ToggleBit(this->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER);
 		ShowNewGrfVehicleError(this->engine_type, STR_NEWGRF_BROKEN, STR_NEWGRF_BROKEN_POWERED_WAGON, GBUG_VEH_POWERED_WAGON, false);
+	}
+}
 void Vehicle::SetNext(Vehicle *next)
+{
 	assert(this != next);

src/vehicle_base.h

➞

Show inline comments

@@ @@ -613,6 +613,12 @@ public: @@
 	CommandCost SendToDepot(DoCommandFlag flags, DepotCommand command);
 	/**
 	 * Update the cached visual effect.
 	 * @param allow_power_change true if the wagon-is-powered-state may change.
 	 */
 	void UpdateVisualEffect(bool allow_power_change = true);
 	/**
 	 * Increments cur_order_index, keeps care of the wrap-around and invalidates the GUI.
 	 * Note: current_order is not invalidated.
 	 */

0 comments (0 inline, 0 general)