diff options
author | Florian Kagerer | 2008-05-16 20:26:57 +0000 |
---|---|---|
committer | Florian Kagerer | 2008-05-16 20:26:57 +0000 |
commit | 9ce0b621085419093fbfc03b6e3e2e6a0369460e (patch) | |
tree | 2f5f6cc04aa91ce62aa680bd8095187ddb2d90f4 /engines | |
parent | b8585f5af071bf7147dd2990e34d8221af1d0534 (diff) | |
download | scummvm-rg350-9ce0b621085419093fbfc03b6e3e2e6a0369460e.tar.gz scummvm-rg350-9ce0b621085419093fbfc03b6e3e2e6a0369460e.tar.bz2 scummvm-rg350-9ce0b621085419093fbfc03b6e3e2e6a0369460e.zip |
cleanup
svn-id: r32144
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/animator_hof.cpp | 8 | ||||
-rw-r--r-- | engines/kyra/animator_mr.cpp | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp index 1192145530..65f38cd961 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/animator_hof.cpp @@ -127,12 +127,8 @@ void KyraEngine_HoF::updateItemAnimations() { return; const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem]; - ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem]; - - if (++_nextAnimItem == 14) { - _nextAnimItem = 0; - return; - } + ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem]; + _nextAnimItem = ++_nextAnimItem % 14; uint32 ctime = _system->getMillis(); if (ctime < a->nextFrame) diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp index f04ca0345d..212b4919dd 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/animator_mr.cpp @@ -205,11 +205,7 @@ void KyraEngine_MR::updateItemAnimations() { const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem]; ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem]; - - if (++_nextAnimItem == 11) { - _nextAnimItem = 0; - return; - } + _nextAnimItem = ++_nextAnimItem % 11; uint32 ctime = _system->getMillis(); if (ctime < a->nextFrame) |