[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.117,1.118

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv11139

Modified Files:
	scummvm.cpp 
Log Message:
Rename debugger to g_debugger to fix a conflict with BeOS.



Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** scummvm.cpp	17 Apr 2002 20:30:54 -0000	1.117
--- scummvm.cpp	19 Apr 2002 11:05:46 -0000	1.118
***************
*** 23,28 ****
  #include "stdafx.h"
  #include "scumm.h"
! #include "mididrv.h"
! #include "imuse.h"
  #include "gui.h"
  #include "string.h"
--- 23,28 ----
  #include "stdafx.h"
  #include "scumm.h"
! #include "sound/mididrv.h"
! #include "sound/imuse.h"
  #include "gui.h"
  #include "string.h"
***************
*** 1088,1092 ****
  }
  
! ScummDebugger debugger;
  
  void Scumm::waitForTimer(int msec_delay) {
--- 1088,1092 ----
  }
  
! ScummDebugger g_debugger;
  
  void Scumm::waitForTimer(int msec_delay) {
***************
*** 1121,1125 ****
  						_fastMode ^= 2;
  					else if (event.kbd.keycode=='d')
! 						debugger.attach(this);
  					else if (event.kbd.keycode=='s')
  						resourceStats();
--- 1121,1125 ----
  						_fastMode ^= 2;
  					else if (event.kbd.keycode=='d')
! 						g_debugger.attach(this);
  					else if (event.kbd.keycode=='s')
  						resourceStats();