diff options
| author | Paul Gilbert | 2017-06-25 13:24:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-06-25 13:24:10 -0400 |
| commit | b24c66e09646fb6cbd7238685fdea61c28ed0761 (patch) | |
| tree | aeffe4433e092392b93d9c8b12525df1db7d6aa2 /engines/titanic | |
| parent | 56890bfb9f40df8cc78e0c1b91b32a6f5b4f8ca1 (diff) | |
| download | scummvm-rg350-b24c66e09646fb6cbd7238685fdea61c28ed0761.tar.gz scummvm-rg350-b24c66e09646fb6cbd7238685fdea61c28ed0761.tar.bz2 scummvm-rg350-b24c66e09646fb6cbd7238685fdea61c28ed0761.zip | |
TITANIC: Add German sound filenames for spaceship crash
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/game/computer_screen.cpp | 42 | ||||
| -rw-r--r-- | engines/titanic/titanic.h | 2 |
2 files changed, 28 insertions, 16 deletions
diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp index 094094ad55..be9c87a540 100644 --- a/engines/titanic/game/computer_screen.cpp +++ b/engines/titanic/game/computer_screen.cpp @@ -22,6 +22,7 @@ #include "titanic/game/computer_screen.h" #include "titanic/messages/messages.h" +#include "titanic/titanic.h" namespace Titanic { @@ -75,44 +76,53 @@ bool CComputerScreen::TimerMsg(CTimerMsg *msg) { switch (msg->_actionVal) { case 0: - loadSound("a#32.wav"); - loadSound("a#31.wav"); - loadSound("a#33.wav"); - loadSound("a#30.wav"); - loadSound("a#29.wav"); - playSound("a#25.wav"); + if (!g_vm->isGerman()) { + loadSound("a#32.wav"); + loadSound("a#31.wav"); + loadSound("a#33.wav"); + loadSound("a#30.wav"); + loadSound("a#29.wav"); + playSound("a#25.wav"); + } else { + loadSound("a#27.wav"); + loadSound("a#26.wav"); + loadSound("a#28.wav"); + loadSound("a#25.wav"); + loadSound("a#24.wav"); + playSound("a#20.wav"); + } addTimer(1, 2000, 0); break; case 1: playMovie(23, 26, MOVIE_STOP_PREVIOUS); - playSound("a#32.wav"); - playSound("a#31.wav"); + playSound(SOUND("a#32.wav", "a#27.wav")); + playSound(SOUND("a#31.wav", "a#26.wav")); addTimer(2, 2000, 0); break; case 2: { CChangeMusicMsg musicMsg(CString(), 1); musicMsg.execute("HomeMusicPlayer"); - playSound("a#33.wav"); - playSound("a#31.wav"); + playSound(SOUND("a#33.wav", "a#28.wav")); + playSound(SOUND("a#31.wav", "a#26.wav")); changeView("Home.Node 4.E", ""); playClip(51, 150); - playSound("a#31.wav"); + playSound(SOUND("a#31.wav", "a#26.wav")); playClip(151, 200); - handle = playSound("a#27.wav"); + handle = playSound(SOUND("a#27.wav", "a#22.wav")); playClip(200, 306); - playSound("a#30.wav"); + playSound(SOUND("a#30.wav", "a#25.wav")); stopSound(handle, 0); playClip(306, 338); - handle = playSound("a#28.wav"); + handle = playSound(SOUND("a#28.wav", "a#23.wav")); playClip(338, 392); - playSound("a#29.wav"); + playSound(SOUND("a#29.wav", "a#24.wav")); stopSound(handle); - handle = playSound("y#662.wav"); + handle = playSound(SOUND("y#662.wav", "y#0.wav")); setSoundVolume(handle, 10, 2); playClip(392, 450); startTalking("Doorbot", 0x3611A); diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h index 68f24454e1..015c692378 100644 --- a/engines/titanic/titanic.h +++ b/engines/titanic/titanic.h @@ -72,6 +72,8 @@ enum TitanicDebugChannels { #define MAX_SAVES 99 +#define SOUND(enName, deName) (g_vm->isGerman() ? deName : enName) + struct TitanicGameDescription; class TitanicEngine; |