diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tony/loc.cpp | 25 | ||||
| -rw-r--r-- | engines/tony/loc.h | 2 |
2 files changed, 9 insertions, 18 deletions
diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp index 09a00deed1..e505aa46a5 100644 --- a/engines/tony/loc.cpp +++ b/engines/tony/loc.cpp @@ -506,15 +506,13 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) { if (!ds.err()) { for (int i = 0; i < _nSprites && !ds.err(); i++) { // Download the sprites - if (bLOX) { + if (bLOX) _sprites[i].LOXGetSizeFromStream(ds, &dimx, &dimy); - _sprites[i].init(newItemSpriteBuffer(dimx, dimy, true)); - _sprites[i].readFromStream(ds, true); - } else { + else _sprites[i].getSizeFromStream(ds, &dimx, &dimy); - _sprites[i].init(newItemSpriteBuffer(dimx, dimy, false)); - _sprites[i].readFromStream(ds, false); - } + + _sprites[i].init(newItemSpriteBuffer(dimx, dimy, bLOX)); + _sprites[i].readFromStream(ds, bLOX); if (_cm == CM_256 && _bPal) _sprites[i].setPalette(_pal._data); @@ -523,21 +521,14 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) { if (!ds.err()) { for (int i = 0; i < _nSfx && !ds.err(); i++) { - if (bLOX) - _sfx[i].readFromStream(ds, true); - else - _sfx[i].readFromStream(ds, false); + _sfx[i].readFromStream(ds, bLOX); } } // Read the pattern from pattern 1 if (!ds.err()) { - for (int i = 1; i <= _nPatterns && !ds.err(); i++) { - if (bLOX) - _patterns[i].readFromStream(ds, true); - else - _patterns[i].readFromStream(ds, false); - } + for (int i = 1; i <= _nPatterns && !ds.err(); i++) + _patterns[i].readFromStream(ds, bLOX); } // Initialize the current pattern diff --git a/engines/tony/loc.h b/engines/tony/loc.h index ac65a4a0bd..d065d60445 100644 --- a/engines/tony/loc.h +++ b/engines/tony/loc.h @@ -151,7 +151,7 @@ public: // Reads the position of the pattern RMPoint pos(); - void readFromStream(Common::ReadStream &ds, bool bLOX = false); + void readFromStream(Common::ReadStream &ds, bool bLOX); private: void updateCoord(); |