← Back to branch summary

~ubuntu-branches/ubuntu/raring/scummvm/raring

« back to all changes in this revision

Viewing changes to gui/debugger.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Moritz Muehlenhoff
  • Date: 2011-05-25 19:02:23 UTC
  • mto: (21.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110525190223-fiqm0oaec714xk31
Tags: upstream-1.3.0
Import upstream version 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/debugger.cpp
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
20
 *
21
 
 * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-1-2-1/gui/debugger.cpp $
22
 
 * $Id: debugger.cpp 50966 2010-07-17 19:11:59Z thebluegr $
 
21
 * $URL$
 
22
 * $Id$
23
23
 *
24
24
 */
25
25
 
26
 
#include "common/debug.h"
 
26
// NB: This is really only necessary if USE_READLINE is defined
 
27
#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
28
 
27
29
#include "common/debug-channels.h"
28
30
#include "common/system.h"
29
31
 
 
32
#include "engines/engine.h"
 
33
 
30
34
#include "gui/debugger.h"
31
35
#ifndef USE_TEXT_CONSOLE
32
36
        #include "gui/console.h"
78
82
        va_start(argptr, format);
79
83
        int count;
80
84
#ifndef USE_TEXT_CONSOLE
81
 
        count = _debuggerDialog->vprintf(format, argptr);
 
85
        count = _debuggerDialog->vprintFormat(1, format, argptr);
82
86
#else
83
87
        count = ::vprintf(format, argptr);
84
88
#endif
86
90
        return count;
87
91
}
88
92
 
 
93
void Debugger::preEnter() {
 
94
        g_engine->pauseEngine(true);
 
95
}
 
96
 
 
97
void Debugger::postEnter() {
 
98
        g_engine->pauseEngine(false);
 
99
}
 
100
 
89
101
void Debugger::attach(const char *entry) {
90
102
        g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
91
103