Mercurial > hg > openttd
changeset 4701:9bb6ea735208 draft
(svn r6611) - Newsounds:
- If the NewGRF sound effect chosen doesn't exist, then ignore it.
- Play load/unload sound if provided.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Sun, 01 Oct 2006 17:56:38 +0000 |
parents | 64f878a3455b |
children | dd2154e7bbb5 |
files | economy.c newgrf_sound.c |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ 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); }
--- a/newgrf_sound.c +++ b/newgrf_sound.c @@ -68,6 +68,6 @@ if (callback == CALLBACK_FAILED) return false; if (callback >= GetNumOriginalSounds()) callback += file->sound_offset - GetNumOriginalSounds(); - SndPlayVehicleFx(callback, v); + if (callback < GetNumSounds()) SndPlayVehicleFx(callback, v); return true; }