[Scummvm-git-logs] scummvm master -> ec7ab8a3a2648661bf2f0ebe6dd3921625a2a14c

[sev-]

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

Summary:
b1c10e147c FULLPIPE: Fix cursor color on Inflater in scene10
424d2380b5 FULLPIPE: Enable debug menu permanently after cheat code to match the original
c294f9ae8d FULLPIPE: Fix whirlgig rotation on scene13
ec7ab8a3a2 FULLPIPE: Increase number of saveslots.


Commit: b1c10e147c3c255890ef15236f27b615b7df38f7
    https://github.com/scummvm/scummvm/commit/b1c10e147c3c255890ef15236f27b615b7df38f7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-30T22:35:55+02:00

Commit Message:
FULLPIPE: Fix cursor color on Inflater in scene10

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



diff --git a/engines/fullpipe/scenes/scene10.cpp b/engines/fullpipe/scenes/scene10.cpp
index 4732896..990a8f2 100644
--- a/engines/fullpipe/scenes/scene10.cpp
+++ b/engines/fullpipe/scenes/scene10.cpp
@@ -65,7 +65,7 @@ int scene10_updateCursor() {
 	if (g_fp->_objectIdAtCursor == ANI_PACHKA || g_fp->_objectIdAtCursor == ANI_GUM) {
 		if (g_fp->_cursorId == PIC_CSR_ITN) {
 			if (g_vars->scene10_hasGum)
-				g_fp->_cursorId = (sceneHandler10_inflaterIsBlind() != 0) ? PIC_CSR_ITN_RED : PIC_CSR_ITN_GREEN;
+				g_fp->_cursorId = (sceneHandler10_inflaterIsBlind() != 0) ? PIC_CSR_ITN_GREEN : PIC_CSR_ITN_RED;
 			else
 				g_fp->_cursorId = PIC_CSR_DEFAULT;
 		}


Commit: 424d2380b5268504ffee2b72d14594277a38324d
    https://github.com/scummvm/scummvm/commit/424d2380b5268504ffee2b72d14594277a38324d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-30T22:35:55+02:00

Commit Message:
FULLPIPE: Enable debug menu permanently after cheat code to match the original

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index b73eaab..05e83fc 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1224,6 +1224,8 @@ void ModalMainMenu::enableDebugMenuButton() {
 	area->picObjL = _scene->getPictureObjectById(area->picIdL, 0);
 	area->picObjL->_flags &= 0xFFFB;
 	_areas.push_back(area);
+
+	g_fp->_mainMenu_debugEnabled = true;
 }
 
 void ModalMainMenu::setSliderPos() {


Commit: c294f9ae8d03719c8c09c131f112419a9df7a011
    https://github.com/scummvm/scummvm/commit/c294f9ae8d03719c8c09c131f112419a9df7a011
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-30T22:35:55+02:00

Commit Message:
FULLPIPE: Fix whirlgig rotation on scene13

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



diff --git a/engines/fullpipe/scenes/scene13.cpp b/engines/fullpipe/scenes/scene13.cpp
index 9908b9a..12fe1dd 100644
--- a/engines/fullpipe/scenes/scene13.cpp
+++ b/engines/fullpipe/scenes/scene13.cpp
@@ -36,6 +36,10 @@
 
 namespace Fullpipe {
 
+void scene13_whirlgigCallback(int *phase) {
+	// Do nothing
+}
+
 void scene13_initScene(Scene *sc) {
 	g_vars->scene13_whirlgig = sc->getStaticANIObject1ById(ANI_WHIRLGIG_13, -1);
 	g_vars->scene13_guard = sc->getStaticANIObject1ById(ANI_STOROZH, -1);
@@ -63,7 +67,7 @@ void scene13_initScene(Scene *sc) {
 		lnk->_flags &= 0xDFFFFFFF;
 
 		g_vars->scene13_whirlgig->stopAnim_maybe();
-		g_vars->scene13_whirlgig->_callback2 = 0;
+		g_vars->scene13_whirlgig->_callback2 = scene13_whirlgigCallback;
 		g_vars->scene13_whirlgig->startAnim(MV_WHR13_SPIN, 0, -1);
 
 		if (g_vars->scene13_whirlgig->_movement)
@@ -155,7 +159,7 @@ void sceneHandler13_closeFast() {
 }
 
 void sceneHandler13_stopWhirlgig() {
-	g_vars->scene13_whirlgig->_callback2 = 0;
+	g_vars->scene13_whirlgig->_callback2 = scene13_whirlgigCallback;
 
 	g_fp->stopAllSoundInstances(SND_13_018);
 	g_fp->playSound(SND_13_033, 0);


Commit: ec7ab8a3a2648661bf2f0ebe6dd3921625a2a14c
    https://github.com/scummvm/scummvm/commit/ec7ab8a3a2648661bf2f0ebe6dd3921625a2a14c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-30T22:35:55+02:00

Commit Message:
FULLPIPE: Increase number of saveslots.

Original save/load menu supports only 8 saves.

Changed paths:
    engines/fullpipe/detection.cpp



diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index af2b0ca..16895b5 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -88,7 +88,7 @@ public:
 	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
-	virtual int getMaximumSaveSlot() const { return 8; }
+	virtual int getMaximumSaveSlot() const { return 99; }
 	virtual SaveStateList listSaves(const char *target) const;
 	virtual void removeSaveState(const char *target, int slot) const;
 	virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;