From 21591b5219a99a9d798c43dc2d89e7d00475f7cd Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 1 Oct 2006 17:56:38 +0000 Subject: (svn r6611) - Newsounds: - If the NewGRF sound effect chosen doesn't exist, then ignore it. - Play load/unload sound if provided. --- economy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'economy.c') diff --git a/economy.c b/economy.c index c2984123d..5a66be14c 100644 --- a/economy.c +++ b/economy.c @@ -28,6 +28,7 @@ #include "ai/ai.h" #include "train.h" #include "newgrf_engine.h" +#include "newgrf_sound.h" #include "unmovable.h" #include "date.h" @@ -1464,7 +1465,9 @@ int LoadUnloadVehicle(Vehicle *v) v->profit_this_year += profit; SubtractMoneyFromPlayer(-profit); - if (IsLocalPlayer()) SndPlayVehicleFx(SND_14_CASHTILL, v); + if (IsLocalPlayer() && !PlayVehicleSound(v, VSE_LOAD_UNLOAD)) { + SndPlayVehicleFx(SND_14_CASHTILL, v); + } ShowCostOrIncomeAnimation(v->x_pos, v->y_pos, v->z_pos, -profit); } -- cgit v1.2.3-70-g09d2