[Scummvm-cvs-logs] scummvm master -> 1dde17b0eed87ca7f09f9a2fdd02d2624a4caf9f

[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:
7ea0386307 NEVERHOOD: Disable the fanmade Russian Fargus release for now
1dde17b0ee NEVERHOOD: Allow skipping of the introductory credits with the space key


Commit: 7ea0386307828af4f4866261eb28b7faad0a6489
    https://github.com/scummvm/scummvm/commit/7ea0386307828af4f4866261eb28b7faad0a6489
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-12-19T16:10:34-08:00

Commit Message:
NEVERHOOD: Disable the fanmade Russian Fargus release for now

This version has broken resources that corrupt the heap
(e.g. the menu header).

Changed paths:
    engines/neverhood/detection.cpp



diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index e5486bb..10f2bc1 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -130,6 +130,9 @@ static const NeverhoodGameDescription gameDescriptions[] = {
 		0,
 	},
 
+// FIXME: Disabled for now, as it has broken resources that corrupt the heap
+// (e.g. the menu header).
+#if 0
 	{
 		// Neverhood Russian version. Fargus
 		{
@@ -146,6 +149,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
 		0,
 		0,
 	},
+#endif
 
 	{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
 };


Commit: 1dde17b0eed87ca7f09f9a2fdd02d2624a4caf9f
    https://github.com/scummvm/scummvm/commit/1dde17b0eed87ca7f09f9a2fdd02d2624a4caf9f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-12-19T16:10:35-08:00

Commit Message:
NEVERHOOD: Allow skipping of the introductory credits with the space key

Changed paths:
    engines/neverhood/modules/module1500.cpp



diff --git a/engines/neverhood/modules/module1500.cpp b/engines/neverhood/modules/module1500.cpp
index 3ce9783..ec3b67a 100644
--- a/engines/neverhood/modules/module1500.cpp
+++ b/engines/neverhood/modules/module1500.cpp
@@ -102,11 +102,11 @@ void Scene1501::update() {
 	Scene::update();
 	if (_countdown1 != 0) {
 		_countdown1--;
-		if (_countdown1 == 0) {
+		if (_countdown1 == 0 || _skip) {
 			_vm->_screen->clear();
 			leaveScene(0);
 		}
-	} else if ((_countdown2 != 0 && (--_countdown2 == 0)) || (_countdown2 == 0 && !isSoundPlaying(0))) {
+	} else if ((_countdown2 != 0 && (--_countdown2 == 0)) || (_countdown2 == 0 && !isSoundPlaying(0)) || _skip) {
 		_countdown1 = 12;
 		_palette->startFadeToBlack(11);
 	}