diff options
| author | Eugene Sandulenko | 2014-01-12 21:17:52 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-12 21:17:52 +0200 |
| commit | a700dba33570509bd6f24fdaf5183a3d38bac9ac (patch) | |
| tree | c325c66e8f8ad056e7a8498b1eda92af87d2d778 | |
| parent | 1a4f951f8bff52f6185304722f2ab9cf9bcd58f4 (diff) | |
| download | scummvm-rg350-a700dba33570509bd6f24fdaf5183a3d38bac9ac.tar.gz scummvm-rg350-a700dba33570509bd6f24fdaf5183a3d38bac9ac.tar.bz2 scummvm-rg350-a700dba33570509bd6f24fdaf5183a3d38bac9ac.zip | |
FULLPIPE: Implement scene34_updateCursor()
| -rw-r--r-- | engines/fullpipe/constants.h | 2 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene34.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index cdb5dc6945..5f3814762e 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -1137,8 +1137,10 @@ namespace Fullpipe { // Scene 34 #define ANI_BOOT_34 4560 +#define ANI_BOX_34 2498 #define ANI_CACTUS_34 2381 #define ANI_LUK_34 2541 +#define ANI_STOOL_34 2486 #define ANI_VENT_34 2473 #define QU_SC34_ENTERLIFT 2819 #define QU_SC34_EXITLIFT 2820 diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp index 0882c0f9e8..d04e389cab 100644 --- a/engines/fullpipe/scenes/scene34.cpp +++ b/engines/fullpipe/scenes/scene34.cpp @@ -89,16 +89,14 @@ void scene34_initBeh() { } int scene34_updateCursor() { -#if 0 g_fp->updateCursorCommon(); - if ((g_fp->_objectIdAtCursor != ANI_STOOL_34 || g_fp->getGameLoaderInventory()->getSelectedItemId() != ANI_INV_BOX) - && (g_fp->_objectIdAtCursor != ANI_BOX_34 || g_fp->getGameLoaderInventory()->getSelectedItemId() != ANI_INV_STOOL)) + if ((g_fp->_objectIdAtCursor != ANI_STOOL_34 || getGameLoaderInventory()->getSelectedItemId() != ANI_INV_BOX) + && (g_fp->_objectIdAtCursor != ANI_BOX_34 || getGameLoaderInventory()->getSelectedItemId() != ANI_INV_STOOL)) ; // emtpy else g_fp->_cursorId = PIC_CSR_ITN_INV; -#endif return g_fp->_cursorId; } |