From 58139baf3710160c8382db14df26291d176e70cd Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 7 Sep 2010 20:18:30 +0000
Subject: MOHAWK: Sound cleanup

Merge the Riven sound file code with the main Riven resource code and remove the mainSoundFile parameter from Sound::playSound(). Reasoning: The sound id's do not collide with the sound id's in the main data files. The sound archives only exist because the original CD version had the ability to choose between low and high quality audio.

svn-id: r52631
---
 engines/mohawk/myst.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/mohawk/myst.cpp')

diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 9ff301c129..4fb6c049d4 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -427,7 +427,7 @@ void MohawkEngine_Myst::changeToCard(uint16 card) {
 
 		// NOTE: All sounds are looped when played via the sound section of the
 		// VIEW resources.
-		_sound->playSound(soundAction, true, soundActionVolume, true);
+		_sound->playSound(soundAction, soundActionVolume, true);
 	} else {
 		error("Unknown sound action %d", soundAction);
 	}
-- 
cgit v1.2.3


From fc11604e73e7d827699a072b6bc16411144c96ff Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 12 Sep 2010 21:35:49 +0000
Subject: i18n: Translate the Save and Load buttons in myst and riven

svn-id: r52692
---
 engines/mohawk/myst.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/mohawk/myst.cpp')

diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 4fb6c049d4..6ed7a313a0 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -25,6 +25,7 @@
 
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
+#include "common/translation.h"
 
 #include "mohawk/graphics.h"
 #include "mohawk/myst.h"
@@ -218,7 +219,7 @@ Common::Error MohawkEngine_Myst::run() {
 	_varStore = new MystVar(this);
 	_saveLoad = new MystSaveLoad(this, _saveFileMan);
 	_scriptParser = new MystScriptParser(this);
-	_loadDialog = new GUI::SaveLoadChooser("Load Game:", "Load");
+	_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"));
 	_loadDialog->setSaveMode(false);
 	_optionsDialog = new MystOptionsDialog(this);
 
-- 
cgit v1.2.3