cpp/openttd-patchpack/source Changeset - r15047:549cfe65e8b5

Changeset - r15047:549cfe65e8b5

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 14 years ago 2010-04-20 05:52:51
yexo@openttd.org

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

3 files changed with 30 insertions and 20 deletions:

src/newgrf.cpp

src/newgrf.h

src/newgrf_sound.cpp

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

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

src/newgrf.h

➞

Show inline comments

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

src/newgrf_sound.cpp

➞

Show inline comments

@@ @@ -65,19 +65,26 @@ bool PlayVehicleSound(const Vehicle *v, @@
 	callback = GetVehicleCallback(CBID_VEHICLE_SOUND_EFFECT, event, 0, v->engine_type, v);
 	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;
+}
 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 > file->num_sounds) return false;
 		sound_id += file->sound_offset;
+	}
 	if (sound_id < GetNumSounds()) {
 		SndPlayTileFx(sound_id, tile);
 		return true;
+	}
 	return false;
 	assert(sound_id < GetNumSounds());
 	SndPlayTileFx(sound_id, tile);
 	return true;
+}

0 comments (0 inline, 0 general)