[Scummvm-cvs-logs] CVS: scummvm/bs2 debug.cpp,1.8,1.9 sword2.cpp,1.36,1.37

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv20333

Modified Files:
	debug.cpp sword2.cpp 
Log Message:
Must ... make ... space ... for ... FotAQ ...


Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debug.cpp	9 Sep 2003 12:14:08 -0000	1.8
+++ debug.cpp	23 Sep 2003 16:38:37 -0000	1.9
@@ -105,12 +105,7 @@
 	// wait for fade to finish before calling RestoreDisplay()
 	WaitForFade();
 
-	ReportFatalError((const uint8 *)buf);	// display message box
-	CloseAppWindow();
-	// This looks like a bad idea, since our ServiceWindows() never
-	// returns RDERR_APPCLOSED.
-	// while (ServiceWindows() != RDERR_APPCLOSED);
-	exit(0);
+	error(buf);
 }
 
 #ifdef _SWORD2_DEBUG	// all other functions only for _SWORD2_DEBUG version

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sword2.cpp	23 Sep 2003 16:13:13 -0000	1.36
+++ sword2.cpp	23 Sep 2003 16:38:37 -0000	1.37
@@ -263,11 +263,6 @@
 
 	// Zdebug("[%s]", lpCmdLine);
 
-#ifndef _SWORD2_DEBUG
-	// so cannot use Ctrl-Q from the release versions (full game or demo)
-	DisableQuitKey();
-#endif
-
 	// Call the application "Revolution" until the resource manager is
 	// ready to dig the name out of a text file. See InitialiseGame()
 	// which calls InitialiseFontResourceFlags() in maketext.cpp
@@ -275,16 +270,6 @@
 	// Have to do it like this since we cannot really fire up the resource
 	// manager until a window has been created as any errors are displayed
 	// via a window, thus time becomes a loop.
-
-	// Zdebug("CALLING: InitialiseWindow");
-	// rv = InitialiseWindow(hInstance, hPrevInstance, lpCmdLine, nCmdShow, "Revolution");
-	rv = RD_OK;
-	// Zdebug("RETURNED with rv = %.8x", rv);
-
-	if (rv != RD_OK) {
-		// ReportDriverError(rv);
-		return;
-	}
 
 	// Override global scaler with any game-specific define
 	if (g_config->get("gfx_mode")) {