diff options
| author | michi_cc <michi_cc@openttd.org> | 2012-04-17 19:43:04 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2012-04-17 19:43:04 +0000 |
| commit | bb8506032e1f3e7122b6bd86103b0f40cf65a384 (patch) | |
| tree | ab6b2d789b3cec6e577c4c52e3cc8b1503dd3a73 | |
| parent | d3c6130f3f8f720280d017b53c011b22c2683fe6 (diff) | |
| download | openttd-bb8506032e1f3e7122b6bd86103b0f40cf65a384.tar.xz | |
(svn r24124) -Add [FS#4658]: [NewGRF] Misc engine flag to disable breakdown smoke. (Hirundo)
| -rw-r--r-- | src/engine_type.h | 1 | ||||
| -rw-r--r-- | src/vehicle.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/engine_type.h b/src/engine_type.h index 2ce1f80e9..b02795322 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 4851a4529..5f87b571e 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; } |