X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdos%2Fmain.c;h=566d47e9f8939e50e61fbdced4f0e22adab15c3c;hp=0de90ed1d1a00ffcacdb6f6a797f41969b854122;hb=0ce0f59d2afd26e0956716fae169075368020a02;hpb=d956a9d9273eebfacfda58cb3bafff017269d5dc

diff --git a/src/dos/main.c b/src/dos/main.c
index 0de90ed..566d47e 100644
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if((vmidx = match_video_mode(640, 480, 16)) == -1) {
+	if((vmidx = match_video_mode(FB_WIDTH, FB_HEIGHT, FB_BPP)) == -1) {
 		return 1;
 	}
 	if(!(vmem = set_video_mode(vmidx, 1))) {
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if(init(argc, argv) == -1) {
+	if(demo_init(argc, argv) == -1) {
 		status = -1;
 		goto break_evloop;
 	}
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 	for(;;) {
 		int key;
 		while((key = kb_getkey()) != -1) {
-			demo_key(key, 1);
+			demo_keyboard(key, 1);
 			if(quit) goto break_evloop;
 		}
 
@@ -99,11 +99,11 @@ int main(int argc, char **argv)
 		}
 
 		time_msec = get_msec();
-		draw();
+		demo_draw();
 	}
 
 break_evloop:
-	cleanup();
+	demo_cleanup();
 	set_text_mode();
 	cleanup_video();
 	kb_shutdown();