[Scummvm-cvs-logs] scummvm master -> 74327cadad47824863f52fdb2b68d093b3a939a6

[bluegr]

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

Summary:
97ca67ecac MADS: Properly reset the sound flag
74327cadad MADS: Add custom game options to the ScummVM GUI


Commit: 97ca67ecac3bd4e27cd2ea93c5e88e44722972a3
    https://github.com/scummvm/scummvm/commit/97ca67ecac3bd4e27cd2ea93c5e88e44722972a3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-03-15T13:45:31+02:00

Commit Message:
MADS: Properly reset the sound flag

Changed paths:
    engines/mads/nebular/dialogs_nebular.cpp



diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 0b5e921..4ba5366 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1152,7 +1152,7 @@ void OptionsDialog::show() {
 		_vm->saveOptions();
 	} else if (_selectedLine == 9) {
 		// Cancel button, revert all options from the saved ones
-		_vm->_musicFlag = prevMusicFlag;
+		_vm->_musicFlag = _vm->_soundFlag = prevMusicFlag;
 		_vm->_easyMouse = prevEasyMouse;
 		_vm->_invObjectsAnimated = prevInvObjectsAnimated;
 		_vm->_textWindowStill = prevTextWindowStill;


Commit: 74327cadad47824863f52fdb2b68d093b3a939a6
    https://github.com/scummvm/scummvm/commit/74327cadad47824863f52fdb2b68d093b3a939a6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-03-15T13:47:45+02:00

Commit Message:
MADS: Add custom game options to the ScummVM GUI

This should be part of commit 19a9c068f, but it wasn't committed

Changed paths:
    engines/mads/detection_tables.h



diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 92614ba..0a8e98b 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -37,7 +37,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
 		0
@@ -56,7 +56,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOSPEECH)
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
 		0
@@ -74,7 +74,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOSPEECH)
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
 		0
@@ -92,7 +92,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GAMEOPTION_EASY_MOUSE)
 		},
 		GType_Phantom,
 		0
@@ -110,7 +110,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GAMEOPTION_EASY_MOUSE)
 		},
 		GType_Dragonsphere,
 		0