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

diff --git a/src/screen.c b/src/screen.c
index 2387d52..fa70413 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7,8 +7,16 @@
 
 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);
+struct screen *greets_screen(void);
+struct screen *infcubes_screen(void);
+
+#define NUM_SCR 32
 static struct screen *scr[NUM_SCR];
 static int num_screens;
 
@@ -25,6 +33,30 @@ 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;
+	}
+	if(!(scr[idx++] = greets_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = infcubes_screen())) {
+		return -1;
+	}
 	num_screens = idx;
 
 	assert(num_screens <= NUM_SCR);
@@ -47,7 +79,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) {
@@ -65,6 +97,13 @@ void scr_draw(void)
 	if(cur) cur->draw();
 }
 
+void scr_keypress(int key)
+{
+	if(cur && cur->keypress) {
+		cur->keypress(key);
+	}
+}
+
 struct screen *scr_lookup(const char *name)
 {
 	int i;
@@ -92,17 +131,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 {