[Scummvm-git-logs] scummvm master -> 5d1ea5db918e15049b52df25075b6540488ed212

[sev-]

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:
7c412fb9bf FULLPIPE: Fix Soldiers/girls show up sequence in scene16
5d1ea5db91 FULLPIPE: Fix scene persistence between scenes


Commit: 7c412fb9bfed1279c00c091ce0098d29bc7412e4
    https://github.com/scummvm/scummvm/commit/7c412fb9bfed1279c00c091ce0098d29bc7412e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-01T00:24:31+02:00

Commit Message:
FULLPIPE: Fix Soldiers/girls show up sequence in scene16

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



diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index 52daef3..b7a63df 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -65,7 +65,7 @@ void scene16_initScene(Scene *sc) {
 
 			idx++;
 
-			if (idx >= 2)
+			if (idx > 1)
 				idx = 0;
 		}
 
@@ -76,7 +76,7 @@ void scene16_initScene(Scene *sc) {
 
 			idx++;
 
-			if (idx >= 2)
+			if (idx > 1)
 				idx = 0;
 		}
 	} else {
@@ -460,7 +460,7 @@ int sceneHandler16(ExCommand *cmd) {
 		if (g_vars->scene16_placeIsOccupied) {
 			g_vars->scene16_walkingCount++;
 
-			if (g_vars->scene16_walkingCount < 280) {
+			if (g_vars->scene16_walkingCount >= 280) {
 				sceneHandler16_putOnWheel();
 
 				g_vars->scene16_walkingCount = 0;


Commit: 5d1ea5db918e15049b52df25075b6540488ed212
    https://github.com/scummvm/scummvm/commit/5d1ea5db918e15049b52df25075b6540488ed212
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-01T00:24:31+02:00

Commit Message:
FULLPIPE: Fix scene persistence between scenes

Changed paths:
    engines/fullpipe/fullpipe.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 11d8852..e9694a0 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -584,8 +584,10 @@ void FullpipeEngine::disableSaves(ExCommand *ex) {
 		}
 
 		// Original was makeing a save on every room entering
-		//if (_currentScene)
-		//	_gameLoader->writeSavegame(_currentScene, "savetmp.sav");
+		if (_currentScene) {
+			_gameLoader->saveScenePicAniInfos(_currentScene->_sceneId);
+			//	_gameLoader->writeSavegame(_currentScene, "savetmp.sav");
+		}
 	}
 }