X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscreen.c;h=ea9bb943c3f1a1237a0c46884be7b40bbd874178;hb=HEAD;hp=15eb57cf396f392105405d39172b11244bb64f08;hpb=fd9d35fd2cfd07f9a239d795f46c6bb9e733634e;p=dosdemo

diff --git a/src/screen.c b/src/screen.c
index 15eb57c..190b19f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -26,6 +26,8 @@ struct screen *greets_screen(void);
 struct screen *infcubes_screen(void);
 struct screen *hairball_screen(void);
 struct screen *cybersun_screen(void);
+struct screen *raytrace_screen(void);
+struct screen *minifx_screen(void);
 
 void start_loadscr(void);
 void end_loadscr(void);
@@ -83,6 +85,13 @@ int scr_init(void)
 	if(!(scr[idx++] = cybersun_screen())) {
 		return -1;
 	}
+	if(!(scr[idx++] = raytrace_screen())) {
+		return -1;
+	}
+    if (!(scr[idx++] = minifx_screen())) {
+		return -1;
+    }
+    
 	num_screens = idx;
 
 	assert(num_screens <= NUM_SCR);
@@ -191,7 +200,7 @@ int scr_change(struct screen *s, long trans_time)
 /* loading screen */
 extern uint16_t loading_pixels[];
 static long prev_load_msec;
-static long load_delay = 180;
+static long load_delay;
 
 void start_loadscr(void)
 {
@@ -202,7 +211,9 @@ void start_loadscr(void)
 	}
 
 	swap_buffers(loading_pixels);
-	sleep_msec(load_delay * 2);
+	if(load_delay) {
+		sleep_msec(load_delay * 2);
+	}
 	prev_load_msec = get_msec();
 }
 
@@ -220,7 +231,9 @@ void end_loadscr(void)
 	blitfb(loading_pixels + SPLAT_Y * 320 + SPLAT_X, loading_pixels + 320 * 240, 32, 72, 32);
 	blit_key(loading_pixels + FING_Y * 320 + FING_LAST_X, 320, loading_pixels + 247 * 320 + 64, FING_W, FING_H, FING_W, 0);
 	swap_buffers(loading_pixels);
-	sleep_msec(load_delay * 4);
+	if(load_delay) {
+		sleep_msec(load_delay * 3);
+	}
 }
 
 void loadscr(int n, int count)