diff options
| author | Strangerke | 2013-01-30 08:31:32 +0100 |
|---|---|---|
| committer | Strangerke | 2013-01-30 08:31:32 +0100 |
| commit | 15de07ff74e610510f724cca9c6d155ef376d68a (patch) | |
| tree | bd4cd62fa68ec590666fbe09b54913c2ac0609ca /engines/hopkins/anim.cpp | |
| parent | e68e3c91ebb089cf31f305f18199bb3a9ccca612 (diff) | |
| download | scummvm-rg350-15de07ff74e610510f724cca9c6d155ef376d68a.tar.gz scummvm-rg350-15de07ff74e610510f724cca9c6d155ef376d68a.tar.bz2 scummvm-rg350-15de07ff74e610510f724cca9c6d155ef376d68a.zip | |
HOPKINS: Introduce MKTAG24. Make use of MKTAG16 and MKTAG24
Diffstat (limited to 'engines/hopkins/anim.cpp')
| -rw-r--r-- | engines/hopkins/anim.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index ec256eb05d..a492d0a5ac 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -629,8 +629,7 @@ void AnimationManager::searchAnim(const byte *data, int animIndex, int count) { v7 = 0; bool innerLoopCond = false; do { - if (READ_BE_UINT32(&data[v6]) == MKTAG('A', 'N', 'I', 'M') || - (data[v6] == 'F' && data[v6 + 1] == 'I' && data[v6 + 2] == 'N')) + if (READ_BE_UINT32(&data[v6]) == MKTAG('A', 'N', 'I', 'M') || READ_BE_UINT24(&data[v6]) == MKTAG24('F', 'I', 'N')) innerLoopCond = true; if (count < v6) { _vm->_globals.Bqe_Anim[animIndex]._enabledFl = false; @@ -678,7 +677,7 @@ void AnimationManager::searchAnim(const byte *data, int animIndex, int count) { loopCond = true; } } - if (data[v21] == 'F' && data[v21 + 1] == 'I' && data[v21 + 2] == 'N') + if (READ_BE_UINT24(&data[v21]) == MKTAG24('F', 'I', 'N')) loopCond = true; ++v21; } while (v21 <= count && !loopCond); |