[Scummvm-cvs-logs] scummvm master -> e0440ad8310e57793fb877b937d0ed6cd44d34b7

[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:
9c295171b6 NEVERHOOD: Add an option to scale the making of videos to full screen
e0440ad831 README: Add the game-specific options used in the Neverhood


Commit: 9c295171b62ddeff6608d54d0e3fa56691f15618
    https://github.com/scummvm/scummvm/commit/9c295171b62ddeff6608d54d0e3fa56691f15618
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-12-26T06:58:24-08:00

Commit Message:
NEVERHOOD: Add an option to scale the making of videos to full screen

Changed paths:
    engines/neverhood/detection.cpp
    engines/neverhood/menumodule.cpp



diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 10f2bc1..feba193 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -170,6 +170,14 @@ static const ExtraGuiOption neverhoodExtraGuiOption2 = {
 	false
 };
 
+static const ExtraGuiOption neverhoodExtraGuiOption3 = {
+	_s("Scale the making of videos to full screen"),
+	_s("Scale the making of videos, so that they use the whole screen"),
+	"scalemakingofvideos",
+	false
+};
+
+
 class NeverhoodMetaEngine : public AdvancedMetaEngine {
 public:
 	NeverhoodMetaEngine() : AdvancedMetaEngine(Neverhood::gameDescriptions, sizeof(Neverhood::NeverhoodGameDescription), neverhoodGames) {
@@ -225,6 +233,7 @@ const ExtraGuiOptions NeverhoodMetaEngine::getExtraGuiOptions(const Common::Stri
 	ExtraGuiOptions options;
 	options.push_back(neverhoodExtraGuiOption1);
 	options.push_back(neverhoodExtraGuiOption2);
+	options.push_back(neverhoodExtraGuiOption3);
 	return options;
 }
 
diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp
index b6aff48..8929fb3 100644
--- a/engines/neverhood/menumodule.cpp
+++ b/engines/neverhood/menumodule.cpp
@@ -112,7 +112,7 @@ void MenuModule::createScene(int sceneNum, int which) {
 		_childObject = new CreditsScene(_vm, this, true);
 		break;
 	case MAKING_OF:
-		createSmackerScene(kMakingOfSmackerFileHashList, false, true, true);
+		createSmackerScene(kMakingOfSmackerFileHashList, ConfMan.getBool("scalemakingofvideos"), true, true);
 		break;
 	case LOAD_GAME_MENU:
 		createLoadGameMenu();


Commit: e0440ad8310e57793fb877b937d0ed6cd44d34b7
    https://github.com/scummvm/scummvm/commit/e0440ad8310e57793fb877b937d0ed6cd44d34b7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-12-26T06:58:24-08:00

Commit Message:
README: Add the game-specific options used in the Neverhood

Changed paths:
    README



diff --git a/README b/README
index db7b301..5391c5f 100644
--- a/README
+++ b/README
@@ -2213,6 +2213,16 @@ keywords:
     helium_mode        bool     If true, people sound like they've inhaled
                                 Helium
 
+The Neverhood adds the following non-standard keywords:
+
+    originalsaveload   bool     If true, the original save/load screens are
+                                used instead of the enhanced ScummVM ones
+    skiphallofrecordsscenes     bool
+                                If true, allows the player to skip
+                                past the Hall of Records storyboard scenes
+    scalemakingofvideos  bool   If true, the making of videos are scaled, so that
+                                they use the whole screen
+
 The 7th Guest adds the following non-standard keyword:
 
     fast_movie_speed   bool     If true, movies are played at an increased