From dd84aaf648b57220180b84a9aa0825d16bcea5bc Mon Sep 17 00:00:00 2001 From: Florian Kagerer Date: Sun, 10 May 2009 13:40:28 +0000 Subject: LOL: - added some spell casting (spark, heal, swarm) - fixed several bugs (not the one in the fighting system though) - added several opcodes. there shouldn't be any real show stoppers in the draracle cave now. - simplified wsa code (which required 4 lines of code for displaying a frame) - added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file) svn-id: r40420 --- engines/kyra/kyra_mr.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'engines/kyra/kyra_mr.cpp') diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 6baa90ea8f..a227d16937 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -274,14 +274,14 @@ Common::Error KyraEngine_MR::go() { for (int i = 0; i < 64 && !shouldQuit(); ++i) { uint32 nextRun = _system->getMillis() + 3 * _tickLength; - _menuAnim->displayFrame(i, 0); + _menuAnim->displayFrame(i, 0, 0, 0, 0); _screen->updateScreen(); delayUntil(nextRun); } for (int i = 64; i > 29 && !shouldQuit(); --i) { uint32 nextRun = _system->getMillis() + 3 * _tickLength; - _menuAnim->displayFrame(i, 0); + _menuAnim->displayFrame(i, 0, 0, 0, 0); _screen->updateScreen(); delayUntil(nextRun); } @@ -330,9 +330,6 @@ Common::Error KyraEngine_MR::go() { void KyraEngine_MR::initMainMenu() { _menuAnim = new WSAMovie_v2(this, _screen); _menuAnim->open("REVENGE.WSA", 1, _screen->getPalette(0)); - _menuAnim->setX(0); - _menuAnim->setY(0); - _menuAnim->setDrawPage(0); memset(_screen->getPalette(0), 0, 3); _menu = new MainMenu(this); -- cgit v1.2.3