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);
-#define NUM_SCR 32
+#define NUM_SCR 32
static struct screen *scr[NUM_SCR];
static int num_screens;
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;
+ }
num_screens = idx;
assert(num_screens <= NUM_SCR);
for(i=0; i<num_screens; i++) {
- if(scr[i]->init() == -1) {
+ 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;
}
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) {
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 {