projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test blits of RLE with scaling
[dosdemo]
/
src
/
screen.c
diff --git
a/src/screen.c
b/src/screen.c
index
178cf7d
..
54cd3e2
100644
(file)
--- a/
src/screen.c
+++ b/
src/screen.c
@@
-7,7
+7,8
@@
struct screen *tunnel_screen(void);
struct screen *fract_screen(void);
struct screen *tunnel_screen(void);
struct screen *fract_screen(void);
-struct screen *mike_screen(void);
+struct screen *grise_screen(void);
+struct screen *polytest_screen(void);
#define NUM_SCR 32
static struct screen *scr[NUM_SCR];
#define NUM_SCR 32
static struct screen *scr[NUM_SCR];
@@
-26,7
+27,10
@@
int scr_init(void)
if(!(scr[idx++] = fract_screen())) {
return -1;
}
if(!(scr[idx++] = fract_screen())) {
return -1;
}
- if (!(scr[idx++] = mike_screen())) {
+ if (!(scr[idx++] = grise_screen())) {
+ return -1;
+ }
+ if(!(scr[idx++] = polytest_screen())) {
return -1;
}
num_screens = idx;
return -1;
}
num_screens = idx;
@@
-34,9
+38,20
@@
int scr_init(void)
assert(num_screens <= NUM_SCR);
for(i=0; i<num_screens; i++) {
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;
}
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;
}
}
return 0;
}