[Scummvm-git-logs] scummvm master -> 728e775e839f490d2be58e169cc7313571132ca6

[sev-]

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

Summary:
7fe5a4ef91 FULLPIPE: Fix quitting game via menu
dec0d3acbc FULLPIPE: Cleanup
728e775e83 FULLPIPE: Remove obsolete TODO


Commit: 7fe5a4ef91455c9cc90250ba76447c9744caf7cd
    https://github.com/scummvm/scummvm/commit/7fe5a4ef91455c9cc90250ba76447c9744caf7cd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-01T10:50:29+01:00

Commit Message:
FULLPIPE: Fix quitting game via menu

Changed paths:
    engines/fullpipe/modal.cpp


diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 05e83fc..9c7c0f7 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1429,14 +1429,9 @@ bool ModalQuery::init(int counterdiff) {
 				if (_bgScene)
 					g_fp->sceneFade(_bgScene, false);
 
-				warning("STUB: ModalQuery::init()");
-
-				// Quit game
-				//if (inputArFlag) {
-				//	g_needRestart = 1;
-				//	return 0;
-				//}
-				//SendMessageA(hwndCallback, WM_DESTROY, 0, 0);
+				g_fp->_gameContinue = false;
+
+				return false;
 			}
 		}
 	}


Commit: dec0d3acbc203438ed78da0f04d49ef1303f9601
    https://github.com/scummvm/scummvm/commit/dec0d3acbc203438ed78da0f04d49ef1303f9601
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-01T10:53:02+01:00

Commit Message:
FULLPIPE: Cleanup

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


diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp
index ec3184a..83a0ee0 100644
--- a/engines/fullpipe/scenes/scene25.cpp
+++ b/engines/fullpipe/scenes/scene25.cpp
@@ -544,10 +544,6 @@ bool sceneHandler25_isOnLadder(ExCommand *cmd) {
 	}
 }
 
-void sceneHandler25_sub03() {
-	warning("STUB: sceneHandler25_sub03()");
-}
-
 int sceneHandler25(ExCommand *cmd) {
 	if (cmd->_messageKind != 17)
 		return 0;


Commit: 728e775e839f490d2be58e169cc7313571132ca6
    https://github.com/scummvm/scummvm/commit/728e775e839f490d2be58e169cc7313571132ca6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-01T10:54:48+01:00

Commit Message:
FULLPIPE: Remove obsolete TODO

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


diff --git a/engines/fullpipe/scenes/scene32.cpp b/engines/fullpipe/scenes/scene32.cpp
index e1c999d..9cd79d8 100644
--- a/engines/fullpipe/scenes/scene32.cpp
+++ b/engines/fullpipe/scenes/scene32.cpp
@@ -102,7 +102,7 @@ int scene32_updateCursor() {
 	g_fp->updateCursorCommon();
 
 	if (g_fp->_objectIdAtCursor == PIC_SC32_LADDER && g_fp->_cursorId == PIC_CSR_ITN)
-		g_fp->_cursorId = g_vars->scene32_dudeOnLadder ? PIC_CSR_GOD : PIC_CSR_GOU; // TODO FIXME doublecheck
+		g_fp->_cursorId = g_vars->scene32_dudeOnLadder ? PIC_CSR_GOD : PIC_CSR_GOU;
 
 	return g_fp->_cursorId;
 }