diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-17 14:57:14 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-17 14:57:14 +0000 |
| commit | 83dc6ef6e6064441c9a5ebc22061de313147821a (patch) | |
| tree | 8b0b8b6ca9e6aaf81fe59ebc54ae306fba452ff7 /src/newgrf_sound.cpp | |
| parent | 10ea72a08e52cf9aaa54551ce201a6091316d47a (diff) | |
| download | openttd-83dc6ef6e6064441c9a5ebc22061de313147821a.tar.xz | |
(svn r16337) -Codechange: remove pointless variable + wrapper function; having it return anything else than ORIGINAL_SAMPLE_COUNT is asking for NewGRFs failing to load (due to invalid sample index), thus desyncs
Diffstat (limited to 'src/newgrf_sound.cpp')
| -rw-r--r-- | src/newgrf_sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_sound.cpp b/src/newgrf_sound.cpp index 7f8f31179..72f2da840 100644 --- a/src/newgrf_sound.cpp +++ b/src/newgrf_sound.cpp @@ -60,7 +60,7 @@ bool PlayVehicleSound(const Vehicle *v, VehicleSoundEvent event) callback = GetVehicleCallback(CBID_VEHICLE_SOUND_EFFECT, event, 0, v->engine_type, v); if (callback == CALLBACK_FAILED) return false; - if (callback >= GetNumOriginalSounds()) callback += file->sound_offset - GetNumOriginalSounds(); + if (callback >= ORIGINAL_SAMPLE_COUNT) callback += file->sound_offset - ORIGINAL_SAMPLE_COUNT; if (callback < GetNumSounds()) SndPlayVehicleFx((SoundFx)callback, v); return true; @@ -68,7 +68,7 @@ bool PlayVehicleSound(const Vehicle *v, VehicleSoundEvent event) bool PlayTileSound(const GRFFile *file, uint16 sound_id, TileIndex tile) { - if (sound_id >= GetNumOriginalSounds()) sound_id += file->sound_offset - GetNumOriginalSounds(); + if (sound_id >= ORIGINAL_SAMPLE_COUNT) sound_id += file->sound_offset - ORIGINAL_SAMPLE_COUNT; if (sound_id < GetNumSounds()) { SndPlayTileFx((SoundFx)sound_id, tile); |