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

dkasak13 at users.sourceforge.net dkasak13 at users.sourceforge.net
Sat Jun 27 17:26:33 CEST 2009


Revision: 41921
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41921&view=rev
Author:   dkasak13
Date:     2009-06-27 15:26:33 +0000 (Sat, 27 Jun 2009)

Log Message:
-----------
Added Script instance to DraciEngine. Restored disassembling of a demo script on engine startup (previously via gpldisasm(), now via _script->run()).

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-06-27 15:19:03 UTC (rev 41920)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-06-27 15:26:33 UTC (rev 41921)
@@ -70,6 +70,7 @@
 	_font = new Font();
 	_mouse = new Mouse(this);
 	_game = new Game();
+	_script = new Script();
 
 	// Load default font
 	_font->setFont(kFontBig);
@@ -108,7 +109,7 @@
 	}	
 
 	// Disassemble GPL script for the first location
-	//gpldisasm(f->_data, f->_length);
+	_script->run(f->_data, f->_length);
 
 	return Common::kNoError;
 }
@@ -214,9 +215,12 @@
 DraciEngine::~DraciEngine() {
 	// Dispose your resources here
  
+ 	// TODO: Investigate possibility of using sharedPtr or similar
 	delete _screen;
 	delete _font;
 	delete _mouse;
+	delete _game;
+	delete _script;
 	
 	// Remove all of our debug levels here
 	Common::clearAllDebugChannels();

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.h	2009-06-27 15:19:03 UTC (rev 41920)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.h	2009-06-27 15:26:33 UTC (rev 41921)
@@ -34,6 +34,7 @@
 #include "draci/mouse.h"
 #include "draci/screen.h"
 #include "draci/font.h"
+#include "draci/script.h"
 
 namespace Draci {
 
@@ -52,6 +53,7 @@
 	Screen *_screen;
 	Mouse *_mouse;
 	Game *_game;
+	Script *_script;
 
 private:
 	Common::RandomSource _rnd;


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




More information about the Scummvm-git-logs mailing list