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
54cd3e2
..
2b551f4
100644
(file)
--- a/
src/screen.c
+++ b/
src/screen.c
@@
-9,8
+9,12
@@
struct screen *tunnel_screen(void);
struct screen *fract_screen(void);
struct screen *grise_screen(void);
struct screen *polytest_screen(void);
struct screen *fract_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
+#define NUM_SCR 32
static struct screen *scr[NUM_SCR];
static int num_screens;
static struct screen *scr[NUM_SCR];
static int num_screens;
@@
-33,25
+37,26
@@
int scr_init(void)
if(!(scr[idx++] = polytest_screen())) {
return -1;
}
if(!(scr[idx++] = polytest_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;
}
@@
-66,7
+71,7
@@
void scr_shutdown(void)
void scr_update(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) {
long interval = time_msec - trans_start;
if(interval >= trans_dur) {
if(next->start) {
@@
-111,17
+116,14
@@
int scr_change(struct screen *s, long trans_time)
if(s == cur) return 0;
if(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;
}
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 {
prev = cur;
next = s;
} else {