cpp/openttd-patchpack/source Changeset - r16513:b3de64b723cb

Changeset - r16513:b3de64b723cb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

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

(svn r21249) -Fix (r21240, r21236) [FS#4242]: rear ends of dualheaded engines didn't smoke nor spark (Hirundo)

1 file changed with 2 insertions and 2 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1868,13 +1868,13 @@ void Vehicle::UpdateVisualEffect(bool al @@
 		case VEH_TRAIN:    default_effect = e->u.rail.visual_effect; break;
 		case VEH_ROAD:     default_effect = e->u.road.visual_effect; break;
 		case VEH_SHIP:     default_effect = e->u.ship.visual_effect; break;
 		default: break;
+	}
 	if (default_effect == VE_DEFAULT) {
-		if (this->type == VEH_TRAIN && Train::From(this)->IsEngine()) {
+		if (this->type == VEH_TRAIN && !(Train::From(this)->IsWagon() || Train::From(this)->IsArticulatedPart())) {
 			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);
@@ @@ -1952,13 +1952,13 @@ void Vehicle::ShowVisualEffect() const @@
 				(v->type == VEH_TRAIN &&
 				!HasPowerOnRail(Train::From(v)->railtype, GetTileRailType(v->tile)))) {
 			continue;
+		}
 		if (effect_type == VE_TYPE_DEFAULT) {
-			if (v->type == VEH_TRAIN && Train::From(v)->IsEngine()) {
 			if (v->type == VEH_TRAIN) {
 				/* Use default effect type for engine class. */
 				effect_type = RailVehInfo(v->engine_type)->engclass + 1;
 			} else {
 				/* No default effect exists, so continue */
 				continue;
+			}

0 comments (0 inline, 0 general)