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

diff --git a/src/dos/main.c b/src/dos/main.c
index 70ea449..566d47e 100644
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -1,70 +1,77 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
-#include <limits.h>
-#include <assert.h>
-#include <conio.h>
 #include "demo.h"
 #include "keyb.h"
-#include "mouse.h"
 #include "timer.h"
 #include "gfx.h"
-#include "vmath.h"
-#include "sball.h"
-#include "cfgopt.h"
 #include "logger.h"
-#include "tinyfps.h"
 #include "cdpmi.h"
-
-#undef NOKEYB
+#include "audio.h"
+#include "sball.h"
+#include "vmath.h"
 
 static int handle_sball_event(sball_event *ev);
 static void recalc_sball_matrix(float *xform);
 
 static int quit;
-static int use_mouse;
-static long fbsize;
+
+int force_snd_config;
 
 static int use_sball;
 static vec3_t pos = {0, 0, 0};
 static quat_t rot = {0, 0, 0, 1};
 
+
 int main(int argc, char **argv)
 {
+	int i;
+	int vmidx, status = 0;
+
+	for(i=1; i<argc; i++) {
+		if(strcmp(argv[i], "-setup") == 0) {
+			force_snd_config = 1;
+		}
+	}
+
 #ifdef __DJGPP__
 	__djgpp_nearptr_enable();
 #endif
 
-	fbsize = fb_width * fb_height * fb_bpp / 8;
-
 	init_logger("demo.log");
 
+	/* au_init needs to be called early, before init_timer, and also before
+	 * we enter graphics mode, to use the midas configuration tool if necessary
+	 */
+	if(au_init() == -1) {
+		return 1;
+	}
+
 	init_timer(100);
-#ifndef NOKEYB
 	kb_init(32);
-#endif
 
-	if((use_mouse = have_mouse())) {
-		printf("initializing mouse input\n");
-		set_mouse_limits(0, 0, fb_width, fb_height);
-		set_mouse(fb_width / 2, fb_height / 2);
+	if(init_video() == -1) {
+		return 1;
 	}
 
-	/* allocate a couple extra rows as a guard band, until we fucking fix the rasterizer */
-	if(!(fb_pixels = malloc(fbsize + (fb_width * fb_bpp / 8) * 2))) {
-		fprintf(stderr, "failed to allocate backbuffer\n");
+	if((vmidx = match_video_mode(FB_WIDTH, FB_HEIGHT, FB_BPP)) == -1) {
 		return 1;
 	}
-	fb_pixels += fb_width;
-
-	if(!(vmem = set_video_mode(fb_width, fb_height, fb_bpp, 1))) {
+	if(!(vmem = set_video_mode(vmidx, 1))) {
 		return 1;
 	}
 
+	if(opt.mouse) {
+		if((opt.mouse = have_mouse())) {
+			printf("initializing mouse input\n");
+			set_mouse_limits(0, 0, FB_WIDTH - 1, FB_HEIGHT - 1);
+			set_mouse(FB_WIDTH / 2, FB_HEIGHT / 2);
+		}
+	}
+
 	if(demo_init(argc, argv) == -1) {
-		set_text_mode();
-		return 1;
+		status = -1;
+		goto break_evloop;
 	}
 
 	if(opt.sball && sball_init() == 0) {
@@ -73,20 +80,14 @@ int main(int argc, char **argv)
 
 	reset_timer();
 
-	while(!quit) {
-#ifndef NOKEYB
+	for(;;) {
 		int key;
 		while((key = kb_getkey()) != -1) {
 			demo_keyboard(key, 1);
+			if(quit) goto break_evloop;
 		}
-#else
-		if(kbhit()) {
-			demo_keyboard(getch(), 1);
-		}
-#endif
-		if(quit) goto break_evloop;
 
-		if(use_mouse) {
+		if(opt.mouse) {
 			mouse_bmask = read_mouse(&mouse_x, &mouse_y);
 		}
 		if(use_sball && sball_pending()) {
@@ -102,15 +103,15 @@ int main(int argc, char **argv)
 	}
 
 break_evloop:
-	set_text_mode();
 	demo_cleanup();
-#ifndef NOKEYB
+	set_text_mode();
+	cleanup_video();
 	kb_shutdown();
-#endif
+	au_shutdown();
 	if(use_sball) {
 		sball_shutdown();
 	}
-	return 0;
+	return status;
 }
 
 void demo_quit(void)
@@ -118,21 +119,6 @@ void demo_quit(void)
 	quit = 1;
 }
 
-void swap_buffers(void *pixels)
-{
-	if(!pixels) {
-		pixels = fb_pixels;
-	}
-
-	/* just memcpy to the front buffer */
-	if(opt.vsync) {
-		wait_vsync();
-	}
-	drawFps(pixels);
-	memcpy(vmem, pixels, fbsize);
-}
-
-
 #define TX(ev)	((ev)->motion.motion[0])
 #define TY(ev)	((ev)->motion.motion[1])
 #define TZ(ev)	((ev)->motion.motion[2])