[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.31,1.32

[Max Horn]

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

Modified Files:
	scummvm.cpp 
Log Message:
don't tolerate warnings

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- scummvm.cpp	21 Sep 2002 16:20:52 -0000	1.31
+++ scummvm.cpp	22 Sep 2002 00:38:02 -0000	1.32
@@ -1259,8 +1259,15 @@
 #endif
 #endif
 	}
-	// Doesn't wait for any keypress!! Is it intended to?
+	
+	// Finally exit. quit() will terminate the program
 	g_scumm->_system->quit();
+	
+	
+	// This point should never be reached. However, since virtual methods (like quit() is)
+	// can't be marked as noreturn, gcc will complain at this point. Thus we add in this
+	// call to exit(0) even though it is never reached.
+	exit(0);
 }
 
 ScummDebugger g_debugger;
@@ -1501,7 +1508,7 @@
 void Scumm::setupGUIColors() {
 
 	/* FIXME: strange IF line? */
-	if (_gameId && !(_features & GF_SMALL_HEADER)	&& !(_features & GF_AFTER_V7)) {
+	if (_gameId && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V7)) {
 		_gui->_bgcolor = getDefaultGUIColor(0);
 		_gui->_color = getDefaultGUIColor(1);
 		_gui->_textcolor = getDefaultGUIColor(2);