From bb8506032e1f3e7122b6bd86103b0f40cf65a384 Mon Sep 17 00:00:00 2001 From: michi_cc Date: Tue, 17 Apr 2012 19:43:04 +0000 Subject: [PATCH] (svn r24124) -Add [FS#4658]: [NewGRF] Misc engine flag to disable breakdown smoke. (Hirundo) --- src/engine_type.h | 1 + src/vehicle.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine_type.h b/src/engine_type.h index 2ce1f80e9a..b02795322c 100644 --- a/src/engine_type.h +++ b/src/engine_type.h @@ -157,6 +157,7 @@ enum EngineMiscFlags { EF_RAIL_FLIPS = 3, ///< Rail vehicle can be flipped in the depot EF_AUTO_REFIT = 4, ///< Automatic refitting is allowed EF_NO_DEFAULT_CARGO_MULTIPLIER = 5, ///< Use the new capacity algorithm. The default cargotype of the vehicle does not affect capacity multipliers. CB 15 is also called in purchase list. + EF_NO_BREAKDOWN_SMOKE = 6, ///< Do not show black smoke during a breakdown. }; /** diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 4851a4529e..5f87b571e0 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1146,7 +1146,7 @@ bool Vehicle::HandleBreakdown() (this->type == VEH_TRAIN ? SND_3A_COMEDY_BREAKDOWN_2 : SND_35_COMEDY_BREAKDOWN), this); } - if (!(this->vehstatus & VS_HIDDEN)) { + if (!(this->vehstatus & VS_HIDDEN) && !HasBit(EngInfo(this->engine_type)->misc_flags, EF_NO_BREAKDOWN_SMOKE)) { EffectVehicle *u = CreateEffectVehicleRel(this, 4, 4, 5, EV_BREAKDOWN_SMOKE); if (u != NULL) u->animation_state = this->breakdown_delay * 2; }