X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fscreen.c;h=68a8c7f78a2139ba23c8c56794088f67f7b36f1b;hp=43797780390776858ed59a5968a35eba761255c0;hb=73f97e0d9dc83cad4aa7b53d900ea28390afed4f;hpb=e75a1243556f063851a5adf9cb2e1a00878c4365

diff --git a/src/screen.c b/src/screen.c
index 4379778..68a8c7f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7,9 +7,17 @@
 
 struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
-struct screen *mike_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);
+struct screen *greets_screen(void);
+struct screen *infcubes_screen(void);
+struct screen *hairball_screen(void);
+
+#define NUM_SCR 32
 static struct screen *scr[NUM_SCR];
 static int num_screens;
 
@@ -26,7 +34,31 @@ int scr_init(void)
 	if(!(scr[idx++] = fract_screen())) {
 		return -1;
 	}
-	if (!(scr[idx++] = mike_screen())) {
+	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;
+	}
+	if(!(scr[idx++] = greets_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = infcubes_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = hairball_screen())) {
 		return -1;
 	}
 	num_screens = idx;
@@ -34,20 +66,9 @@ int scr_init(void)
 	assert(num_screens <= NUM_SCR);
 
 	for(i=0; i<num_screens; i++) {
-		int r;
-		r = scr[i]->init();
-		if(r == -1) {
+		if(scr[i]->init() == -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;
 }
@@ -62,7 +83,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) {
@@ -75,9 +96,22 @@ void scr_update(void)
 	}
 }
 
+
 void scr_draw(void)
 {
-	if(cur) cur->draw();
+	if(cur) {
+		cur->draw();
+
+		/* print screen name */
+		cs_puts(fb_pixels, 0, 0, cur->name);
+	}
+}
+
+void scr_keypress(int key)
+{
+	if(cur && cur->keypress) {
+		cur->keypress(key);
+	}
 }
 
 struct screen *scr_lookup(const char *name)
@@ -107,17 +141,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 {