[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.164,1.165 sdl.cpp,1.126,1.127

[James Brown]

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

Modified Files:
	scummvm.cpp sdl.cpp 
Log Message:
Fix Simon case sensitivity, work around Win32 SDL bug (hang on audio exit)


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- scummvm.cpp	7 Jun 2002 16:36:01 -0000	1.164
+++ scummvm.cpp	16 Jun 2002 04:09:22 -0000	1.165
@@ -293,8 +293,6 @@
 	}
 
 	if (_completeScreenRedraw) {
-		int i;
-		Actor *a;
 		_completeScreenRedraw = false;
 		gdi.clearUpperMask();
 		charset._hasMask = false;

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- sdl.cpp	14 Jun 2002 04:31:17 -0000	1.126
+++ sdl.cpp	16 Jun 2002 04:09:22 -0000	1.127
@@ -208,7 +208,13 @@
 
 void atexit_proc() {
 	SDL_ShowCursor(SDL_ENABLE);
-	SDL_Quit();
+
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
+	SDL_QuitSubSystem(SDL_INIT_TIMER);
+	SDL_QuitSubSystem(SDL_INIT_CDROM);
+#ifndef WIN32	// FIXME: SDL bug - closing audio freezes w/ waveout
+	SDL_QuitSubSystem(SDL_INIT_AUDIO);
+#endif
 }
 
 OSystem *OSystem_SDL::create(int gfx_mode, bool full_screen) {