diff options
| author | James Brown | 2002-04-19 11:05:46 +0000 |
|---|---|---|
| committer | James Brown | 2002-04-19 11:05:46 +0000 |
| commit | d8d136b92b50494f32168531dab82c195c80f43a (patch) | |
| tree | 4e83e43e3a9e696adf92797abc760053ea0b7361 | |
| parent | 8db88b342eb7f8746b4de0c3306f6727b4f4e598 (diff) | |
| download | scummvm-rg350-d8d136b92b50494f32168531dab82c195c80f43a.tar.gz scummvm-rg350-d8d136b92b50494f32168531dab82c195c80f43a.tar.bz2 scummvm-rg350-d8d136b92b50494f32168531dab82c195c80f43a.zip | |
Rename debugger to g_debugger to fix a conflict with BeOS.
svn-id: r4004
| -rw-r--r-- | scummvm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scummvm.cpp b/scummvm.cpp index 0d6385a207..107ce81b1f 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -22,8 +22,8 @@ #include "stdafx.h" #include "scumm.h" -#include "mididrv.h" -#include "imuse.h" +#include "sound/mididrv.h" +#include "sound/imuse.h" #include "gui.h" #include "string.h" #include "gameDetector.h" @@ -1087,7 +1087,7 @@ void checkHeap() #endif } -ScummDebugger debugger; +ScummDebugger g_debugger; void Scumm::waitForTimer(int msec_delay) { OSystem::Event event; @@ -1120,7 +1120,7 @@ void Scumm::waitForTimer(int msec_delay) { else if (event.kbd.keycode=='g') _fastMode ^= 2; else if (event.kbd.keycode=='d') - debugger.attach(this); + g_debugger.attach(this); else if (event.kbd.keycode=='s') resourceStats(); } |