projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding polyclip.obj to the watcom makefile
[dosdemo]
/
src
/
screen.c
diff --git
a/src/screen.c
b/src/screen.c
index
c91cb82
..
2b551f4
100644
(file)
--- a/
src/screen.c
+++ b/
src/screen.c
@@
-10,6
+10,9
@@
struct screen *fract_screen(void);
struct screen *grise_screen(void);
struct screen *polytest_screen(void);
struct screen *plasma_screen(void);
struct screen *grise_screen(void);
struct screen *polytest_screen(void);
struct screen *plasma_screen(void);
+struct screen *bump_screen(void);
+struct screen *thunder_screen(void);
+struct screen *metaballs_screen(void);
#define NUM_SCR 32
static struct screen *scr[NUM_SCR];
#define NUM_SCR 32
static struct screen *scr[NUM_SCR];
@@
-37,25
+40,23
@@
int scr_init(void)
if (!(scr[idx++] = plasma_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;
+ }
num_screens = idx;
assert(num_screens <= NUM_SCR);
for(i=0; i<num_screens; i++) {
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;
}
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;
}