[Scummvm-git-logs] scummvm master -> 50753f292a1af45b05871962168a1503e5e03ab7

[sev-]

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:
50753f292a FULLPIPE: Fix cursor handling in scene25


Commit: 50753f292a1af45b05871962168a1503e5e03ab7
    https://github.com/scummvm/scummvm/commit/50753f292a1af45b05871962168a1503e5e03ab7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-01T20:45:00+02:00

Commit Message:
FULLPIPE: Fix cursor handling in scene25

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



diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp
index 9bc8f41..991b29f 100644
--- a/engines/fullpipe/scenes/scene25.cpp
+++ b/engines/fullpipe/scenes/scene25.cpp
@@ -100,10 +100,10 @@ int scene25_updateCursor() {
 		int inv = getGameLoaderInventory()->getSelectedItemId();
 
 		if (g_fp->_objectIdAtCursor == ANI_WATER25) {
-			if ((g_vars->scene25_boardIsSelectable && (!inv || inv == ANI_INV_BOARD)) || (g_vars->scene25_dudeIsOnBoard && (inv == ANI_INV_LOPAT || !inv)))
-				g_fp->_cursorId = (g_fp->_cursorId != PIC_CSR_DEFAULT) ? PIC_CSR_ITN : PIC_CSR_ITN_INV; // FIXME check
+			if (g_vars->scene25_boardIsSelectable && ((!inv || inv == ANI_INV_BOARD) || (g_vars->scene25_dudeIsOnBoard && (inv == ANI_INV_LOPAT || !inv))))
+				g_fp->_cursorId = (g_fp->_cursorId != PIC_CSR_DEFAULT) ? PIC_CSR_ITN_INV : PIC_CSR_ITN;
 		} else if (g_fp->_objectIdAtCursor == ANI_BOARD25 && (!inv || inv == ANI_INV_SWAB || inv == ANI_INV_BROOM || inv == ANI_INV_LOPAT)) {
-			g_fp->_cursorId = (g_fp->_cursorId != PIC_CSR_DEFAULT) ? PIC_CSR_ITN : PIC_CSR_ITN_INV;
+			g_fp->_cursorId = (g_fp->_cursorId != PIC_CSR_DEFAULT) ? PIC_CSR_ITN_INV : PIC_CSR_ITN;
 		}
 	}