diff options
| author | Strangerke | 2016-04-10 11:44:38 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 09:54:21 +0200 |
| commit | 6a55da1504b54d4ac16dcccd3fd6c9811d6e3620 (patch) | |
| tree | 9e0891652d100d2fb84ae70feadd17aefc662f67 /engines/gnap/scenes/scene14.cpp | |
| parent | e11ec6a9c18ec908780b30b0a5f54d271904ea8b (diff) | |
| download | scummvm-rg350-6a55da1504b54d4ac16dcccd3fd6c9811d6e3620.tar.gz scummvm-rg350-6a55da1504b54d4ac16dcccd3fd6c9811d6e3620.tar.bz2 scummvm-rg350-6a55da1504b54d4ac16dcccd3fd6c9811d6e3620.zip | |
GNAP: Replace flags values by enums (WIP)
Diffstat (limited to 'engines/gnap/scenes/scene14.cpp')
| -rw-r--r-- | engines/gnap/scenes/scene14.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/gnap/scenes/scene14.cpp b/engines/gnap/scenes/scene14.cpp index 1e22c84b57..47bb12f563 100644 --- a/engines/gnap/scenes/scene14.cpp +++ b/engines/gnap/scenes/scene14.cpp @@ -46,7 +46,7 @@ void GnapEngine::scene14_updateHotspots() { setHotspot(kHSCoin, 330, 390, 375, 440, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR); setHotspot(kHSToilet, 225, 250, 510, 500, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR); setDeviceHotspot(kHSDevice, -1, -1, -1, -1); - if (isFlag(2)) + if (isFlag(kGFNeedleTaken)) _hotspots[kHSCoin]._flags = SF_DISABLED; _hotspotsCount = 5; } @@ -56,15 +56,15 @@ void GnapEngine::scene14_run() { queueInsertDeviceIcon(); - if (!isFlag(2)) + if (!isFlag(kGFNeedleTaken)) _gameSys->insertSequence(0x23, 10, 0, 0, kSeqNone, 0, 0, 0); endSceneInit(); - if (!isFlag(2) && invHas(kItemTongs)) + if (!isFlag(kGFNeedleTaken) && invHas(kItemTongs)) _largeSprite = _gameSys->createSurface(1); - if (!isFlag(2)) { + if (!isFlag(kGFNeedleTaken)) { _gameSys->insertSequence(0x24, 10, 0x23, 10, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0x24; _timers[2] = getRandom(40) + 50; @@ -95,7 +95,7 @@ void GnapEngine::scene14_run() { case kHSCoin: if (_grabCursorSpriteIndex == kItemTongs) { invAdd(kItemQuarter); - setFlag(2); + setFlag(kGFNeedleTaken); setGrabCursorSprite(-1); hideCursor(); _gameSys->setAnimation(0x26, 10, 0); @@ -151,7 +151,7 @@ void GnapEngine::scene14_run() { checkGameKeys(); - if (!isFlag(2) && !_timers[2]) { + if (!isFlag(kGFNeedleTaken) && !_timers[2]) { _gameSys->insertSequence(0x24, 10, _gnapSequenceId, 10, kSeqSyncWait, 0, 0, 0); _gnapSequenceId = 0x24; _timers[2] = getRandom(40) + 50; |