diff options
author | Denis Kasak | 2009-07-03 17:55:28 +0000 |
---|---|---|
committer | Denis Kasak | 2009-07-03 17:55:28 +0000 |
commit | 1853d594b837358bde0ec89697d74ae29e7459a0 (patch) | |
tree | 679f0d92ff46a0f97b70848680edc0af2f7b211a /engines | |
parent | 4ba1ea8adf75b1e665827314ae3ebc164887e450 (diff) | |
download | scummvm-rg350-1853d594b837358bde0ec89697d74ae29e7459a0.tar.gz scummvm-rg350-1853d594b837358bde0ec89697d74ae29e7459a0.tar.bz2 scummvm-rg350-1853d594b837358bde0ec89697d74ae29e7459a0.zip |
Enabled loading room number 1 as a test.
svn-id: r42071
Diffstat (limited to 'engines')
-rw-r--r-- | engines/draci/draci.cpp | 6 | ||||
-rw-r--r-- | engines/draci/draci.h | 2 | ||||
-rw-r--r-- | engines/draci/game.cpp | 2 | ||||
-rw-r--r-- | engines/draci/game.h | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp index cef66893fe..79d38134b9 100644 --- a/engines/draci/draci.cpp +++ b/engines/draci/draci.cpp @@ -85,9 +85,11 @@ int DraciEngine::init() { _screen = new Screen(this); _font = new Font(); + _anims = new Animation(this); _mouse = new Mouse(this); - _game = new Game(this); _script = new Script(); + _game = new Game(this); + // Load default font @@ -150,6 +152,7 @@ int DraciEngine::go() { _mouse->handleEvent(event); } } + _anims->drawScene(_screen->getSurface()); _screen->copyToScreen(); _system->delayMillis(20); } @@ -166,6 +169,7 @@ DraciEngine::~DraciEngine() { delete _mouse; delete _game; delete _script; + delete _anims; delete _paletteArchive; delete _objectsArchive; diff --git a/engines/draci/draci.h b/engines/draci/draci.h index aa8969d9aa..9b4444277a 100644 --- a/engines/draci/draci.h +++ b/engines/draci/draci.h @@ -36,6 +36,7 @@ #include "draci/font.h" #include "draci/script.h" #include "draci/barchive.h" +#include "draci/animation.h" namespace Draci { @@ -55,6 +56,7 @@ public: Mouse *_mouse; Game *_game; Script *_script; + Animation *_anims; BArchive *_objectsArchive; BArchive *_spritesArchive; diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp index 3f5329eee4..06e460724f 100644 --- a/engines/draci/game.cpp +++ b/engines/draci/game.cpp @@ -135,7 +135,7 @@ Game::Game(DraciEngine *vm) : _vm(vm) { loadObject(1); _vm->_script->run(getObject(1)->_program, getObject(1)->_init); - changeRoom(_info->_currentRoom); + changeRoom(1); } void Game::loadObject(uint16 objNum) { diff --git a/engines/draci/game.h b/engines/draci/game.h index d3a47902d8..b04ad785e3 100644 --- a/engines/draci/game.h +++ b/engines/draci/game.h @@ -28,6 +28,8 @@ #include "common/str.h" #include "draci/script.h" +#include "draci/animation.h" +#include "draci/sprite.h" namespace Draci { |