[Scummvm-cvs-logs] scummvm master -> 3587d870478cedc13eba2279e044bfc18eab7ff3

sev- sev at scummvm.org
Fri Jan 17 19:32:54 CET 2014


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:
3587d87047 FULLPIPE: Enable scene35


Commit: 3587d870478cedc13eba2279e044bfc18eab7ff3
    https://github.com/scummvm/scummvm/commit/3587d870478cedc13eba2279e044bfc18eab7ff3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-17T10:32:06-08:00

Commit Message:
FULLPIPE: Enable scene35

Changed paths:
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index c61872f..c49b2fc 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -912,7 +912,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = scene34_updateCursor;
 		break;
 
-#if 0
 	case SC_35:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_35");
 		scene->preloadMovements(sceneVar);
@@ -923,7 +922,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		insertMessageHandler(sceneHandler35, 2, 2);
 		_updateCursorCallback = defaultUpdateCursor;
 		break;
-#endif
 
 	case SC_36:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_36");
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 24da21c..3e197b4 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -161,6 +161,9 @@ void scene34_initBeh();
 int sceneHandler34(ExCommand *cmd);
 int scene34_updateCursor();
 
+void scene35_initScene(Scene *sc);
+int sceneHandler35(ExCommand *cmd);
+
 int scene36_updateCursor();
 void scene36_initScene(Scene *sc);
 int sceneHandler36(ExCommand *cmd);






More information about the Scummvm-git-logs mailing list