diff options
| author | Florian Kagerer | 2009-06-07 10:34:01 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-06-07 10:34:01 +0000 |
| commit | 09fe7b31525dc72891a92ac0fbc577b9494ad9db (patch) | |
| tree | 2dcdf7bb52f00703ff61484901b6d47b79819134 | |
| parent | a881ba9d42c92402184ff0b9a102c225d9a3b8aa (diff) | |
| download | scummvm-rg350-09fe7b31525dc72891a92ac0fbc577b9494ad9db.tar.gz scummvm-rg350-09fe7b31525dc72891a92ac0fbc577b9494ad9db.tar.bz2 scummvm-rg350-09fe7b31525dc72891a92ac0fbc577b9494ad9db.zip | |
LOL: implemented some missing monster animation code
svn-id: r41327
| -rw-r--r-- | engines/kyra/lol.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/sprites_lol.cpp | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 12f1e99dd7..693eaf3ec9 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -601,10 +601,6 @@ Common::Error LoLEngine::go() { enableSysTimer(1); runLoop(); - delete _tim; - _tim = 0; - - // TODO: outro return Common::kNoError; } diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp index 8d856796ff..732a8bb2ca 100644 --- a/engines/kyra/sprites_lol.cpp +++ b/engines/kyra/sprites_lol.cpp @@ -771,12 +771,20 @@ int LoLEngine::getMonsterCurFrame(MonsterInPlay *m, uint16 dirFlags) { break; case 2: - /////// - // TODO + return (m->fightCurTick >= 13) ? 13 : m->fightCurTick; break; case 3: - /////// - // TODO + switch (m->mode) { + case 5: + return m->damageReceived ? 5 : 6; + case 8: + return (m->fightCurTick + 6); + case 11: + return 5; + default: + return m->damageReceived ? 5 : m->currentSubFrame; + } + break; default: break; |