X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdos%2Fmain.c;h=d820c7bdc2f0f61841849f71b8463eafe5614e64;hb=fb3df30d97e3824335a6c17fd8d49b9706b6b3c7;hp=7535681505f1149fad0a51494ed321a7cfb6e9e6;hpb=93f68e445b0a4f10f2b15383aafed8a216a4a228;p=dosdemo

diff --git a/src/dos/main.c b/src/dos/main.c
index 7535681..d820c7b 100644
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -8,6 +8,9 @@
 #include "logger.h"
 #include "cdpmi.h"
 #include "audio.h"
+#include "sball.h"
+#include "vmath.h"
+#include "cpuid.h"
 
 static int handle_sball_event(sball_event *ev);
 static void recalc_sball_matrix(float *xform);
@@ -36,6 +39,10 @@ int main(int argc, char **argv)
 	__djgpp_nearptr_enable();
 #endif
 
+	if(read_cpuid(&cpuid) == 0) {
+		print_cpuid(&cpuid);
+	}
+
 	init_logger("demo.log");
 
 	/* au_init needs to be called early, before init_timer, and also before
@@ -52,7 +59,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))) {
@@ -67,7 +74,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if(init(argc, argv) == -1) {
+	if(demo_init(argc, argv) == -1) {
 		status = -1;
 		goto break_evloop;
 	}
@@ -81,7 +88,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;
 		}
 
@@ -97,11 +104,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();