X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fglut%2Fmain.c;h=824837e7e5fc2a715c01afa860d9b15ad99c7837;hp=abe25cc37ddfba069ee2054830e24f3091241e48;hb=0dfe9cb09717d84ecc24f7fba90742b503267bfd;hpb=6c97c0ce46b475901a38393602887912a44a473b

diff --git a/src/glut/main.c b/src/glut/main.c
index abe25cc..824837e 100644
--- a/src/glut/main.c
+++ b/src/glut/main.c
@@ -118,21 +118,26 @@ int main(int argc, char **argv)
 	wgl_swap_interval_ext = wglGetProcAddress("wglSwapIntervalEXT");
 #endif
 
-	reshape(glutGet(GLUT_WINDOW_WIDTH), glutGet(GLUT_WINDOW_HEIGHT));
-
 	if(au_init() == -1) {
 		return 1;
 	}
 	time_msec = 0;
-	if(demo_init(argc, argv) == -1) {
+	if(demo_init1(argc, argv) == -1) {
 		return 1;
 	}
-	atexit(demo_cleanup);
 
 	if(opt.fullscreen) {
 		set_fullscreen(opt.fullscreen);
+		reshape(glutGet(GLUT_SCREEN_WIDTH), glutGet(GLUT_SCREEN_HEIGHT));
+	} else {
+		reshape(glutGet(GLUT_WINDOW_WIDTH), glutGet(GLUT_WINDOW_HEIGHT));
 	}
 
+	if(demo_init2() == -1) {
+		return 1;
+	}
+	atexit(demo_cleanup);
+
 	reset_timer();
 
 	glutMainLoop();