aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2012-12-26 07:55:56 +0100
committerStrangerke2012-12-26 07:55:56 +0100
commit1efe969b66392db757818d7cee13e7e47e67338f (patch)
tree4ed9dd635642d1239bf34e1020d624c4ca295b7e
parent59e85997b3debece5e920d7612fe33ccc9931934 (diff)
downloadscummvm-rg350-1efe969b66392db757818d7cee13e7e47e67338f.tar.gz
scummvm-rg350-1efe969b66392db757818d7cee13e7e47e67338f.tar.bz2
scummvm-rg350-1efe969b66392db757818d7cee13e7e47e67338f.zip
HOPKINS: Fix menu in BeOS and OS2 versions
-rw-r--r--engines/hopkins/menu.cpp10
-rw-r--r--engines/hopkins/sound.cpp5
2 files changed, 12 insertions, 3 deletions
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index ca23ac0263..aaf7f8be5a 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -73,8 +73,9 @@ int MenuManager::menu() {
frame2Index = 0;
frame1Index = 0;
-
- if (_vm->_globals._language == LANG_EN)
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ _vm->_graphicsManager.loadImage("MENU");
+ else if (_vm->_globals._language == LANG_EN)
_vm->_graphicsManager.loadImage("MENUAN");
else if (_vm->_globals._language == LANG_FR)
_vm->_graphicsManager.loadImage("MENUFR");
@@ -82,7 +83,10 @@ int MenuManager::menu() {
_vm->_graphicsManager.loadImage("MENUES");
_vm->_graphicsManager.FADE_INW();
- if (_vm->_globals._language == LANG_EN)
+
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENU.SPR");
+ else if (_vm->_globals._language == LANG_EN)
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENUAN.SPR");
else if (_vm->_globals._language == LANG_FR)
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENUFR.SPR");
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index e742b50be9..3672e29880 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -221,6 +221,11 @@ void SoundManager::playAnim_SOUND(int soundNumber) {
}
void SoundManager::WSOUND(int soundNumber) {
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) {
+ if (soundNumber > 27)
+ return;
+ }
+
if (old_music != soundNumber || !MOD_FLAG) {
if (MOD_FLAG)
WSOUND_OFF();