[Scummvm-cvs-logs] scummvm master -> 63624f8bfa3f79302317589c9c3adbc852563a6c

bluegr bluegr at gmail.com
Fri Jun 28 10:21:47 CEST 2013


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

Summary:
63624f8bfa NEVERHOOD: Fix scene entrance when restoring in the Aqua (music) house


Commit: 63624f8bfa3f79302317589c9c3adbc852563a6c
    https://github.com/scummvm/scummvm/commit/63624f8bfa3f79302317589c9c3adbc852563a6c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-06-28T01:20:40-07:00

Commit Message:
NEVERHOOD: Fix scene entrance when restoring in the Aqua (music) house

This looks to be a logic error in the constructor of module 2400, since
all the other modules do not create scenes with the global entrance
number when they are instantiated without an entrance (i.e. when
loading). With that logic error, all the code that handled Kleymen's
entrance to a scene after restoring was incorrectly skipped

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



diff --git a/engines/neverhood/modules/module2400.cpp b/engines/neverhood/modules/module2400.cpp
index 47f842b..8d3b763 100644
--- a/engines/neverhood/modules/module2400.cpp
+++ b/engines/neverhood/modules/module2400.cpp
@@ -30,7 +30,7 @@ Module2400::Module2400(NeverhoodEngine *vm, Module *parentModule, int which)
 	_vm->_soundMan->addMusic(0x202D1010, 0xB110382D);
 
 	if (which < 0)
-		createScene(_vm->gameState().sceneNum, _vm->gameState().which);
+		createScene(_vm->gameState().sceneNum, -1);
 	else
 		createScene(0, 0);
 






More information about the Scummvm-git-logs mailing list