diff options
| author | Strangerke | 2016-05-20 07:59:19 +0200 |
|---|---|---|
| committer | Strangerke | 2016-05-20 07:59:19 +0200 |
| commit | 72d46655ff5c657d776737aa3abc5b8f32c27ba9 (patch) | |
| tree | bea82753718e9fe47649e8320c202556f9f6bdd6 | |
| parent | 85417c15bb56593ccc062e42e29712968b6857e3 (diff) | |
| download | scummvm-rg350-72d46655ff5c657d776737aa3abc5b8f32c27ba9.tar.gz scummvm-rg350-72d46655ff5c657d776737aa3abc5b8f32c27ba9.tar.bz2 scummvm-rg350-72d46655ff5c657d776737aa3abc5b8f32c27ba9.zip | |
GNAP: Remove TODOs, add safeguard checks
| -rw-r--r-- | engines/gnap/gamesys.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/gnap/gamesys.cpp b/engines/gnap/gamesys.cpp index 3bb96f33b4..c2c0e42a8a 100644 --- a/engines/gnap/gamesys.cpp +++ b/engines/gnap/gamesys.cpp @@ -786,8 +786,6 @@ void GameSys::seqDrawSpriteFrame(SpriteResource *spriteResource, SequenceFrame & void GameSys::drawSprites() { debugC(kDebugBasic, "GameSys::drawSprites() _gfxItemsCount: %d", _gfxItemsCount); - // TODO Split into multiple functions for clarity - // Restore dirty background and collect rects to be redrawn for all sprites // which aren't marked to be redrawn yet Common::Rect intersectingRect; @@ -853,7 +851,7 @@ void GameSys::drawSprites() { if (gfxItem5->_flags & 1) { seqDrawStaticFrame(gfxItem5->_surface, gfxItem5->_currFrame, nullptr); } else if (gfxItem5->_flags & 2) { - // TODO seqDrawAviFrame(gfxItem5->currFrame.spriteId, &gfxItem5->currFrame, 0, gfxItem5->flags & 8); + error("drawSprites - Unexpected AVI frame"); } else { int resourceId = (gfxItem5->_sequenceId & 0xFFFF0000) | gfxItem5->_currFrame._spriteId; SpriteResource *spriteResource = _vm->_spriteCache->get(resourceId); @@ -866,11 +864,7 @@ void GameSys::drawSprites() { for (int n = 0; n < gfxItem5->_updRectsCount; ++n) seqDrawStaticFrame(gfxItem5->_surface, gfxItem5->_prevFrame, &gfxItem5->_updRects[n]); } else if (gfxItem5->_flags & 2) { - /* TODO - spriteData4 = gfxItem5->prevFrame.spriteId; - for (int n = 0; n < gfxItem5->updRectsCount; ++n) - seqDrawAviFrame(spriteData4, &gfxItem5->prevFrame, &gfxItem5->updRects[n], gfxItem5->flags & 8); - */ + error("drawSprites - Unexpected AVI frame"); } else { int resourceId = (gfxItem5->_sequenceId & 0xFFFF0000) | gfxItem5->_prevFrame._spriteId; SpriteResource *spriteResource = _vm->_spriteCache->get(resourceId); |