[Scummvm-cvs-logs] scummvm master -> 604c6bde91a9f1fb71d18f8fdcc172fc738ff9ef

[lordhoto]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7e2cf139a9 KYRA: Improve wording about possibly incorrect MT32->GM mapping.
55d3223468 SCI: Fix spelling of Yamaha.
604c6bde91 DOCS: Fix spelling of Yamaha.


Commit: 7e2cf139a97764bcd45252f6d54f0247b2d4939b
    https://github.com/scummvm/scummvm/commit/7e2cf139a97764bcd45252f6d54f0247b2d4939b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T17:02:58-07:00

Commit Message:
KYRA: Improve wording about possibly incorrect MT32->GM mapping.

Changed paths:
    engines/kyra/sound_midi.cpp



diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index 0004395..70cc304 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -475,8 +475,8 @@ SoundMidiPC::SoundMidiPC(KyraEngine_v1 *vm, Audio::Mixer *mixer, MidiDriver *dri
 		::GUI::MessageDialog dialog(_("You appear to be using a General MIDI device,\n"
 									"but your game only supports Roland MT32 MIDI.\n"
 									"We try to map the Roland MT32 instruments to\n"
-									"General MIDI ones. After all it might happen\n"
-									"that a few tracks will not be correctly played."));
+									"General MIDI ones. It is still possible that\n"
+									"some tracks sound incorrect."));
 		dialog.runModal();
 	}
 }


Commit: 55d322346832d41c42bb058bdc263d755e0f598b
    https://github.com/scummvm/scummvm/commit/55d322346832d41c42bb058bdc263d755e0f598b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T17:02:58-07:00

Commit Message:
SCI: Fix spelling of Yamaha.

Thanks to somaen for noticing.

Changed paths:
    engines/sci/detection.cpp



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 8a74bc8..58ac5f1 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -397,8 +397,8 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 	{
 		GAMEOPTION_FB01_MIDI,
 		{
-			_s("Use IMF/Yahama FB-01 for MIDI output"),
-			_s("Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI output"),
+			_s("Use IMF/Yamaha FB-01 for MIDI output"),
+			_s("Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI output"),
 			"native_fb01",
 			false
 		}


Commit: 604c6bde91a9f1fb71d18f8fdcc172fc738ff9ef
    https://github.com/scummvm/scummvm/commit/604c6bde91a9f1fb71d18f8fdcc172fc738ff9ef
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T17:02:58-07:00

Commit Message:
DOCS: Fix spelling of Yamaha.

Changed paths:
    README



diff --git a/README b/README
index 722f329..8d4ca4b 100644
--- a/README
+++ b/README
@@ -2084,7 +2084,7 @@ Sierra games using the SCI engine add the following non-standard keywords:
     originalsaveload   bool     If true, the original save/load screens are
                                 used instead of the enhanced ScummVM ones
     native_fb01        bool     If true, the music driver for an IBM Music
-                                Feature card or a Yahama FB-01 FM synth module
+                                Feature card or a Yamaha FB-01 FM synth module
                                 is used for MIDI output
 
 Broken Sword II adds the following non-standard keywords: