diff options
| author | Gregory Montoir | 2004-09-21 21:10:23 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-09-21 21:10:23 +0000 |
| commit | 6bfeab77e1d38d8f1583f2e5214764dcacf05d4a (patch) | |
| tree | 7fa1fe164f2cfe0fca92eb0bae433a7d23dd105b /scumm/actor.cpp | |
| parent | 6e9ce1b17ccbcf8239da45624f434ee5bddfcea7 (diff) | |
| download | scummvm-rg350-6bfeab77e1d38d8f1583f2e5214764dcacf05d4a.tar.gz scummvm-rg350-6bfeab77e1d38d8f1583f2e5214764dcacf05d4a.tar.bz2 scummvm-rg350-6bfeab77e1d38d8f1583f2e5214764dcacf05d4a.zip | |
cleanup
add some warnings to detect the use of new Aux animation data
svn-id: r15226
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 230180be93..7029a02802 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1846,7 +1846,7 @@ void Actor::setUserCondition(int slot, int set) { } } -bool Actor::isUserConditionSet(int slot) { +bool Actor::isUserConditionSet(int slot) const { assert(slot >= 1 && slot <= 0x20); return (condMask & (1 << (slot + 0xF))) != 0; } @@ -1865,7 +1865,7 @@ void Actor::setTalkCondition(int slot) { } } -bool Actor::isTalkConditionSet(int slot) { +bool Actor::isTalkConditionSet(int slot) const { assert(slot >= 1 && slot <= 0x10); return (condMask & (1 << (slot - 1))) != 0; } @@ -1874,8 +1874,8 @@ void ScummEngine::preProcessAuxQueue() { if (!_skipProcessActors) { for (int i = 0; i < _auxBlocksNum; ++i) { AuxBlock *ab = &_auxBlocks[i]; - assert(ab->r.top <= ab->r.bottom); if (ab->visible) { + assert(ab->r.top <= ab->r.bottom); gdi.copyVirtScreenBuffers(ab->r); } } @@ -1897,6 +1897,14 @@ void ScummEngine::postProcessAuxQueue() { assert(akax); const uint8 *auxd = findPalInPals(akax, ae->subIndex) - _resourceHeaderSize; assert(auxd); + const uint8 *frel = findResourceData(MKID('FREL'), auxd); + if (frel) { + warning("unhandled FREL block"); + } + const uint8 *disp = findResourceData(MKID('DISP'), auxd); + if (disp) { + warning("unhandled DISP block"); + } const uint8 *axfd = findResourceData(MKID('AXFD'), auxd); assert(axfd); |