X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fscreen.c;h=362a15c8a1fd6a8f55c32860665791d7641cef48;hp=17491d591dccce466eba853a20d38c2cafcfd426;hb=c912e59b898fe1ac461a1468e4a2e1937de286d7;hpb=493e590908a39324651cd2c81323e6969c0b4c4f

diff --git a/src/screen.c b/src/screen.c
index 17491d5..362a15c 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5,11 +5,24 @@
 #include "screen.h"
 #include "demo.h"
 
+#define DBG_SCRCHG \
+	do { \
+		dbg_curscr_name = cur->name ? cur->name : "<unknown>"; \
+		dbg_curscr_name_len = strlen(dbg_curscr_name); \
+		dbg_curscr_name_pos = 320 - dbg_curscr_name_len * 9; \
+	} while(0)
+
 struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
 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];
@@ -37,6 +50,24 @@ int scr_init(void)
 	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;
 
 	assert(num_screens <= NUM_SCR);
@@ -68,13 +99,25 @@ void scr_update(void)
 			prev = 0;
 			cur = next;
 			next = 0;
+
+			DBG_SCRCHG;
 		}
 	}
 }
 
+
 void scr_draw(void)
 {
-	if(cur) cur->draw();
+	if(cur) {
+		cur->draw();
+	}
+}
+
+void scr_keypress(int key)
+{
+	if(cur && cur->keypress) {
+		cur->keypress(key);
+	}
 }
 
 struct screen *scr_lookup(const char *name)
@@ -121,6 +164,8 @@ int scr_change(struct screen *s, long trans_time)
 
 		cur = s;
 		prev = 0;
+
+		DBG_SCRCHG;
 	}
 	return 0;
 }