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

(svn r19679) -Fix: [NewGRF] make sure newgrfs can't overwrite sound effect properties from other newgrfs

release/1.1
yexo 2010-04-20 05:52:51 +00:00
parent df4d8b3bc9
commit 92e36c87fd
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/newgrf.cpp
View File

@ -2082,21 +2082,21 @@ static ChangeInfoResult SoundEffectChangeInfo(uint sid, int numinfo, int prop, B
return CIR_INVALID_ID; return CIR_INVALID_ID;
} }
for (int i = 0; i < numinfo; i++) { if (sid + numinfo - ORIGINAL_SAMPLE_COUNT >= _cur_grffile->num_sounds) {
SoundID sound = sid + i + _cur_grffile->sound_offset - ORIGINAL_SAMPLE_COUNT; grfmsg(1, "SoundEffectChangeInfo: Attemting to change undefined sound effect (%u), max (%u). Ignoring.", sid + numinfo, ORIGINAL_SAMPLE_COUNT + _cur_grffile->num_sounds);
return CIR_INVALID_ID;
}
if (sound >= GetNumSounds()) { for (int i = 0; i < numinfo; i++) {
grfmsg(1, "SoundEffectChangeInfo: Sound %d not defined (max %d)", sound, GetNumSounds()); SoundEntry *sound = GetSound(sid + i + _cur_grffile->sound_offset - ORIGINAL_SAMPLE_COUNT);
return CIR_INVALID_ID;
}
switch (prop) { switch (prop) {
case 0x08: // Relative volume case 0x08: // Relative volume
GetSound(sound)->volume = buf->ReadByte(); sound->volume = buf->ReadByte();
break; break;
case 0x09: // Priority case 0x09: // Priority
GetSound(sound)->priority = buf->ReadByte(); sound->priority = buf->ReadByte();
break; break;
case 0x0A: { // Override old sound case 0x0A: { // Override old sound
@ -2105,11 +2105,10 @@ static ChangeInfoResult SoundEffectChangeInfo(uint sid, int numinfo, int prop, B
if (orig_sound >= ORIGINAL_SAMPLE_COUNT) { if (orig_sound >= ORIGINAL_SAMPLE_COUNT) {
grfmsg(1, "SoundEffectChangeInfo: Original sound %d not defined (max %d)", orig_sound, ORIGINAL_SAMPLE_COUNT); grfmsg(1, "SoundEffectChangeInfo: Original sound %d not defined (max %d)", orig_sound, ORIGINAL_SAMPLE_COUNT);
} else { } else {
SoundEntry *new_sound = GetSound(sound);
SoundEntry *old_sound = GetSound(orig_sound); SoundEntry *old_sound = GetSound(orig_sound);
/* Literally copy the data of the new sound over the original */ /* Literally copy the data of the new sound over the original */
*old_sound = *new_sound; *old_sound = *sound;
} }
} break; } break;
@ -5655,7 +5654,10 @@ static void GRFSound(ByteReader *buf)
_grf_data_blocks = num; _grf_data_blocks = num;
_grf_data_type = GDT_SOUND; _grf_data_type = GDT_SOUND;
if (_cur_grffile->sound_offset == 0) _cur_grffile->sound_offset = GetNumSounds(); if (_cur_grffile->sound_offset == 0) {
_cur_grffile->sound_offset = GetNumSounds();
_cur_grffile->num_sounds = num;
}
} }
/* Action 0x11 (SKIP) */ /* Action 0x11 (SKIP) */
@ -5683,7 +5685,7 @@ static void ImportGRFSound(ByteReader *buf)
return; return;
} }
if (file->sound_offset + sound_id >= GetNumSounds()) { if (sound_id >= file->num_sounds) {
grfmsg(1, "ImportGRFSound: Sound effect %d is invalid", sound_id); grfmsg(1, "ImportGRFSound: Sound effect %d is invalid", sound_id);
return; return;
} }

1
src/newgrf.h
View File

@ -99,6 +99,7 @@ struct GRFFile {
struct SpriteGroup **spritegroups; struct SpriteGroup **spritegroups;
uint sound_offset; uint sound_offset;
uint16 num_sounds;
StationSpec **stations; StationSpec **stations;
HouseSpec **housespec; HouseSpec **housespec;

23
src/newgrf_sound.cpp
View File

@ -65,19 +65,26 @@ bool PlayVehicleSound(const Vehicle *v, VehicleSoundEvent event)
callback = GetVehicleCallback(CBID_VEHICLE_SOUND_EFFECT, event, 0, v->engine_type, v); callback = GetVehicleCallback(CBID_VEHICLE_SOUND_EFFECT, event, 0, v->engine_type, v);
if (callback == CALLBACK_FAILED) return false; if (callback == CALLBACK_FAILED) return false;
if (callback >= ORIGINAL_SAMPLE_COUNT) callback += file->sound_offset - ORIGINAL_SAMPLE_COUNT; if (callback >= ORIGINAL_SAMPLE_COUNT) {
callback -= ORIGINAL_SAMPLE_COUNT;
if (callback > file->num_sounds) return false;
callback += file->sound_offset;
}
if (callback < GetNumSounds()) SndPlayVehicleFx(callback, v); assert(callback < GetNumSounds());
SndPlayVehicleFx(callback, v);
return true; return true;
} }
bool PlayTileSound(const GRFFile *file, SoundID sound_id, TileIndex tile) bool PlayTileSound(const GRFFile *file, SoundID sound_id, TileIndex tile)
{ {
if (sound_id >= ORIGINAL_SAMPLE_COUNT) sound_id += file->sound_offset - ORIGINAL_SAMPLE_COUNT; if (sound_id >= ORIGINAL_SAMPLE_COUNT) {
sound_id -= ORIGINAL_SAMPLE_COUNT;
if (sound_id < GetNumSounds()) { if (sound_id > file->num_sounds) return false;
SndPlayTileFx(sound_id, tile); sound_id += file->sound_offset;
return true;
} }
return false;
assert(sound_id < GetNumSounds());
SndPlayTileFx(sound_id, tile);
return true;
} }