diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp index 9dd20435807..aeb6c895836 100644 --- a/engines/startrek/sound.cpp +++ b/engines/startrek/sound.cpp @@ -303,7 +303,7 @@ void Sound::playSoundEffectIndex(SoundEffects index) { playVoc("PHASSHOT"); break; case kSfxButton: - playMidiTrack(MIDITRACK_7); + playMidiTrack(MIDITRACK_SFX_BUTTON); break; case kSfxTransporterDematerialize: playVoc("TRANSDEM"); @@ -315,7 +315,7 @@ void Sound::playSoundEffectIndex(SoundEffects index) { playVoc("TRANSENE"); break; case kSfxSelection: - playMidiTrack(MIDITRACK_16); + playMidiTrack(MIDITRACK_SFX_BUTTON); break; case kSfxHailing: playVoc("HAILING"); @@ -330,7 +330,7 @@ void Sound::playSoundEffectIndex(SoundEffects index) { playVoc("HITSHIEL"); break; case kSfxUnk: - playMidiTrack(MIDITRACK_39); + playMidiTrack(MIDITRACK_SFX_UNK); break; case kSfxRedAlert: playVoc("REDALERT"); diff --git a/engines/startrek/soundeffects.h b/engines/startrek/soundeffects.h index 1539670db90..68b617577ef 100644 --- a/engines/startrek/soundeffects.h +++ b/engines/startrek/soundeffects.h @@ -54,19 +54,19 @@ enum MidiTracks { MIDITRACK_1, MIDITRACK_2, MIDITRACK_3, - MIDITRACK_4, - MIDITRACK_5, - MIDITRACK_6, - MIDITRACK_7, - MIDITRACK_8, - MIDITRACK_9, - MIDITRACK_10, + MIDITRACK_SFX_TRICORDER, + MIDITRACK_SFX_DOOR, + MIDITRACK_SFX_PHASER, + MIDITRACK_SFX_BUTTON, + MIDITRACK_SFX_TRANSPORTER_DEMATERIALIZE, + MIDITRACK_SFX_TRANSPORTER_MATERIALIZE, + MIDITRACK_SFX_TRANSPORTER_ENERGIZE, MIDITRACK_11, MIDITRACK_12, MIDITRACK_13, MIDITRACK_14, MIDITRACK_15, - MIDITRACK_16, + MIDITRACK_SFX_SELECTION, MIDITRACK_17, MIDITRACK_18, MIDITRACK_19, @@ -84,14 +84,14 @@ enum MidiTracks { MIDITRACK_31, MIDITRACK_32, MIDITRACK_33, - MIDITRACK_34, + MIDITRACK_SFX_HAILING, MIDITRACK_35, - MIDITRACK_36, - MIDITRACK_37, - MIDITRACK_38, - MIDITRACK_39, - MIDITRACK_40, - MIDITRACK_41 + MIDITRACK_SFX_PHASER2, + MIDITRACK_SFX_PHOTON_TORPEDOES, + MIDITRACK_SFX_SHIELD_HIT, + MIDITRACK_SFX_UNK, + MIDITRACK_SFX_RED_ALERT, + MIDITRACK_SFX_WARP };