[Scummvm-cvs-logs] scummvm master -> 7432a33137b0871bd1b8b80b63d4494b293b39b4

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7432a33137 DRASCULA: Hookup up debug console correctly.


Commit: 7432a33137b0871bd1b8b80b63d4494b293b39b4
    https://github.com/scummvm/scummvm/commit/7432a33137b0871bd1b8b80b63d4494b293b39b4
Author: D G Turner (digitall at scummvm.org)
Date: 2013-12-06T14:55:03-08:00

Commit Message:
DRASCULA: Hookup up debug console correctly.

This now opens correctly on CTRL-d keystroke.

Changed paths:
    engines/drascula/drascula.cpp
    engines/drascula/drascula.h



diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 163f007..14cb4be 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -864,6 +864,11 @@ void DrasculaEngine::updateEvents() {
 #endif
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
+			if (event.kbd.keycode == Common::KEYCODE_d && event.kbd.hasFlags(Common::KBD_CTRL)) {
+				// Start the debugger
+				getDebugger()->attach();
+				getDebugger()->onFrame();
+			}
 			addKeyToBuffer(event.kbd);
 			break;
 		case Common::EVENT_KEYUP:
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 944191b..53fce9c 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -38,6 +38,8 @@
 
 #include "engines/savestate.h"
 
+#include "drascula/console.h"
+
 #include "audio/mixer.h"
 
 #include "engines/engine.h"
@@ -313,8 +315,6 @@ static const int interf_y[] = { 51, 51, 51, 51, 83, 83, 83 };
 
 struct RoomHandlers;
 
-class Console;
-
 class DrasculaEngine : public Engine {
 protected:
 	// Engine APIs
@@ -724,11 +724,12 @@ public:
 	void update_62_pre();
 	void update_102();
 
+	Console *_console;
+	GUI::Debugger *getDebugger() { return _console; }
+
 private:
 	int _lang;
 
-	Console *_console;
-
 	CharInfo *_charMap;
 	int _charMapSize;