diff options
| author | Kari Salminen | 2007-06-26 16:06:58 +0000 |
|---|---|---|
| committer | Kari Salminen | 2007-06-26 16:06:58 +0000 |
| commit | f55d08a2d99a41cfe6cabf4243100d812c9fd53b (patch) | |
| tree | 33fc037844d11a98ae05a4e216497149cb50f748 | |
| parent | bf24bff17e1f6c69e59fbdcc58dcdd487be44d3b (diff) | |
| download | scummvm-rg350-f55d08a2d99a41cfe6cabf4243100d812c9fd53b.tar.gz scummvm-rg350-f55d08a2d99a41cfe6cabf4243100d812c9fd53b.tar.bz2 scummvm-rg350-f55d08a2d99a41cfe6cabf4243100d812c9fd53b.zip | |
Fix saving & restoring with AGI256 and AGI256-2 games.
(Should save, restore and use decodePicture's agi256-parameter correctly now).
svn-id: r27730
| -rw-r--r-- | engines/agi/agi.cpp | 5 | ||||
| -rw-r--r-- | engines/agi/picture.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 74795271fc..04c3b34f92 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -334,7 +334,10 @@ void AgiEngine::replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3, case ADD_PIC: debugC(8, kDebugLevelMain, "--- decoding picture %d ---", p1); agiLoadResource(rPICTURE, p1); - _picture->decodePicture(p1, p2); + // Not using simply p3 or (bool) p3 for decodePicture's third + // parameter because they give a warning C4800 with MSVC8: + // 'int16' : forcing value to bool 'true' or 'false' (performance warning) + _picture->decodePicture(p1, p2, p3 ? true : false); break; case ADD_VIEW: agiLoadResource(rVIEW, p1); diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp index e3fd2277d0..144e965465 100644 --- a/engines/agi/picture.cpp +++ b/engines/agi/picture.cpp @@ -652,7 +652,7 @@ int PictureMgr::decodePicture(int n, int clear, bool agi256) { if (clear) _vm->clearImageStack(); - _vm->recordImageStackCall(ADD_PIC, n, clear, 0, 0, 0, 0, 0); + _vm->recordImageStackCall(ADD_PIC, n, clear, agi256, 0, 0, 0, 0); return errOK; } |