X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemo.c;h=9133a2658aa6f1e3b598c186018671c8dfa2372c;hb=a714b8c4811627d874934b0a0387b8cb27fc5921;hp=fbcc4bebd1c161bcf7a54be4bcc069991a9b7845;hpb=633743214adddf6ec20f8b1bee1782e6966023af;p=dosdemo

diff --git a/src/demo.c b/src/demo.c
index fbcc4be..9133a26 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -7,11 +7,12 @@
 #include "demo.h"
 #include "screen.h"
 #include "3dgfx.h"
+#include "music.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;
@@ -23,6 +24,7 @@ int demo_init(int argc, char **argv)
 {
 	struct screen *scr;
 
+	start_scr_name = getenv("START_SCR");
 	if(argv[1]) {
 		start_scr_name = argv[1];
 	}
@@ -32,6 +34,11 @@ int demo_init(int argc, char **argv)
 	}
 	g3d_framebuffer(fb_width, fb_height, fb_pixels);
 
+	if(music_open("data/test.mod") == -1) {
+		fprintf(stderr, "failed to open music: data/test.mod\n");
+		return -1;
+	}
+
 	if(scr_init() == -1) {
 		return -1;
 	}
@@ -48,11 +55,14 @@ int demo_init(int argc, char **argv)
 
 	/* clear the framebuffer at least once */
 	memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
+
+	music_play();
 	return 0;
 }
 
 void demo_cleanup(void)
 {
+	music_close();
 	scr_shutdown();
 	g3d_destroy();
 
@@ -64,6 +74,7 @@ void demo_cleanup(void)
 
 void demo_draw(void)
 {
+	music_update();
 	scr_update();
 	scr_draw();