X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdemo.c;h=f7a2463c7b9d4997bb502182b3189863c6d260bb;hp=f9d49002fe7dfc51f26718a048d4769290678733;hb=HEAD;hpb=6c97c0ce46b475901a38393602887912a44a473b diff --git a/src/demo.c b/src/demo.c index f9d4900..2479c42 100644 --- a/src/demo.c +++ b/src/demo.c @@ -17,7 +17,7 @@ #define MOUSE_TIMEOUT 1200 #define GUARD_XPAD 0 -#define GUARD_YPAD 32 +#define GUARD_YPAD 64 int fb_width, fb_height, fb_bpp, fb_scan_size; float fb_aspect; @@ -42,10 +42,21 @@ static int con_active; extern uint16_t loading_pixels[]; /* data.asm */ - int demo_init(int argc, char **argv) { - struct screen *scr; + if(demo_init1(argc, argv) == -1) { + return -1; + } + if(demo_init2() == -1) { + return -1; + } + return 0; +} + +static struct screen *scr; + +int demo_init1(int argc, char **argv) +{ char *env; if(load_config("demo.cfg") == -1) { @@ -57,13 +68,11 @@ int demo_init(int argc, char **argv) if(parse_args(argc, argv) == -1) { return -1; } + return 0; +} - /* reuse the loading image as our back buffer. - * adjust fb_pixels to leave 4 pixels guard band top/bottom. We have enough - * space since the loading image is 8 pixels taller. - */ - fb_pixels = loading_pixels + 320 * 4; - +int demo_init2(void) +{ con_init(); initFpsFonts(); @@ -81,6 +90,7 @@ int demo_init(int argc, char **argv) if(scr_init() == -1) { return -1; } + if(opt.start_scr) { scr = scr_lookup(opt.start_scr); } else {