projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build mikmod and the music code on windows
[dosdemo]
/
src
/
screen.c
diff --git
a/src/screen.c
b/src/screen.c
index
a949fc4
..
c91cb82
100644
(file)
--- a/
src/screen.c
+++ b/
src/screen.c
@@
-1,14
+1,19
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include "screen.h"
#include "demo.h"
struct screen *tunnel_screen(void);
struct screen *fract_screen(void);
#include "screen.h"
#include "demo.h"
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 struct screen *scr[NUM_SCR];
+static int num_screens;
static struct screen *cur, *prev, *next;
static long trans_start, trans_dur;
static struct screen *cur, *prev, *next;
static long trans_start, trans_dur;
@@
-23,11
+28,34
@@
int scr_init(void)
if(!(scr[idx++] = fract_screen())) {
return -1;
}
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_SCR; i++) {
- if(scr[i] && scr[i]->init() == -1) {
+ for(i=0; i<num_screens; i++) {
+ 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;
}
@@
-35,15
+63,14
@@
int scr_init(void)
void scr_shutdown(void)
{
int i;
void scr_shutdown(void)
{
int i;
- for(i=0; i<NUM_SCR; i++) {
- if(!scr[i]) break;
+ for(i=0; i<num_screens; i++) {
scr[i]->shutdown();
}
}
void scr_update(void)
{
scr[i]->shutdown();
}
}
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) {
@@
-64,8
+91,7
@@
void scr_draw(void)
struct screen *scr_lookup(const char *name)
{
int i;
struct screen *scr_lookup(const char *name)
{
int i;
- for(i=0; i<NUM_SCR; i++) {
- if(!scr[i]) break;
+ for(i=0; i<num_screens; i++) {
if(strcmp(scr[i]->name, name) == 0) {
return scr[i];
}
if(strcmp(scr[i]->name, name) == 0) {
return scr[i];
}
@@
-73,23
+99,30
@@
struct screen *scr_lookup(const char *name)
return 0;
}
return 0;
}
+struct screen *scr_screen(int idx)
+{
+ return scr[idx];
+}
+
+int scr_num_screens(void)
+{
+ return num_screens;
+}
+
int scr_change(struct screen *s, long trans_time)
{
if(!s) return -1;
if(s == cur) return 0;
if(trans_time) {
int scr_change(struct screen *s, long trans_time)
{
if(!s) return -1;
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 {