[Scummvm-cvs-logs] CVS: scummvm/scumm debug.cpp,1.3,1.4 scummvm.cpp,1.19,1.20

James Brown ender at users.sourceforge.net
Mon Sep 16 21:53:03 CEST 2002


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

Modified Files:
	debug.cpp scummvm.cpp 
Log Message:
Replace some exit()'s with a call to the OSystem quit method, as per 610251. 



Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debug.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debug.cpp	1 Sep 2002 15:01:39 -0000	1.3
+++ debug.cpp	17 Sep 2002 04:52:50 -0000	1.4
@@ -140,7 +140,7 @@
 		}
 		return true;
 	case CMD_QUIT:
-		exit(1);
+		_s->_system->quit();
 
 	default:											/* this line is never reached */
 		error("Unknown debug command");

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scummvm.cpp	16 Sep 2002 10:42:12 -0000	1.19
+++ scummvm.cpp	17 Sep 2002 04:52:50 -0000	1.20
@@ -1261,7 +1261,7 @@
 #endif
 	}
 	// Doesn't wait for any keypress!! Is it intended to?
-	exit(1);
+	g_scumm->_system->quit();
 }
 
 void CDECL warning(const char *s, ...)





More information about the Scummvm-git-logs mailing list