cpp/openttd-patchpack/source Changeset - r17813:df9747f3494b

Changeset - r17813:df9747f3494b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 13 years ago 2011-07-02 11:24:39
frosch@openttd.org

(svn r22614) -Fix [FS#4656]: If callback 33 returns a value out of range, no sound effect shall be played.

1 file changed with 12 insertions and 1 deletions:

src/newgrf_sound.cpp

0 comments (0 inline, 0 general)

src/newgrf_sound.cpp

➞

Show inline comments

@@ @@ -51,6 +51,12 @@ uint GetNumSounds() @@
+}
 /**
  * Checks whether a NewGRF wants to play a different vehicle sound effect.
  * @param v Vehicle to play sound effect for.
  * @param event Trigger for the sound effect.
  * @return false if the default sound effect shall be played instead.
  */
 bool PlayVehicleSound(const Vehicle *v, VehicleSoundEvent event)
+{
 	const GRFFile *file = GetEngineGRF(v->engine_type);
@@ @@ -63,10 +69,15 @@ bool PlayVehicleSound(const Vehicle *v, @@
 	if (!HasBit(EngInfo(v->engine_type)->callback_mask, CBM_VEHICLE_SOUND_EFFECT)) return false;
 	callback = GetVehicleCallback(CBID_VEHICLE_SOUND_EFFECT, event, 0, v->engine_type, v);
 	/* Play default sound if callback fails */
 	if (callback == CALLBACK_FAILED) return false;
 	if (callback >= ORIGINAL_SAMPLE_COUNT) {
 		callback -= ORIGINAL_SAMPLE_COUNT;
 		if (callback > file->num_sounds) return false;
 		/* Play no sound if result is out of range */
 		if (callback > file->num_sounds) return true;
 		callback += file->sound_offset;
+	}

0 comments (0 inline, 0 general)