synced with scummvm to 2011-Apr-13

This commit is contained in:
Pawel Kolodziejski
2011-04-14 12:41:26 +02:00
parent f0a4299aef
commit 0640dcf2c7
347 changed files with 53648 additions and 8521 deletions
+14 -1
View File
@@ -23,10 +23,15 @@
*
*/
// NB: This is really only necessary if USE_READLINE is defined
#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/system.h"
#include "engines/engine.h"
#include "gui/debugger.h"
#ifndef USE_TEXT_CONSOLE
#include "gui/console.h"
@@ -78,7 +83,7 @@ int Debugger::DebugPrintf(const char *format, ...) {
va_start(argptr, format);
int count;
#ifndef USE_TEXT_CONSOLE
count = _debuggerDialog->vprintf(format, argptr);
count = _debuggerDialog->vprintFormat(1, format, argptr);
#else
count = ::vprintf(format, argptr);
#endif
@@ -86,6 +91,14 @@ int Debugger::DebugPrintf(const char *format, ...) {
return count;
}
void Debugger::preEnter() {
g_engine->pauseEngine(true);
}
void Debugger::postEnter() {
g_engine->pauseEngine(false);
}
void Debugger::attach(const char *entry) {
g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);