added crappy polygon filler

[dosdemo] / src / screen.c

diff --git a/src/screen.c b/src/screen.c
index a949fc4..54cd3e2 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,14 +1,18 @@
 #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        32
 static struct screen *scr[NUM_SCR];
+static int num_screens;
 
 static struct screen *cur, *prev, *next;
 static long trans_start, trans_dur;
@@ -23,11 +27,31 @@ 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;
+       }
+       num_screens = idx;
 
-       for(i=0; i<NUM_SCR; i++) {
-               if(scr[i] && 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;
 }
@@ -35,8 +59,7 @@ int scr_init(void)
 void scr_shutdown(void)
 {
        int i;
-       for(i=0; i<NUM_SCR; i++) {
-               if(!scr[i]) break;
+       for(i=0; i<num_screens; i++) {
                scr[i]->shutdown();
        }
 }
@@ -64,8 +87,7 @@ void scr_draw(void)
 struct screen *scr_lookup(const char *name)
 {
        int i;
-       for(i=0; i<NUM_SCR; i++) {
-               if(!scr[i]) break;
+       for(i=0; i<num_screens; i++) {
                if(strcmp(scr[i]->name, name) == 0) {
                        return scr[i];
                }
@@ -73,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;