X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscreen.c;h=54cd3e24d4e773f8ca23a9a1e97375a87a473548;hb=633743214adddf6ec20f8b1bee1782e6966023af;hp=a0faa4be036c112037ec188fb17379808504c434;hpb=77c1d84c258ca14e1bba06ab711426668ff24290;p=dosdemo

diff --git a/src/screen.c b/src/screen.c
index a0faa4b..54cd3e2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,29 +1,57 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #include "screen.h"
 #include "demo.h"
 
 struct screen *tunnel_screen(void);
+struct screen *fract_screen(void);
+struct screen *grise_screen(void);
+struct screen *polytest_screen(void);
 
-#define NUM_SCR	1
+#define NUM_SCR	32
 static struct screen *scr[NUM_SCR];
+static int num_screens;
 
 static struct screen *cur, *prev, *next;
 static long trans_start, trans_dur;
 
 int scr_init(void)
 {
-	int i;
+	int i, idx = 0;
 
-	if(!(scr[0] = tunnel_screen())) {
+	if(!(scr[idx++] = tunnel_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = fract_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = grise_screen())) {
 		return -1;
 	}
+	if(!(scr[idx++] = polytest_screen())) {
+		return -1;
+	}
+	num_screens = idx;
 
-	for(i=0; i<NUM_SCR; i++) {
-		if(scr[i]->init() == -1) {
+	assert(num_screens <= NUM_SCR);
+
+	for(i=0; i<num_screens; i++) {
+		int r;
+		r = scr[i]->init();
+		if(r == -1) {
 			return -1;
 		}
+
+		/* Make the effect run first if it returns "CAFE" from ins init() */
+		if (r == 0xCAFE) {
+			struct screen *tmp;
+			tmp = scr[i];
+			scr[i] = scr[0];
+			scr[0] = tmp;
+			printf("*** Screen %s displayed out of order ***\n", scr[0]->name);
+		}
 	}
 	return 0;
 }
@@ -31,7 +59,7 @@ int scr_init(void)
 void scr_shutdown(void)
 {
 	int i;
-	for(i=0; i<NUM_SCR; i++) {
+	for(i=0; i<num_screens; i++) {
 		scr[i]->shutdown();
 	}
 }
@@ -41,7 +69,9 @@ void scr_update(void)
 	if(prev) {	/* we're in the middle of a transition */
 		long interval = time_msec - trans_start;
 		if(interval >= trans_dur) {
-			next->start(trans_dur);
+			if(next->start) {
+				next->start(trans_dur);
+			}
 			prev = 0;
 			cur = next;
 			next = 0;
@@ -57,7 +87,7 @@ void scr_draw(void)
 struct screen *scr_lookup(const char *name)
 {
 	int i;
-	for(i=0; i<NUM_SCR; i++) {
+	for(i=0; i<num_screens; i++) {
 		if(strcmp(scr[i]->name, name) == 0) {
 			return scr[i];
 		}
@@ -65,6 +95,16 @@ struct screen *scr_lookup(const char *name)
 	return 0;
 }
 
+struct screen *scr_screen(int idx)
+{
+	return scr[idx];
+}
+
+int scr_num_screens(void)
+{
+	return num_screens;
+}
+
 int scr_change(struct screen *s, long trans_time)
 {
 	if(!s) return -1;
@@ -78,12 +118,16 @@ int scr_change(struct screen *s, long trans_time)
 	}
 
 	if(cur) {
-		cur->stop(trans_dur);
+		if(cur->stop) {
+			cur->stop(trans_dur);
+		}
 
 		prev = cur;
 		next = s;
 	} else {
-		s->start(trans_dur);
+		if(s->start) {
+			s->start(trans_dur);
+		}
 
 		cur = s;
 		prev = 0;