diff options
| author | Paul Gilbert | 2017-09-17 16:24:26 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-17 16:24:26 -0400 |
| commit | 481e18ee1d38512e9d1c730b357b230d5db22cae (patch) | |
| tree | 0cc7a2e70876280a4ecb80d171cfeb90a66d7b1c /engines/titanic/game | |
| parent | 4a9098d083683f75918ee15f3191309182206f86 (diff) | |
| download | scummvm-rg350-481e18ee1d38512e9d1c730b357b230d5db22cae.tar.gz scummvm-rg350-481e18ee1d38512e9d1c730b357b230d5db22cae.tar.bz2 scummvm-rg350-481e18ee1d38512e9d1c730b357b230d5db22cae.zip | |
TITANIC: Create a separate g_language global in it's own file
I was becoming concerned with more and more files having to add the
full engine definition and sub-classes thereof via titanic.h,
just so the TRANSLATE macro could call getLanguage. This way, files
just need to include the lightweight translation.h file instead
Diffstat (limited to 'engines/titanic/game')
| -rw-r--r-- | engines/titanic/game/cdrom_tray.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/computer_screen.cpp | 18 | ||||
| -rw-r--r-- | engines/titanic/game/credits.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/credits_button.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/transport/service_elevator.cpp | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/engines/titanic/game/cdrom_tray.cpp b/engines/titanic/game/cdrom_tray.cpp index 9d0904b511..0215b58f43 100644 --- a/engines/titanic/game/cdrom_tray.cpp +++ b/engines/titanic/game/cdrom_tray.cpp @@ -23,7 +23,7 @@ #include "titanic/core/room_item.h" #include "titanic/game/cdrom_tray.h" #include "titanic/messages/messages.h" -#include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp index ea61bc531d..dee469af1c 100644 --- a/engines/titanic/game/computer_screen.cpp +++ b/engines/titanic/game/computer_screen.cpp @@ -22,7 +22,7 @@ #include "titanic/game/computer_screen.h" #include "titanic/messages/messages.h" -#include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { @@ -90,20 +90,20 @@ bool CComputerScreen::TimerMsg(CTimerMsg *msg) { switch (msg->_actionVal) { case 0: - 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 { + if (g_language == Common::DE_DEU) { loadSound("a#27.wav"); loadSound("a#26.wav"); loadSound("a#28.wav"); loadSound("a#25.wav"); loadSound("a#24.wav"); playSound("a#20.wav"); + } else { + loadSound("a#32.wav"); + loadSound("a#31.wav"); + loadSound("a#33.wav"); + loadSound("a#30.wav"); + loadSound("a#29.wav"); + playSound("a#25.wav"); } addTimer(1, 2000, 0); break; diff --git a/engines/titanic/game/credits.cpp b/engines/titanic/game/credits.cpp index 9fda8cf1c7..ddb44f127c 100644 --- a/engines/titanic/game/credits.cpp +++ b/engines/titanic/game/credits.cpp @@ -21,7 +21,7 @@ */ #include "titanic/game/credits.h" -#include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { diff --git a/engines/titanic/game/credits_button.cpp b/engines/titanic/game/credits_button.cpp index 92815ec021..2296a4e1e8 100644 --- a/engines/titanic/game/credits_button.cpp +++ b/engines/titanic/game/credits_button.cpp @@ -21,7 +21,7 @@ */ #include "titanic/game/credits_button.h" -#include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { diff --git a/engines/titanic/game/transport/service_elevator.cpp b/engines/titanic/game/transport/service_elevator.cpp index 8784f0ee2a..1e76c63e01 100644 --- a/engines/titanic/game/transport/service_elevator.cpp +++ b/engines/titanic/game/transport/service_elevator.cpp @@ -23,7 +23,7 @@ #include "titanic/game/transport/service_elevator.h" #include "titanic/core/room_item.h" #include "titanic/npcs/doorbot.h" -#include "titanic/titanic.h" +#include "titanic/translation.h" namespace Titanic { |