libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TONY: Simplify some code related to LOX in RMItem::readFromStream()

Browse Source
This commit is contained in:
Strangerke 2015-12-31 14:56:05 +01:00
parent 88c19138cf
commit d4e5b72d31
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/tony/loc.cpp
View File

@ -506,15 +506,13 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
if (!ds.err()) { if (!ds.err()) {
for (int i = 0; i < _nSprites && !ds.err(); i++) { for (int i = 0; i < _nSprites && !ds.err(); i++) {
// Download the sprites // Download the sprites
if (bLOX) { if (bLOX)
_sprites[i].LOXGetSizeFromStream(ds, &dimx, &dimy); _sprites[i].LOXGetSizeFromStream(ds, &dimx, &dimy);
_sprites[i].init(newItemSpriteBuffer(dimx, dimy, true)); else
_sprites[i].readFromStream(ds, true);
} else {
_sprites[i].getSizeFromStream(ds, &dimx, &dimy); _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) if (_cm == CM_256 && _bPal)
_sprites[i].setPalette(_pal._data); _sprites[i].setPalette(_pal._data);
@ -523,21 +521,14 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
if (!ds.err()) { if (!ds.err()) {
for (int i = 0; i < _nSfx && !ds.err(); i++) { for (int i = 0; i < _nSfx && !ds.err(); i++) {
if (bLOX) _sfx[i].readFromStream(ds, bLOX);
_sfx[i].readFromStream(ds, true);
else
_sfx[i].readFromStream(ds, false);
} }
} }
// Read the pattern from pattern 1 // Read the pattern from pattern 1
if (!ds.err()) { if (!ds.err()) {
for (int i = 1; i <= _nPatterns && !ds.err(); i++) { for (int i = 1; i <= _nPatterns && !ds.err(); i++)
if (bLOX) _patterns[i].readFromStream(ds, bLOX);
_patterns[i].readFromStream(ds, true);
else
_patterns[i].readFromStream(ds, false);
}
} }
// Initialize the current pattern // Initialize the current pattern

2
engines/tony/loc.h
View File

@ -151,7 +151,7 @@ public:
// Reads the position of the pattern // Reads the position of the pattern
RMPoint pos(); RMPoint pos();
void readFromStream(Common::ReadStream &ds, bool bLOX = false); void readFromStream(Common::ReadStream &ds, bool bLOX);
private: private:
void updateCoord(); void updateCoord();