[Scummvm-cvs-logs] SF.net SVN: scummvm: [31906] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31906
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31906&view=rev
Author:   lordhoto
Date:     2008-05-06 13:50:27 -0700 (Tue, 06 May 2008)

Log Message:
-----------
Implemented Engine::getDebugger for KyraEngine.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
    scummvm/trunk/engines/kyra/kyra.h
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/kyra_v1.h
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/kyra_v2.h

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2008-05-06 17:44:00 UTC (rev 31905)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2008-05-06 20:50:27 UTC (rev 31906)
@@ -35,6 +35,7 @@
 #include "kyra/text.h"
 #include "kyra/timer.h"
 #include "kyra/script.h"
+#include "kyra/debugger.h"
 
 namespace Kyra {
 
@@ -46,6 +47,7 @@
 	_staticres = 0;
 	_timer = 0;
 	_emc = 0;
+	_debugger = 0;
 
 	_gameSpeed = 60;
 	_tickLength = (uint8)(1000.0 / _gameSpeed);
@@ -78,6 +80,10 @@
 	system->getEventManager()->registerRandomSource(_rnd, "kyra");
 }
 
+::GUI::Debugger *KyraEngine::getDebugger() {
+	return _debugger;
+}
+
 int KyraEngine::init() {
 	registerDefaultSettings();
 
@@ -201,6 +207,7 @@
 	delete _text;
 	delete _timer;
 	delete _emc;
+	delete _debugger;
 }
 
 void KyraEngine::quitGame() {

Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h	2008-05-06 17:44:00 UTC (rev 31905)
+++ scummvm/trunk/engines/kyra/kyra.h	2008-05-06 20:50:27 UTC (rev 31906)
@@ -97,6 +97,7 @@
 class TextDisplayer;
 class StaticResource;
 class TimerManager;
+class Debugger;
 
 class KyraEngine : public Engine {
 friend class Debugger;
@@ -106,6 +107,8 @@
 	KyraEngine(OSystem *system, const GameFlags &flags);
 	virtual ~KyraEngine();
 
+	::GUI::Debugger *getDebugger();
+
 	bool quit() const { return _quitFlag; }
 
 	uint8 game() const { return _flags.gameID; }
@@ -176,6 +179,7 @@
 	StaticResource *_staticres;
 	TimerManager *_timer;
 	EMCInterpreter *_emc;
+	Debugger *_debugger;
 
 	// config specific
 	virtual void registerDefaultSettings();

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-05-06 17:44:00 UTC (rev 31905)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-05-06 20:50:27 UTC (rev 31906)
@@ -77,7 +77,6 @@
 	_drinkAnimationTable = _brandonToWispTable = _magicAnimationTable = _brandonStoneTable = 0;
 	_drinkAnimationTableSize = _brandonToWispTableSize = _magicAnimationTableSize = _brandonStoneTableSize = 0;
 	memset(&_specialPalettes, 0, sizeof(_specialPalettes));
-	_debugger = 0;
 	_sprites = 0;
 	_animator = 0;
 	_seq = 0;
@@ -113,7 +112,6 @@
 	Common::clearAllSpecialDebugLevels();
 
 	delete _screen;
-	delete _debugger;
 	delete _sprites;
 	delete _animator;
 	delete _seq;

Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h	2008-05-06 17:44:00 UTC (rev 31905)
+++ scummvm/trunk/engines/kyra/kyra_v1.h	2008-05-06 20:50:27 UTC (rev 31906)
@@ -37,7 +37,6 @@
 class SoundDigital;
 class SeqPlayer;
 class Sprites;
-class Debugger;
 class Animator_v1;
 class TextDisplayer;
 class KyraEngine_v1;
@@ -480,7 +479,6 @@
 	SeqPlayer *_seq;
 	Sprites *_sprites;
 	Screen_v1 *_screen;
-	Debugger *_debugger;
 
 	EMCState _scriptMain;
 

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-05-06 17:44:00 UTC (rev 31905)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-05-06 20:50:27 UTC (rev 31906)
@@ -64,7 +64,6 @@
 
 	memset(_hiddenItems, -1, sizeof(_hiddenItems));
 
-	_debugger = 0;
 	_screenBuffer = 0;
 
 	memset(&_mainCharacter, 0, sizeof(_mainCharacter));
@@ -89,7 +88,6 @@
 		delete *i;
 	_opcodesAnimation.clear();
 
-	delete _debugger;
 	delete[] _screenBuffer;
 }
 

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2008-05-06 17:44:00 UTC (rev 31905)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-05-06 20:50:27 UTC (rev 31906)
@@ -36,7 +36,6 @@
 namespace Kyra {
 
 class Screen_v2;
-class Debugger_v2;
 
 class KyraEngine_v2 : public KyraEngine {
 friend class Debugger_v2;
@@ -63,7 +62,6 @@
 	const EngineDesc &engineDesc() const { return _desc; }
 protected:
 	EngineDesc _desc;
-	Debugger_v2 *_debugger;
 
 	// run
 	bool _runFlag;


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