[Scummvm-cvs-logs] SF.net SVN: scummvm:[42071] scummvm/branches/gsoc2009-draci/engines/draci

[dkasak13 at users.sourceforge.net]

Revision: 42071
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42071&view=rev
Author:   dkasak13
Date:     2009-07-03 17:55:28 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
Enabled loading room number 1 as a test.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
    scummvm/branches/gsoc2009-draci/engines/draci/draci.h
    scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
    scummvm/branches/gsoc2009-draci/engines/draci/game.h

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-03 17:54:13 UTC (rev 42070)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-03 17:55:28 UTC (rev 42071)
@@ -85,11 +85,13 @@
 
 	_screen = new Screen(this);
 	_font = new Font();
+	_anims = new Animation(this);
 	_mouse = new Mouse(this);
+	_script = new Script();
 	_game = new Game(this);
-	_script = new Script();
 
 
+
 	// Load default font
 	_font->setFont(kFontBig);
 
@@ -150,6 +152,7 @@
 				_mouse->handleEvent(event);
 			}		
 		}
+		_anims->drawScene(_screen->getSurface());
 		_screen->copyToScreen();
 		_system->delayMillis(20);
 	}
@@ -166,6 +169,7 @@
 	delete _mouse;
 	delete _game;
 	delete _script;
+	delete _anims;
 
 	delete _paletteArchive;
 	delete _objectsArchive;

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.h	2009-07-03 17:54:13 UTC (rev 42070)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.h	2009-07-03 17:55:28 UTC (rev 42071)
@@ -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 @@
 	Mouse *_mouse;
 	Game *_game;
 	Script *_script;
+	Animation *_anims;
 
 	BArchive *_objectsArchive;
 	BArchive *_spritesArchive;

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-03 17:54:13 UTC (rev 42070)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-03 17:55:28 UTC (rev 42071)
@@ -135,7 +135,7 @@
 	loadObject(1);
 	_vm->_script->run(getObject(1)->_program, getObject(1)->_init);
 
-	changeRoom(_info->_currentRoom);
+	changeRoom(1);
 }
 
 void Game::loadObject(uint16 objNum) {

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-03 17:54:13 UTC (rev 42070)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-03 17:55:28 UTC (rev 42071)
@@ -28,6 +28,8 @@
 
 #include "common/str.h"
 #include "draci/script.h"
+#include "draci/animation.h"
+#include "draci/sprite.h"
 
 namespace Draci {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.