[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.105,1.106 scummvm.cpp,1.129,1.130

[Lionel Ulmer]

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

Modified Files:
	sdl.cpp scummvm.cpp 
Log Message:
Prevent debugger attach when we have switched to full-screen.



Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** sdl.cpp	27 Apr 2002 12:02:47 -0000	1.105
--- sdl.cpp	28 Apr 2002 06:51:23 -0000	1.106
***************
*** 905,909 ****
  	case PROP_TOGGLE_FULLSCREEN:
  		_full_screen ^= true;
! 		
  		if (!SDL_WM_ToggleFullScreen(sdl_hwscreen)) {
  			/* if ToggleFullScreen fails, achieve the same effect with hotswap gfx mode */
--- 905,910 ----
  	case PROP_TOGGLE_FULLSCREEN:
  		_full_screen ^= true;
! 		g_scumm->_fullScreen = _full_screen;
! 
  		if (!SDL_WM_ToggleFullScreen(sdl_hwscreen)) {
  			/* if ToggleFullScreen fails, achieve the same effect with hotswap gfx mode */

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** scummvm.cpp	27 Apr 2002 07:42:14 -0000	1.129
--- scummvm.cpp	28 Apr 2002 06:51:23 -0000	1.130
***************
*** 1172,1176 ****
  					else if (event.kbd.keycode=='g')
  						_fastMode ^= 2;
! 					else if (event.kbd.keycode=='d')
  						g_debugger.attach(this);
  					else if (event.kbd.keycode=='s')
--- 1172,1176 ----
  					else if (event.kbd.keycode=='g')
  						_fastMode ^= 2;
! 					else if ((event.kbd.keycode=='d') && (_fullScreen == false))
  						g_debugger.attach(this);
  					else if (event.kbd.keycode=='s')