fixed 16bpp offsets in csprite generator (hardcoded for now)

[dosdemo] / src / screen.c

diff --git a/src/screen.c b/src/screen.c
index 927903b..68a8c7f 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -9,8 +9,15 @@ struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
 struct screen *grise_screen(void);
 struct screen *polytest_screen(void);
-
-#define NUM_SCR        32
+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;
 
@@ -33,25 +40,35 @@ int scr_init(void)
        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;
 
        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;
 }
@@ -66,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) {
@@ -79,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)
@@ -111,7 +141,7 @@ 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;