Merge branch 'master' of goat:git/dosdemo

[dosdemo] / src / demo.c

diff --git a/src/demo.c b/src/demo.c
index a9611f6..9954cb5 100644 (file)
--- a/src/demo.c
+++ b/src/demo.c
@@ -12,15 +12,25 @@ int fb_height = 240;
 int fb_bpp = 16;
 void *fb_pixels;
 unsigned long time_msec;
+int mouse_x, mouse_y;
+unsigned int mouse_bmask;
 
 static unsigned long nframes;
+static const char *start_scr_name = "tunnel";
 
 int demo_init(int argc, char **argv)
 {
+       if(argv[1]) {
+               start_scr_name = argv[1];
+       }
+
        if(scr_init() == -1) {
                return -1;
        }
-       scr_change(scr_lookup("tunnel"), 4000);
+       if(scr_change(scr_lookup(start_scr_name), 4000) == -1) {
+               fprintf(stderr, "screen %s not found\n", start_scr_name);
+               return -1;
+       }
 
        /* clear the framebuffer at least once */
        memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);