... | ... |
@@ -24,7 +24,7 @@ |
24 | 24 |
|
25 | 25 |
|00 @System &vector $2 &wst $1 &rst $1 &pad $4 &r $2 &g $2 &b $2 &debug $1 &halt $1 |
26 | 26 |
|10 @Console &vector $2 &read $1 &pad $5 &write $1 &error $1 |
27 |
-|20 @Screen &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 |
|
27 |
+|20 @Screen &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 |
|
28 | 28 |
|30 @Audio0 &vector $2 &position $2 &output $1 &pad $3 &adsr $2 &length $2 &addr $2 &volume $1 &pitch $1 |
29 | 29 |
|40 @Audio1 &vector $2 &position $2 &output $1 &pad $3 &adsr $2 &length $2 &addr $2 &volume $1 &pitch $1 |
30 | 30 |
|50 @Audio2 &vector $2 &position $2 &output $1 &pad $3 &adsr $2 &length $2 &addr $2 &volume $1 &pitch $1 |
... | ... |
@@ -22,7 +22,7 @@ WITH REGARD TO THIS SOFTWARE. |
22 | 22 |
#include <unistd.h> |
23 | 23 |
|
24 | 24 |
static FILE *f; |
25 |
-static DIR *d; |
|
25 |
+static DIR *dir; |
|
26 | 26 |
static char *current_filename = ""; |
27 | 27 |
static struct dirent *de; |
28 | 28 |
|
... | ... |
@@ -38,9 +38,9 @@ reset(void) |
38 | 38 |
fclose(f); |
39 | 39 |
f = NULL; |
40 | 40 |
} |
41 |
- if(d != NULL) { |
|
42 |
- closedir(d); |
|
43 |
- d = NULL; |
|
41 |
+ if(dir != NULL) { |
|
42 |
+ closedir(dir); |
|
43 |
+ dir = NULL; |
|
44 | 44 |
} |
45 | 45 |
de = NULL; |
46 | 46 |
state = IDLE; |
... | ... |
@@ -67,8 +67,8 @@ file_read_dir(char *dest, Uint16 len) |
67 | 67 |
{ |
68 | 68 |
static char pathname[4096]; |
69 | 69 |
char *p = dest; |
70 |
- if(de == NULL) de = readdir(d); |
|
71 |
- for(; de != NULL; de = readdir(d)) { |
|
70 |
+ if(de == NULL) de = readdir(dir); |
|
71 |
+ for(; de != NULL; de = readdir(dir)) { |
|
72 | 72 |
Uint16 n; |
73 | 73 |
if(de->d_name[0] == '.' && de->d_name[1] == '\0') |
74 | 74 |
continue; |
... | ... |
@@ -94,7 +94,7 @@ file_read(void *dest, Uint16 len) |
94 | 94 |
{ |
95 | 95 |
if(state != FILE_READ && state != DIR_READ) { |
96 | 96 |
reset(); |
97 |
- if((d = opendir(current_filename)) != NULL) |
|
97 |
+ if((dir = opendir(current_filename)) != NULL) |
|
98 | 98 |
state = DIR_READ; |
99 | 99 |
else if((f = fopen(current_filename, "rb")) != NULL) |
100 | 100 |
state = FILE_READ; |