[Scummvm-cvs-logs] scummvm master -> 787868c1db40976441ddfc49211ea08f14af0fea
sev-
sev at scummvm.org
Sun Dec 22 00:10:14 CET 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:
787868c1db FULLPIPE: Implement scene10_updateCursor() and enable scene10
Commit: 787868c1db40976441ddfc49211ea08f14af0fea
https://github.com/scummvm/scummvm/commit/787868c1db40976441ddfc49211ea08f14af0fea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-21T15:09:17-08:00
Commit Message:
FULLPIPE: Implement scene10_updateCursor() and enable scene10
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene10.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index d820bc0..1ab512c 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -381,6 +381,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
insertMessageHandler(sceneHandler09, 2, 2);
_updateCursorCallback = scene09_updateCursor;
break;
+#endif
case SC_10:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_10");
@@ -393,6 +394,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
_updateCursorCallback = scene10_updateCursor;
break;
+#if 0
case SC_11:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_11");
scene->preloadMovements(sceneVar);
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 7db6ff1..38c3fb3 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -67,6 +67,10 @@ void scene08_setupMusic();
int sceneHandler08(ExCommand *cmd);
int scene08_updateCursor();
+void scene10_initScene(Scene *sc);
+int sceneHandler10(ExCommand *cmd);
+int scene10_updateCursor();
+
void sceneDbgMenu_initScene(Scene *sc);
int sceneHandlerDbgMenu(ExCommand *cmd);
diff --git a/engines/fullpipe/scenes/scene10.cpp b/engines/fullpipe/scenes/scene10.cpp
index 7cb2779..4444643 100644
--- a/engines/fullpipe/scenes/scene10.cpp
+++ b/engines/fullpipe/scenes/scene10.cpp
@@ -52,6 +52,27 @@ void scene10_initScene(Scene *sc) {
}
}
+bool sceneHandler10_inflaterIsBlind() {
+ warning("STUB: sceneHandler10_inflaterIsBlind()");
+
+ return false;
+}
+
+int scene10_updateCursor() {
+ g_fp->updateCursorCommon();
+
+ 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;
+ else
+ g_fp->_cursorId = PIC_CSR_DEFAULT;
+ }
+ }
+
+ return g_fp->_cursorId;
+}
+
void sceneHandler10_clickGum() {
warning("STUB: sceneHandler10_clickGum()");
}
More information about the Scummvm-git-logs
mailing list