mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r26706) -Fix [FS#6015] (r20644): wrong breakdown sound was played for ships
This commit is contained in:
parent
3822f85379
commit
3d2895dbd1
|
@ -1206,9 +1206,10 @@ bool Vehicle::HandleBreakdown()
|
||||||
this->cur_speed = 0;
|
this->cur_speed = 0;
|
||||||
|
|
||||||
if (!PlayVehicleSound(this, VSE_BREAKDOWN)) {
|
if (!PlayVehicleSound(this, VSE_BREAKDOWN)) {
|
||||||
|
bool train_or_ship = this->type == VEH_TRAIN || this->type == VEH_SHIP;
|
||||||
SndPlayVehicleFx((_settings_game.game_creation.landscape != LT_TOYLAND) ?
|
SndPlayVehicleFx((_settings_game.game_creation.landscape != LT_TOYLAND) ?
|
||||||
(this->type == VEH_TRAIN ? SND_10_TRAIN_BREAKDOWN : SND_0F_VEHICLE_BREAKDOWN) :
|
(train_or_ship ? SND_10_TRAIN_BREAKDOWN : SND_0F_VEHICLE_BREAKDOWN) :
|
||||||
(this->type == VEH_TRAIN ? SND_3A_COMEDY_BREAKDOWN_2 : SND_35_COMEDY_BREAKDOWN), this);
|
(train_or_ship ? SND_3A_COMEDY_BREAKDOWN_2 : SND_35_COMEDY_BREAKDOWN), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(this->vehstatus & VS_HIDDEN) && !HasBit(EngInfo(this->engine_type)->misc_flags, EF_NO_BREAKDOWN_SMOKE)) {
|
if (!(this->vehstatus & VS_HIDDEN) && !HasBit(EngInfo(this->engine_type)->misc_flags, EF_NO_BREAKDOWN_SMOKE)) {
|
||||||
|
|
Loading…
Reference in New Issue