mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16339) -Fix: [NewGRF] When overriding 'original sounds', only allow overriding of the 'original sounds' and not any other that is already loaded.

release/1.0
rubidium 2009-05-17 17:00:30 +00:00
parent 570af0ce44
commit e3bd95e7b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@ -2039,8 +2039,8 @@ static ChangeInfoResult SoundEffectChangeInfo(uint sid, int numinfo, int prop, b
case 0x0A: { // Override old sound case 0x0A: { // Override old sound
uint orig_sound = grf_load_byte(&buf); uint orig_sound = grf_load_byte(&buf);
if (orig_sound >= GetNumSounds()) { if (orig_sound >= ORIGINAL_SAMPLE_COUNT) {
grfmsg(1, "SoundEffectChangeInfo: Original sound %d not defined (max %d)", orig_sound, GetNumSounds()); grfmsg(1, "SoundEffectChangeInfo: Original sound %d not defined (max %d)", orig_sound, ORIGINAL_SAMPLE_COUNT);
} else { } else {
FileEntry *newfe = GetSound(sound); FileEntry *newfe = GetSound(sound);
FileEntry *oldfe = GetSound(orig_sound); FileEntry *oldfe = GetSound(orig_sound);