[Scummvm-cvs-logs] CVS: residual main.cpp,1.46,1.47

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23857

Modified Files:
	main.cpp 
Log Message:
moved code to handle startup params properly

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- main.cpp	12 Jan 2005 18:06:43 -0000	1.46
+++ main.cpp	12 Jan 2005 18:12:11 -0000	1.47
@@ -83,24 +83,7 @@
 int main(int argc, char *argv[]) {
 	int i;
 
-	if (SDL_Init(SDL_INIT_EVERYTHING) < 0)
-		return 1;
-
-	atexit(quit);
-
 	g_registry = new Registry();
-	g_engine = new Engine();
-	g_resourceloader = new ResourceLoader();
-	g_localizer = new Localizer();
-	g_mixer = new SoundMixer();
-	g_mixer->setVolume(255);
-	g_timer = new Timer();
-	g_smush = new Smush();
-	if (TINYGL_GLOBAL)
-		g_driver = new DriverTinyGL(640, 480, 16);
-	else
-		g_driver = new DriverGL(640, 480, 24);
-	g_imuse = new Imuse(20);
 
 	// Parse command line
 	ZBUFFER_GLOBAL = parseBoolStr(g_registry->get("zbuffer"));
@@ -130,6 +113,24 @@
 		}
 	}
 
+	if (SDL_Init(SDL_INIT_EVERYTHING) < 0)
+		return 1;
+
+	atexit(quit);
+
+	g_engine = new Engine();
+	g_resourceloader = new ResourceLoader();
+	g_localizer = new Localizer();
+	g_mixer = new SoundMixer();
+	g_mixer->setVolume(255);
+	g_timer = new Timer();
+	g_smush = new Smush();
+	if (TINYGL_GLOBAL)
+		g_driver = new DriverTinyGL(640, 480, 16);
+	else
+		g_driver = new DriverGL(640, 480, 24);
+	g_imuse = new Imuse(20);
+
 	Bitmap *splash_bm = g_resourceloader->loadBitmap("splash.bm");
 
 	SDL_Event event;