xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed games/blabs

Browse source
This commit is contained in:
aiju 2011-08-07 21:22:19 +02:00
parent 3a8e788bef
commit 00f4e0ff7a
3 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

37
sys/src/games/blabs/blabs.c
View file

@ -383,7 +383,7 @@ undraw(Dot *d)
r = rectaddpt(r, d->pos); r = rectaddpt(r, d->pos);
r = rectaddpt(r, screen->r.min); r = rectaddpt(r, screen->r.min);
draw(screen, r, display->black, d->mask, d->face->r.min); draw(screen, r, display->white, d->mask, d->face->r.min);
/* /*
if (track_width > 0) if (track_width > 0)
@ -460,7 +460,7 @@ spin(Dot *d)
{ {
int i; int i;
if (d->spin > 0) if (0&&d->spin > 0)
{ {
i = (d->facei + d->spin) % nels(d->faces); i = (d->facei + d->spin) % nels(d->faces);
d->face = d->faces[i]; d->face = d->faces[i];
@ -652,7 +652,7 @@ setup(Dot *d, char *who, uchar *face, int n_els)
for(k = 0; k < repl; k++) for(k = 0; k < repl; k++)
{ {
tmpface[n] |= (mask-bits) << (k*nbits); tmpface[n] |= (mask-bits) << (k*nbits);
tmpmask[n] |= (bits==mask ? 0 : mask) << (k*nbits); tmpmask[n] |= (bits!=0 ? mask : 0) << (k*nbits);
} }
n++; n++;
} }
@ -718,25 +718,6 @@ setup(Dot *d, char *who, uchar *face, int n_els)
drawdot(d); drawdot(d);
} }
int
msec(void)
{
static int fd;
int n;
char buf[64];
if(fd <= 0)
fd = open("/dev/msec", OREAD);
if(fd < 0)
return 0;
if(seek(fd, 0, 0) < 0)
return 0;
if((n=read(fd, buf, sizeof(buf)-1)) < 0)
return 0;
buf[n] = 0;
return atoi(buf);
}
/* /*
* debugging: make del pause so that we can * debugging: make del pause so that we can
* inspect window. * inspect window.
@ -754,7 +735,7 @@ void
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c; int c;
long now, then; vlong now, then;
ARGBEGIN ARGBEGIN
{ {
@ -801,7 +782,7 @@ main(int argc, char *argv[])
initdraw(0,0,0); initdraw(0,0,0);
im = eallocimage(display, Rect(0, 0, PDUP*NPJW, PDUP*NPJW), CMAP8, 0, DNofill); im = eallocimage(display, Rect(0, 0, PDUP*NPJW, PDUP*NPJW), CMAP8, 0, DNofill);
draw(screen, screen->r, display->black, nil, ZP); draw(screen, screen->r, display->white, nil, ZP);
/* track = balloc(Rect(0, 0, track_width, track_width), 0); */ /* track = balloc(Rect(0, 0, track_width, track_width), 0); */
@ -832,8 +813,8 @@ main(int argc, char *argv[])
SET(c); SET(c);
USED(c); USED(c);
#define DELAY 100 #define DELAY 50000000LL
for (then = msec();; then = msec()) for (then = nsec();; then = nsec())
{ {
Dot *d; Dot *d;
@ -843,8 +824,8 @@ main(int argc, char *argv[])
upd(d); upd(d);
draw(screen, screen->r, screen, nil, screen->r.min); draw(screen, screen->r, screen, nil, screen->r.min);
flushimage(display, 1); flushimage(display, 1);
now = msec(); now = nsec();
if(now - then < DELAY) if(now - then < DELAY)
sleep(DELAY - (now - then)); sleep((DELAY - (now - then))/1000000);
} }
} }

4
sys/src/games/blabs/mkface
View file

@ -27,8 +27,8 @@ if(~ $file notfound) {
echo 'uchar '$who'bits[] = {' echo 'uchar '$who'bits[] = {'
switch($file) { switch($file) {
case *48x48x8* *48x48x4* case *48x48x8* *48x48x4*
fb/enc2bit $file | dd -bs 60 -skip 1 >[2]/dev/null | xd | iconv -u $file | dd -bs 60 -skip 1 >[2]/dev/null | xd |
sed 's#^.......##' | unhex sed 's#^.......##' | unhex | sed 's/0x/~&/g'
case *48x48x2* *48x48x1* case *48x48x2* *48x48x1*
cat $file | unhex cat $file | unhex
} }

1
sys/src/games/mkfile
View file

@ -11,6 +11,7 @@ TARG=4s\
mole\ mole\
glendy\ glendy\
packet\ packet\
blabs\
OFILES= OFILES=
HFILES= HFILES=