diff options
| author | uruk | 2014-07-29 09:05:41 +0200 |
|---|---|---|
| committer | uruk | 2014-07-29 09:05:41 +0200 |
| commit | d95a4c5f726c8c4e9259132a07857d2c910ca1f8 (patch) | |
| tree | c783b2731852451f17184668064da2af8a36d650 | |
| parent | f538660c1558f6eb170bf82421cfe34155f6a9c3 (diff) | |
| download | scummvm-rg350-d95a4c5f726c8c4e9259132a07857d2c910ca1f8.tar.gz scummvm-rg350-d95a4c5f726c8c4e9259132a07857d2c910ca1f8.tar.bz2 scummvm-rg350-d95a4c5f726c8c4e9259132a07857d2c910ca1f8.zip | |
CGE2: Get rid of _flag.
| -rw-r--r-- | engines/cge2/cge2.cpp | 2 | ||||
| -rw-r--r-- | engines/cge2/cge2.h | 1 | ||||
| -rw-r--r-- | engines/cge2/cge2_main.cpp | 5 | ||||
| -rw-r--r-- | engines/cge2/saveload.cpp | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp index 6f4c34c607..f175fceced 100644 --- a/engines/cge2/cge2.cpp +++ b/engines/cge2/cge2.cpp @@ -92,8 +92,6 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _soundStat._ref[1] = 0; _taken = false; _endGame = false; - for (int i = 0; i < 4; i++) - _flag[i] = false; _req = 1; _midiNotify = nullptr; _spriteNotify = nullptr; diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h index 81b2071f95..7fd5431244 100644 --- a/engines/cge2/cge2.h +++ b/engines/cge2/cge2.h @@ -288,7 +288,6 @@ public: } _soundStat; bool _taken; bool _endGame; - bool _flag[4]; int _req; NotifyFunctionType _midiNotify; NotifyFunctionType _spriteNotify; diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index 8c166848dc..d07eef389b 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -648,11 +648,8 @@ void CGE2Engine::runGame() { initToolbar(); // main loop - while (!_endGame && !_quitFlag) { - if (_flag[3]) // Flag FINIS - _commandHandler->addCallback(kCmdExec, -1, 0, kQGame); + while (!_endGame && !_quitFlag) mainLoop(); - } // If finishing game due to closing ScummVM window, explicitly save the game if (!_endGame && canSaveGameStateCurrently()) diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp index c468f65855..30d6b3dd46 100644 --- a/engines/cge2/saveload.cpp +++ b/engines/cge2/saveload.cpp @@ -286,6 +286,8 @@ void CGE2Engine::syncGame(Common::SeekableReadStream *readStream, Common::WriteS } void CGE2Engine::syncHeader(Common::Serializer &s) { + int dummy = 0; + s.syncAsUint16LE(_now); s.syncAsUint16LE(_sex); s.syncAsUint16LE(_music); @@ -294,7 +296,7 @@ void CGE2Engine::syncHeader(Common::Serializer &s) { s.syncAsUint16LE(_sayCap); s.syncAsUint16LE(_sayVox); for (int i = 0; i < 4; i++) - s.syncAsUint16LE(_flag[i]); + s.syncAsUint16LE(dummy); // _flag if (s.isSaving()) { // Write checksum |