diff options
| author | Eugene Sandulenko | 2013-09-12 01:00:20 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-12 01:00:20 +0300 |
| commit | ad43f25c0ff435fc6a51ce4d9ef07d35a5ccef99 (patch) | |
| tree | db782f4da2dceac63c700be7e0aab7657212d7a2 /engines/fullpipe/gameloader.cpp | |
| parent | 5c6ee7573c0cf05bbbb154d4734e94e478f453e5 (diff) | |
| download | scummvm-rg350-ad43f25c0ff435fc6a51ce4d9ef07d35a5ccef99.tar.gz scummvm-rg350-ad43f25c0ff435fc6a51ce4d9ef07d35a5ccef99.tar.bz2 scummvm-rg350-ad43f25c0ff435fc6a51ce4d9ef07d35a5ccef99.zip | |
FULLPIPE: Fix debug scene
Diffstat (limited to 'engines/fullpipe/gameloader.cpp')
| -rw-r--r-- | engines/fullpipe/gameloader.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp index a44501b17d..142c278c56 100644 --- a/engines/fullpipe/gameloader.cpp +++ b/engines/fullpipe/gameloader.cpp @@ -163,7 +163,7 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) { return false; if (!_sc2array[sc2idx]._isLoaded) - return 0; + return false; if (_sc2array[sc2idx]._entranceDataCount < 1) { g_fullpipe->_currentScene = st->_scene; @@ -173,14 +173,12 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) { if (_sc2array[sc2idx]._entranceDataCount <= 0) return false; - if (sceneId == 726) - return true; - - int entranceIdx; - for (entranceIdx = 0; _sc2array[sc2idx]._entranceData[entranceIdx]->_field_4 != entranceId; entranceIdx++) { - if (entranceIdx >= _sc2array[sc2idx]._entranceDataCount) - return false; - } + int entranceIdx = 0; + if (sceneId != 726) // WORKAROUND + for (entranceIdx = 0; _sc2array[sc2idx]._entranceData[entranceIdx]->_field_4 != entranceId; entranceIdx++) { + if (entranceIdx >= _sc2array[sc2idx]._entranceDataCount) + return false; + } CGameVar *sg = _gameVar->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME"); |