diff options
| author | Paul Janzen <pjanzen@cvs.openbsd.org> | 2002-08-09 08:36:34 +0000 |
|---|---|---|
| committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 2002-08-09 08:36:34 +0000 |
| commit | 0252972fbbdb3a19512eb3da28fbfdcd57c92967 (patch) | |
| tree | ec1d004af4e7f74b22f3da9ed2ccc3bbdc8bc1e8 /games | |
| parent | 8fb437028e7eeb29826c9e0efd508d0e0c45500e (diff) | |
Bug fix in random placement code from Erik Sigra.
Diffstat (limited to 'games')
| -rw-r--r-- | games/bs/bs.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/games/bs/bs.c b/games/bs/bs.c index 39e60ee5937..e6529bee34b 100644 --- a/games/bs/bs.c +++ b/games/bs/bs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bs.c,v 1.14 2002/05/31 04:21:29 pjanzen Exp $ */ +/* $OpenBSD: bs.c,v 1.15 2002/08/09 08:36:33 pjanzen Exp $ */ /* * bs.c - original author: Bruce Holloway * salvo option by: Chuck A DeGaul @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: bs.c,v 1.14 2002/05/31 04:21:29 pjanzen Exp $"; +static const char rcsid[] = "$OpenBSD: bs.c,v 1.15 2002/08/09 08:36:33 pjanzen Exp $"; #endif /* #define _POSIX_SOURCE */ /* ( random() ) */ @@ -334,13 +334,10 @@ static int rnd(int n) static void randomplace(int b, ship_t *ss) /* generate a valid random ship placement into px,py */ { - int bwidth = BWIDTH - ss->length; - int bdepth = BDEPTH - ss->length; - do { - ss->y = rnd(bdepth); - ss->x = rnd(bwidth); ss->dir = rnd(2) ? E : S; + ss->x = rnd(BWIDTH - (ss->dir == E ? ss->length : 0)); + ss->y = rnd(BDEPTH - (ss->dir == S ? ss->length : 0)); } while (!checkplace(b, ss, FALSE)); } @@ -1400,4 +1397,5 @@ int main(int argc, char *argv[]) (playagain()); uninitgame(0); /*NOTREACHED*/ + exit(0); } |