diff options
| author | Strangerke | 2016-04-03 16:24:19 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 09:54:21 +0200 |
| commit | 9d0caa4bdbf993dfde211c9a8c5c56c34809ae41 (patch) | |
| tree | 6d46fac78990c1c0b83433f9e077ebce7bddd691 | |
| parent | cd29ffb1c6540cbe6db15337c635928bf3a09c34 (diff) | |
| download | scummvm-rg350-9d0caa4bdbf993dfde211c9a8c5c56c34809ae41.tar.gz scummvm-rg350-9d0caa4bdbf993dfde211c9a8c5c56c34809ae41.tar.bz2 scummvm-rg350-9d0caa4bdbf993dfde211c9a8c5c56c34809ae41.zip | |
GNAP: fix use of _sceneDone
| -rw-r--r-- | engines/gnap/scenes/scene14.cpp | 1 | ||||
| -rw-r--r-- | engines/gnap/scenes/scene53.cpp | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/engines/gnap/scenes/scene14.cpp b/engines/gnap/scenes/scene14.cpp index 893b850221..1e22c84b57 100644 --- a/engines/gnap/scenes/scene14.cpp +++ b/engines/gnap/scenes/scene14.cpp @@ -52,7 +52,6 @@ void GnapEngine::scene14_updateHotspots() { } void GnapEngine::scene14_run() { - _largeSprite = nullptr; queueInsertDeviceIcon(); diff --git a/engines/gnap/scenes/scene53.cpp b/engines/gnap/scenes/scene53.cpp index 76dc6d716a..daa39b5424 100644 --- a/engines/gnap/scenes/scene53.cpp +++ b/engines/gnap/scenes/scene53.cpp @@ -138,7 +138,7 @@ void GnapEngine::scene53_runRandomCall() { void GnapEngine::scene53_runChitChatLine() { bool flag = false; - int sequenceId; + int sequenceId = -1; _gameSys->setAnimation(0x6E, 1, 6); _gameSys->insertSequence(0x6E, 1, 0, 0, kSeqNone, 16, 0, 0); @@ -189,7 +189,7 @@ void GnapEngine::scene53_runChitChatLine() { sequenceId = -1; flag = 1; _isLeavingScene = true; - _sceneDone = 1; + _sceneDone = true; _gnapActionStatus = 0; _newSceneNum = 17; break; @@ -320,18 +320,18 @@ void GnapEngine::scene53_run() { scene53_runChitChatLine(); phoneNumber = 0; phoneNumberLen = 0; - _sceneDone = 1; + _sceneDone = true; _newSceneNum = 17; } else if (phoneNumber != 5556789 || isFlag(20)) { scene53_runRandomCall(); phoneNumber = 0; phoneNumberLen = 0; - _sceneDone = 1; + _sceneDone = true; _newSceneNum = 17; } else { phoneNumber = 0; phoneNumberLen = 0; - _sceneDone = 1; + _sceneDone = true; _newSceneNum = 17; if (_s53_isGnapPhoning) setFlag(25); @@ -359,7 +359,7 @@ void GnapEngine::scene53_run() { _gnapActionStatus = -1; } _isLeavingScene = true; - _sceneDone = 1; + _sceneDone = true; _gnapActionStatus = 0; _newSceneNum = 17; } |