summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-06-05 10:27:33 +0200
committerSergeanur <s.anureev@yandex.ua>2020-06-05 10:27:33 +0200
commit147dca44fa9c759b0d576cb8d4f9575720fc937b (patch)
treef23ca5fbbcbb8769c159a931f96041aea357f150 /src/audio
parentminor stuff (diff)
downloadre3-147dca44fa9c759b0d576cb8d4f9575720fc937b.tar
re3-147dca44fa9c759b0d576cb8d4f9575720fc937b.tar.gz
re3-147dca44fa9c759b0d576cb8d4f9575720fc937b.tar.bz2
re3-147dca44fa9c759b0d576cb8d4f9575720fc937b.tar.lz
re3-147dca44fa9c759b0d576cb8d4f9575720fc937b.tar.xz
re3-147dca44fa9c759b0d576cb8d4f9575720fc937b.tar.zst
re3-147dca44fa9c759b0d576cb8d4f9575720fc937b.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioLogic.cpp6
-rw-r--r--src/audio/soundlist.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index b6fb5a86..01b074ed 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -6536,9 +6536,9 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
m_sQueueSample.m_bIs2D = false;
emittingVolume = m_anRandomTable[2] % 20 + 90;
break;
- case SCRIPT_SOUND_110:
- case SCRIPT_SOUND_111:
- if (SampleManager.IsSampleBankLoaded(0) != 1)
+ case SCRIPT_SOUND_TRAIN_ANNOUNCEMENT_1:
+ case SCRIPT_SOUND_TRAIN_ANNOUNCEMENT_2:
+ if (!SampleManager.IsSampleBankLoaded(0))
return;
m_sQueueSample.m_fSoundIntensity = 80.0f;
m_sQueueSample.m_nSampleIndex = SFX_TRAIN_STATION_ANNOUNCE;
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index 08a1631e..c88229a2 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -284,8 +284,8 @@ enum eScriptSounds : uint16 {
SCRIPT_SOUND_BULLET_HIT_GROUND_2,
SCRIPT_SOUND_BULLET_HIT_GROUND_3,
SCRIPT_SOUND_BULLET_HIT_WATER, // no sound
- SCRIPT_SOUND_110,
- SCRIPT_SOUND_111,
+ SCRIPT_SOUND_TRAIN_ANNOUNCEMENT_1,
+ SCRIPT_SOUND_TRAIN_ANNOUNCEMENT_2,
SCRIPT_SOUND_PAYPHONE_RINGING,
SCRIPT_SOUND_113,
SCRIPT_SOUND_GLASS_BREAK_L,