X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscreen.c;h=c91cb82ad2ce6df871418a03aa5bb74064aa74ad;hb=a8d502c1e163a95f25b2f5aec1478d2cb61027c2;hp=d55727a4d10d504f01aeec29d5edbdb5216fedfc;hpb=67ecd561eda2d5ca1a9a67588f01bd9d530751c0;p=dosdemo diff --git a/src/screen.c b/src/screen.c index d55727a..c91cb82 100644 --- a/src/screen.c +++ b/src/screen.c @@ -8,8 +8,10 @@ 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; @@ -29,6 +31,12 @@ int scr_init(void) 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); @@ -62,7 +70,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) { @@ -107,17 +115,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 {