Rename debugger to g_debugger to fix a conflict with BeOS.
svn-id: r4004
This commit is contained in:
parent
8db88b342e
commit
d8d136b92b
1 changed files with 4 additions and 4 deletions
|
@ -22,8 +22,8 @@
|
||||||
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "scumm.h"
|
#include "scumm.h"
|
||||||
#include "mididrv.h"
|
#include "sound/mididrv.h"
|
||||||
#include "imuse.h"
|
#include "sound/imuse.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
#include "gameDetector.h"
|
#include "gameDetector.h"
|
||||||
|
@ -1087,7 +1087,7 @@ void checkHeap()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
ScummDebugger debugger;
|
ScummDebugger g_debugger;
|
||||||
|
|
||||||
void Scumm::waitForTimer(int msec_delay) {
|
void Scumm::waitForTimer(int msec_delay) {
|
||||||
OSystem::Event event;
|
OSystem::Event event;
|
||||||
|
@ -1120,7 +1120,7 @@ void Scumm::waitForTimer(int msec_delay) {
|
||||||
else if (event.kbd.keycode=='g')
|
else if (event.kbd.keycode=='g')
|
||||||
_fastMode ^= 2;
|
_fastMode ^= 2;
|
||||||
else if (event.kbd.keycode=='d')
|
else if (event.kbd.keycode=='d')
|
||||||
debugger.attach(this);
|
g_debugger.attach(this);
|
||||||
else if (event.kbd.keycode=='s')
|
else if (event.kbd.keycode=='s')
|
||||||
resourceStats();
|
resourceStats();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue