cpp/openttd-patchpack/source Changeset - r16496:c142accc49f9

Changeset - r16496:c142accc49f9

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-11-18 14:03:12
rubidium@openttd.org

(svn r21232) -Codechange: Move cached_vis_effect from the TrainCache to the VehicleCache (Hirundo)

3 files changed with 20 insertions and 20 deletions:

src/train.h

src/train_cmd.cpp

src/vehicle_base.h

0 comments (0 inline, 0 general)

src/train.h

➞

Show inline comments

@@ @@ -78,14 +78,6 @@ struct TrainCache { @@
 	/* cached max. speed / acceleration data */
 	int cached_max_curve_speed; ///< max consist speed limited by curves
 	/**
 	 * Position/type of visual effect.
 	 * bit 0 - 3 = position of effect relative to vehicle. (0 = front, 8 = centre, 15 = rear)
 	 * bit 4 - 5 = type of effect. (0 = default for engine class, 1 = steam, 2 = diesel, 3 = electric)
 	 * bit     6 = disable visual effect.
 	 * bit     7 = disable powered wagons.
 	 */
 	byte cached_vis_effect;
 	byte user_def_data;
 	EngineID first_engine;  ///< cached EngineID of the front vehicle. INVALID_ENGINE for the front vehicle itself.

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -144,21 +144,21 @@ void Train::RailtypeChanged() @@
  */
 void Train::UpdateVisualEffect(bool allow_power_change)
+{
-	byte powered_before = this->tcache.cached_vis_effect & 0x80;
+	byte powered_before = this->vcache.cached_vis_effect & 0x80;
 	const Engine *e = Engine::Get(this->engine_type);
 	if (e->u.rail.visual_effect != 0) {
-		this->tcache.cached_vis_effect = e->u.rail.visual_effect;
+		this->vcache.cached_vis_effect = e->u.rail.visual_effect;
 	} else {
 		if (this->IsWagon() || this->IsArticulatedPart()) {
 			/* Wagons and articulated parts have no effect by default */
-			this->tcache.cached_vis_effect = 0x40;
+			this->vcache.cached_vis_effect = 0x40;
 		} else if (e->u.rail.engclass == 0) {
 			/* Steam is offset by -4 units */
-			this->tcache.cached_vis_effect = 4;
+			this->vcache.cached_vis_effect = 4;
 		} else {
 			/* Diesel fumes and sparks come from the centre */
-			this->tcache.cached_vis_effect = 8;
+			this->vcache.cached_vis_effect = 8;
+		}
+	}
@@ @@ -166,11 +166,11 @@ void Train::UpdateVisualEffect(bool allo @@
 	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->tcache.cached_vis_effect = GB(callback, 0, 8);
+		if (callback != CALLBACK_FAILED) this->vcache.cached_vis_effect = GB(callback, 0, 8);
+	}
 	if (!allow_power_change && powered_before != (this->tcache.cached_vis_effect & 0x80)) {
 		this->tcache.cached_vis_effect ^= 0x80;
 	if (!allow_power_change && powered_before != (this->vcache.cached_vis_effect & 0x80)) {
 		this->vcache.cached_vis_effect ^= 0x80;
 		ShowNewGrfVehicleError(this->engine_type, STR_NEWGRF_BROKEN, STR_NEWGRF_BROKEN_POWERED_WAGON, GBUG_VEH_POWERED_WAGON, false);
+	}
+}
@@ @@ -235,7 +235,7 @@ void Train::ConsistChanged(bool same_len @@
 		u->UpdateVisualEffect(true);
 		if (rvi_v->pow_wag_power != 0 && rvi_u->railveh_type == RAILVEH_WAGON &&
-				UsesWagonOverride(u) && !HasBit(u->tcache.cached_vis_effect, 7)) {
+				UsesWagonOverride(u) && !HasBit(u->vcache.cached_vis_effect, 7)) {
 			/* wagon is powered */
 			SetBit(u->flags, VRF_POWEREDWAGON); // cache 'powered' status
 		} else {
@@ @@ -1949,9 +1949,9 @@ static void HandleLocomotiveSmokeCloud(c @@
 	do {
 		const RailVehicleInfo *rvi = RailVehInfo(v->engine_type);
 		int effect_offset = GB(v->tcache.cached_vis_effect, 0, 4) - 8;
 		byte effect_type = GB(v->tcache.cached_vis_effect, 4, 2);
 		bool disable_effect = HasBit(v->tcache.cached_vis_effect, 6);
 		int effect_offset = GB(v->vcache.cached_vis_effect, 0, 4) - 8;
 		byte effect_type = GB(v->vcache.cached_vis_effect, 4, 2);
 		bool disable_effect = HasBit(v->vcache.cached_vis_effect, 6);
 		/* no smoke? */
 		if ((rvi->railveh_type == RAILVEH_WAGON && effect_type == 0) ||

src/vehicle_base.h

➞

Show inline comments

@@ @@ -67,6 +67,14 @@ struct NewGRFCache { @@
 /** Cached often queried values common to all vehicles. */
 struct VehicleCache {
 	uint16 cached_max_speed; ///< Maximum speed of the consist (minimum of the max speed of all vehicles in the consist).
 	/**
 	 * Position/type of visual effect.
 	 * bit 0 - 3 = position of effect relative to vehicle. (0 = front, 8 = centre, 15 = rear)
 	 * bit 4 - 5 = type of effect. (0 = default for engine class, 1 = steam, 2 = diesel, 3 = electric)
 	 * bit     6 = disable visual effect.
 	 * bit     7 = disable powered wagons (trains only).
 	 */
 	byte cached_vis_effect;
 };
 /** A vehicle pool for a little over 1 million vehicles. */

0 comments (0 inline, 0 general)