X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemo.c;h=472da328519603287ff4b3ea29673f60166fb33c;hb=ed4dac9a7af24c8c4bb43484914c52502b68d8b7;hp=7d22dc4ea554f772580b5ea7d49dbde21581950e;hpb=6e4f1008ad81b6cc108c11736dbf9366a38092fc;p=dosdemo

diff --git a/src/demo.c b/src/demo.c
index 7d22dc4..472da32 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -6,48 +6,76 @@
 #include <limits.h>
 #include "demo.h"
 #include "screen.h"
+#include "3dgfx.h"
+#include "music.h"
+#include "cfgopt.h"
 
 int fb_width = 320;
 int fb_height = 240;
 int fb_bpp = 16;
-void *fb_pixels;
+uint16_t *fb_pixels, *vmem_back, *vmem_front;
 unsigned long time_msec;
 int mouse_x, mouse_y;
 unsigned int mouse_bmask;
 
 static unsigned long nframes;
-static const char *start_scr_name;
 
 int demo_init(int argc, char **argv)
 {
 	struct screen *scr;
+	char *env;
 
-	if(argv[1]) {
-		start_scr_name = argv[1];
+	if(load_config("demo.cfg") == -1) {
+		return -1;
+	}
+	if((env = getenv("START_SCR"))) {
+		opt.start_scr = env;
+	}
+	if(parse_args(argc, argv) == -1) {
+		return -1;
+	}
+
+	if(g3d_init() == -1) {
+		return -1;
+	}
+	g3d_framebuffer(fb_width, fb_height, fb_pixels);
+
+	if(opt.music) {
+		if(music_open("data/test.mod") == -1) {
+			return -1;
+		}
 	}
 
 	if(scr_init() == -1) {
 		return -1;
 	}
-	if(start_scr_name) {
-		scr = scr_lookup(start_scr_name);
+	if(opt.start_scr) {
+		scr = scr_lookup(opt.start_scr);
 	} else {
 		scr = scr_screen(0);
 	}
 
 	if(!scr || scr_change(scr, 4000) == -1) {
-		fprintf(stderr, "screen %s not found\n", start_scr_name ? start_scr_name : "0");
+		fprintf(stderr, "screen %s not found\n", opt.start_scr ? opt.start_scr : "0");
 		return -1;
 	}
 
 	/* clear the framebuffer at least once */
 	memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
+
+	if(opt.music) {
+		music_play();
+	}
 	return 0;
 }
 
 void demo_cleanup(void)
 {
+	if(opt.music) {
+		music_close();
+	}
 	scr_shutdown();
+	g3d_destroy();
 
 	if(time_msec) {
 		float fps = (float)nframes / ((float)time_msec / 1000.0f);
@@ -57,6 +85,9 @@ void demo_cleanup(void)
 
 void demo_draw(void)
 {
+	if(opt.music) {
+		music_update();
+	}
 	scr_update();
 	scr_draw();