X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscreen.c;h=2b551f46a667f3880b48599e75c185459df655fc;hb=134c9e63e9a7602cd2e0a3c05557edb0c9753c74;hp=2387d52471baa3ede9fbc480d71ca3074779094c;hpb=6e4f1008ad81b6cc108c11736dbf9366a38092fc;p=dosdemo

diff --git a/src/screen.c b/src/screen.c
index 2387d52..2b551f4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7,8 +7,14 @@
 
 struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
-
-#define NUM_SCR	32
+struct screen *grise_screen(void);
+struct screen *polytest_screen(void);
+struct screen *plasma_screen(void);
+struct screen *bump_screen(void);
+struct screen *thunder_screen(void);
+struct screen *metaballs_screen(void);
+
+#define NUM_SCR 32
 static struct screen *scr[NUM_SCR];
 static int num_screens;
 
@@ -25,6 +31,24 @@ int scr_init(void)
 	if(!(scr[idx++] = fract_screen())) {
 		return -1;
 	}
+	if (!(scr[idx++] = grise_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = polytest_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = plasma_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = bump_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = thunder_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = metaballs_screen())) {
+		return -1;
+	}
 	num_screens = idx;
 
 	assert(num_screens <= NUM_SCR);
@@ -47,7 +71,7 @@ void scr_shutdown(void)
 
 void scr_update(void)
 {
-	if(prev) {	/* we're in the middle of a transition */
+	if(prev) {  /* we're in the middle of a transition */
 		long interval = time_msec - trans_start;
 		if(interval >= trans_dur) {
 			if(next->start) {
@@ -92,17 +116,14 @@ int scr_change(struct screen *s, long trans_time)
 	if(s == cur) return 0;
 
 	if(trans_time) {
-		trans_dur = trans_time / 2;	/* half for each part transition out then in */
+		trans_dur = trans_time / 2; /* half for each part transition out then in */
 		trans_start = time_msec;
 	} else {
 		trans_dur = 0;
 	}
 
-	if(cur) {
-		if(cur->stop) {
-			cur->stop(trans_dur);
-		}
-
+	if(cur && cur->stop) {
+		cur->stop(trans_dur);
 		prev = cur;
 		next = s;
 	} else {