* New upstream release, fixing problems in battlestar. Closes: #70465

git-svn-id: file:///srv/svn/joey/bsdgames-trunk@5134 a4a2c43b-8ac3-0310-8836-e0e880c912e2
This commit is contained in:
joey
2000-09-26 16:40:41 +00:00
parent a1f89ce3e1
commit 4cd9da8d1a
61 changed files with 478 additions and 66 deletions

12
.cvsignore Normal file
View File

@@ -0,0 +1,12 @@
Makeconfig
hide-game
install-man
install-score
subst.sed
subst.rules
test.out
GNUmakefile
conftest.c
exec.libs.tmp
exec.objs.tmp
a.out

32
NEWS
View File

@@ -11,6 +11,18 @@ changes in installation instructions. Packagers should also reread
the PACKAGING file each version (or do a diff between the old and new
versions of the package and read that).
Version 2.12 (2000-09-25)
============
* Improvements and bugfixes to battlestar, mainly from OpenBSD.
Though there are still plenty of known bugs, it should be much harder
to crash.
* Should compile with glibc 2.2 (tested with 2.1.94).
* Other minor changes and bugfixes; current with NetBSD CVS of
2000-09-25.
Version 2.11 (2000-04-19)
============
@@ -61,7 +73,7 @@ score file when upgrading to this version.
interface (rather than termcap emulation in ncurses); backgammon and
tetris still to be converted.
* New `game': wtf.
* New "game": wtf.
* Updated from NetBSD CVS of 1999-09-25; many more changes merged back
into NetBSD.
@@ -79,7 +91,7 @@ games, as best as I can determine them, now appear in COPYING.
hangman; you need to provide one at compile time (for boggle) and at
run time (for hangman). The copyright status of the one formerly
included was not entirely clear. The word list used by hangman can
also now be specified at run time with the new `-d' option.
also now be specified at run time with the new "-d" option.
* bsd-games now has a testsuite (for programs that can be tested
non-interactively only).
@@ -109,10 +121,10 @@ option).
* Other minor changes.
* Some users of this package may be interested in my `nppt' package,
* Some users of this package may be interested in my "nppt" package,
which provides an alternative implementation of ppt(6) with additional
features such as Encapsulated PostScript output. (This package
installs the binary as `nppt', so can be installed simultaneously with
installs the binary as "nppt", so can be installed simultaneously with
this one. Look for nppt-0.1.tar.gz (or a later version) on
metalab.unc.edu (formerly sunsite) in /pub/Linux/Incoming/ or under
/pub/Linux/games/.)
@@ -124,14 +136,14 @@ Version 2.5 (1998-09-24)
that includes makefile fragments from subdirectories, and uses GNU
Make's automatic dependency generation to generate dependencies
automatically, rather than recursive make. See Peter Miller's paper
`Recursive Make Considered Harmful'
"Recursive Make Considered Harmful"
<http://www.canb.auug.org.au/~millerp/rmch/recu-make-cons-harm.html>
for reasons why this is better than recursive make. This should make
no difference to normal users, but if you modify the sources note that
you will need to rebuild from the top directory, and you may find that
the dependencies are now accurate whereas formerly they were
incomplete. The automatic dependency generation causes the build to
start with about 300 `no such file or directory' warnings, which
start with about 300 "no such file or directory" warnings, which
should be ignored: these refer to the dependency files which GNU Make
will then automatically generate.
@@ -237,15 +249,15 @@ local to bsd-games with ones now in NetBSD.
current egcs snapshot fixed as well.
* Configuration / installation change - to strip the installed
binaries, use `make install-strip' instead of `make install'; this
replaces the configuration option for `make install' to strip the
binaries, use "make install-strip" instead of "make install"; this
replaces the configuration option for "make install" to strip the
installed binaries.
* Manpages for wargames and paranoia, thanks to Joey Hess
<joeyh@kitenet.net>.
* Battlestar save file name can be chosen at runtime, and defaults to
`.Bstar' instead of `Bstar' for cleaner directory listings.
".Bstar" instead of "Bstar" for cleaner directory listings.
Version 2.0 (1997-12-25)
===========
@@ -292,7 +304,7 @@ Version 1.3.4beta (1997-05-06)
* Backgammon, battlestar, bcd, caesar, canfield, cribbage and factor
updated to the versions in NetBSD-current. As a side-effect, caesar
now installs a `rot13' script.
now installs a "rot13" script.
* Tetris score file now defaults to tetris-bsd.scores for consistency
with using tetris-bsd in the names of files installed from tetris.

8
adventure/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
adventure
setup
data.c

6
arithmetic/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
arithmetic

13
atc/.cvsignore Normal file
View File

@@ -0,0 +1,13 @@
a.out
*.d
*.i
*.s
*.d.tmp
atc
pathnames.h
atc.6
grammar.c
grammar.h
y.tab.*
lex.c
lex.yy.c

View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
backgammon
backgammon.6

View File

@@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.15 1999/09/17 17:07:11 jsm Exp $ */
/* $NetBSD: main.c,v 1.16 2000/05/08 07:56:01 mycroft Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: main.c,v 1.15 1999/09/17 17:07:11 jsm Exp $");
__RCSID("$NetBSD: main.c,v 1.16 2000/05/08 07:56:01 mycroft Exp $");
#endif
#endif /* not lint */

View File

@@ -0,0 +1,5 @@
a.out
*.d
*.i
*.s
*.d.tmp

View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
teachgammon

6
banner/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
banner

7
battlestar/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
battlestar
pathnames.h

View File

@@ -1,4 +1,4 @@
/* $NetBSD: com2.c,v 1.8 1999/07/14 17:42:13 hubertf Exp $ */
/* $NetBSD: com2.c,v 1.21 2000/09/25 19:37:58 jsm Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)com2.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: com2.c,v 1.8 1999/07/14 17:42:13 hubertf Exp $");
__RCSID("$NetBSD: com2.c,v 1.21 2000/09/25 19:37:58 jsm Exp $");
#endif
#endif /* not lint */
@@ -47,28 +47,24 @@ __RCSID("$NetBSD: com2.c,v 1.8 1999/07/14 17:42:13 hubertf Exp $");
int
wearit()
{ /* synonyms = {sheathe, sheath} */
int n;
int firstnumber, value;
firstnumber = wordnumber;
while (wordtype[++wordnumber] == ADJS);
while (wordnumber <= wordcount) {
wordnumber++;
while (wordnumber <= wordcount && (wordtype[wordnumber] == OBJECT ||
wordtype[wordnumber] == NOUNS) && wordvalue[wordnumber] != DOOR) {
value = wordvalue[wordnumber];
/* Is the thing being worn a known object? */
if (value == -1) {
puts("Wear what?");
return (firstnumber);
}
/* Now find the length of the short description,
* mostly so we know if it ends in 's' or not.
*/
for (n = 0; objsht[value][n]; n++)
/* do nothing */;
if (objsht[value] == NULL)
break;
switch (value) {
case -1:
puts("Wear what?");
return (firstnumber);
default:
printf("You can't wear%s%s!\n", (objsht[value][n - 1] == 's' ? " " : " a "), objsht[value]);
printf("You can't wear %s%s!\n",
A_OR_AN_OR_BLANK(value), objsht[value]);
return (firstnumber);
case KNIFE:
@@ -96,9 +92,8 @@ wearit()
carrying -= objwt[value];
encumber -= objcumber[value];
ourtime++;
printf("You are now wearing %s %s.\n",
(objsht[value][n - 1] == 's' ? "the"
: "a"), objsht[value]);
printf("You are now wearing %s%s.\n",
A_OR_AN_OR_THE(value), objsht[value]);
} else
if (testbit(wear, value))
printf("You are already wearing the %s.\n",
@@ -122,10 +117,12 @@ put()
{ /* synonyms = {buckle, strap, tie} */
if (wordvalue[wordnumber + 1] == ON) {
wordvalue[++wordnumber] = PUTON;
wordtype[wordnumber] = VERB;
return (cypher());
}
if (wordvalue[wordnumber + 1] == DOWN) {
wordvalue[++wordnumber] = DROP;
wordtype[wordnumber] = VERB;
return (cypher());
}
puts("I don't understand what you want to put.");
@@ -142,7 +139,7 @@ draw()
int
use()
{
while (wordtype[++wordnumber] == ADJS && wordnumber < wordcount);
wordnumber++;
if (wordvalue[wordnumber] == AMULET && testbit(inven, AMULET) &&
position != FINAL) {
puts("The amulet begins to glow.");
@@ -165,20 +162,16 @@ use()
ourtime++;
notes[CANTSEE] = 0;
return (0);
} else
if (position == FINAL)
puts("The amulet won't work in here.");
else
if (wordvalue[wordnumber] == COMPASS && testbit(inven, COMPASS))
printf("Your compass points %s.\n", truedirec(NORTH, '-'));
else
if (wordvalue[wordnumber] == COMPASS)
puts("You aren't holding the compass.");
else
if (wordvalue[wordnumber] == AMULET)
puts("You aren't holding the amulet.");
else
puts("There is no apparent use.");
} else if (position == FINAL)
puts("The amulet won't work in here.");
else if (wordvalue[wordnumber] == COMPASS && testbit(inven, COMPASS))
printf("Your compass points %s.\n", truedirec(NORTH, '-'));
else if (wordvalue[wordnumber] == COMPASS)
puts("You aren't holding the compass.");
else if (wordvalue[wordnumber] == AMULET)
puts("You aren't holding the amulet.");
else
puts("There is no apparent use.");
return (-1);
}
@@ -188,11 +181,36 @@ murder()
int n;
for (n = 0; !((n == SWORD || n == KNIFE || n == TWO_HANDED || n == MACE || n == CLEAVER || n == BROAD || n == CHAIN || n == SHOVEL || n == HALBERD) && testbit(inven, n)) && n < NUMOFOBJECTS; n++);
if (n == NUMOFOBJECTS)
puts("You don't have suitable weapons to kill.");
else {
if (n == NUMOFOBJECTS) {
if (testbit(inven, LASER)) {
printf("Your laser should do the trick.\n");
wordnumber++;
switch(wordvalue[wordnumber]) {
case NORMGOD:
case TIMER:
case NATIVE:
case MAN:
wordvalue[--wordnumber] = SHOOT;
cypher();
break;
case -1:
puts("Kill what?");
break;
default:
if (wordtype[wordnumber] != OBJECT ||
wordvalue[wordnumber] == EVERYTHING)
puts("You can't kill that!");
else
printf("You can't kill %s%s!\n",
A_OR_AN_OR_BLANK(wordvalue[wordnumber]),
objsht[wordvalue[wordnumber]]);
break;
}
} else
puts("You don't have suitable weapons to kill.");
} else {
printf("Your %s should do the trick.\n", objsht[n]);
while (wordtype[++wordnumber] == ADJS);
wordnumber++;
switch (wordvalue[wordnumber]) {
case NORMGOD:
@@ -212,7 +230,7 @@ murder()
if (wintime)
live();
} else
puts("I dont see her anywhere.");
puts("I don't see her anywhere.");
break;
case TIMER:
if (testbit(location[position].objects, TIMER)) {
@@ -245,8 +263,9 @@ murder()
break;
default:
if (wordtype[wordnumber] != NOUNS)
puts("Kill what?");
if (wordtype[wordnumber] != OBJECT ||
wordvalue[wordnumber] == EVERYTHING)
puts("You can't kill that!");
else
printf("You can't kill the %s!\n",
objsht[wordvalue[wordnumber]]);
@@ -257,13 +276,18 @@ murder()
void
ravage()
{
while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount);
if (wordtype[wordnumber] == NOUNS && testbit(location[position].objects, wordvalue[wordnumber])) {
while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount)
continue;
if (wordtype[wordnumber] == NOUNS && (testbit(location[position].objects, wordvalue[wordnumber])
|| (wordvalue[wordnumber] == NORMGOD && testbit(location[position].objects, BATHGOD)))) {
ourtime++;
switch (wordvalue[wordnumber]) {
case NORMGOD:
puts("You attack the goddess, and she screams as you beat her. She falls down");
puts("crying and tries to hold her torn and bloodied dress around her.");
if (testbit(location[position].objects, BATHGOD))
puts("crying and tries to cover her nakedness.");
else
puts("crying and tries to hold her torn and bloodied dress around her.");
power += 5;
pleasure += 8;
ego -= 10;

6
bcd/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
bcd

7
boggle/boggle/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
boggle
bog.h

7
boggle/mkdict/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
mkdict
dictionary

View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
mkindex
dictindex

7
caesar/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
caesar
rot13

View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
canfield
pathnames.h
canfield.6

View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
cfscores

View File

@@ -39,6 +39,10 @@ The
.Nm
program counts your mail and tells you about it rather obnoxiously.
.Sh HISTORY
The
.Nm
program first appeared in
.Nx 1.3 .
.Nm
was first written by Noah Friedman <friedman@splode.com> in 1993.
This version was written by Charles M. Hannum <mycroft@netbsd.org>.
@@ -51,4 +55,4 @@ and
.Xr wc 1
instead, though these are not shell builtins.
.Sh SEE ALSO
.Xr from 1 .
.Xr from 1

8
cribbage/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
cribbage
pathnames.h
cribbage.6

8
debian/changelog vendored
View File

@@ -1,3 +1,9 @@
bsdgames (2.12-1) unstable; urgency=low
* New upstream release, fixing problems in battlestar. Closes: #70465
-- Joey Hess <joeyh@debian.org> Tue, 26 Sep 2000 09:21:22 -0700
bsdgames (2.11-4) unstable; urgency=low
* Updated to debhelper v2.
@@ -57,7 +63,7 @@ bsdgames (2.9-3) unstable; urgency=low
bsdgames (2.9-2) unstable; urgency=low
* Build deps. Boggle is now forced to always build with wgenlish as it's
word list, for consitency. Unfortunatly, it cannot use the currnelt
word list, for consitency. Unfortunatly, it cannot use the currnetly
install word list because it hashes it at install time.
-- Joey Hess <joeyh@debian.org> Sat, 4 Dec 1999 00:13:01 -0800

9
dm/.cvsignore Normal file
View File

@@ -0,0 +1,9 @@
a.out
*.d
*.i
*.s
*.d.tmp
dm
pathnames.h
dm.8
dm.conf.5

6
factor/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
factor

7
fish/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
fish
pathnames.h

View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
*.dat
*-o

View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
fortune
pathnames.h
fortune.6

View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
strfile

6
fortune/unstr/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
unstr

6
gomoku/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
gomoku

8
hangman/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
hangman
pathnames.h
hangman.6

7
hunt/hunt/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
hunt
hunt.6

7
hunt/huntd/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
huntd
huntd.6

1
include/.cvsignore Normal file
View File

@@ -0,0 +1 @@
bsd-games.h

5
lib/.cvsignore Normal file
View File

@@ -0,0 +1,5 @@
a.out
*.d
*.i
*.s
*.d.tmp

6
mille/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
mille

10
monop/.cvsignore Normal file
View File

@@ -0,0 +1,10 @@
a.out
*.d
*.i
*.s
*.d.tmp
monop
initdeck
pathnames.h
monop.6
cards.pck

6
morse/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
morse

6
number/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
number

8
phantasia/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
phantasia
setup
pathnames.h

6
pig/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
pig

6
pom/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
pom

6
ppt/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
ppt

6
primes/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
primes

8
quiz/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
quiz
pathnames.h
quiz.6

6
quiz/datfiles/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
index

6
rain/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
rain

6
random/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
random

8
robots/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
robots
pathnames.h
robots.6

View File

@@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.15 2000/01/19 19:43:42 jsm Exp $ */
/* $NetBSD: main.c,v 1.16 2000/05/08 07:56:05 mycroft Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: main.c,v 1.15 2000/01/19 19:43:42 jsm Exp $");
__RCSID("$NetBSD: main.c,v 1.16 2000/05/08 07:56:05 mycroft Exp $");
#endif
#endif /* not lint */

View File

@@ -1,4 +1,4 @@
/* $NetBSD: score.c,v 1.13 2000/04/09 23:02:52 mycroft Exp $ */
/* $NetBSD: score.c,v 1.15 2000/04/27 19:31:23 thorpej Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: score.c,v 1.13 2000/04/09 23:02:52 mycroft Exp $");
__RCSID("$NetBSD: score.c,v 1.15 2000/04/27 19:31:23 thorpej Exp $");
#endif
#endif /* not lint */
@@ -175,8 +175,8 @@ score(score_wfd)
move((scp - Top) + 2, 15);
if (!done_show && scp->s_uid == uid && scp->s_score == Score)
standout();
printw("%5d %5d %-8.8s %-9.9s %5d",
(scp - Top) + 1, scp->s_score, scp->s_name,
printw("%5ld %5d %-8.8s %-9.9s %5d",
(long)(scp - Top) + 1, scp->s_score, scp->s_name,
scp->s_auto ? "(autobot)" : "", scp->s_level);
if (!done_show && scp->s_uid == uid && scp->s_score == Score) {
standend();

7
sail/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
sail
pathnames.h

8
snake/snake/.cvsignore Normal file
View File

@@ -0,0 +1,8 @@
a.out
*.d
*.i
*.s
*.d.tmp
snake
pathnames.h
snake.6

6
snake/snscore/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
snscore

9
tetris/.cvsignore Normal file
View File

@@ -0,0 +1,9 @@
a.out
*.d
*.i
*.s
*.d.tmp
tetris
pathnames.h
tetris.6
tetris-bsd.6

View File

@@ -160,7 +160,7 @@ main(argc, argv)
case 'l':
level = atoi(optarg);
if (level < MINLEVEL || level > MAXLEVEL) {
errx(1, "tetris-bsd: level must be from %d to %d",
errx(1, "level must be from %d to %d",
MINLEVEL, MAXLEVEL);
}
break;

7
trek/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
trek
trek.6

6
worm/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
worm

6
worms/.cvsignore Normal file
View File

@@ -0,0 +1,6 @@
a.out
*.d
*.i
*.s
*.d.tmp
worms

7
wtf/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
wtf.6
wtf

7
wump/.cvsignore Normal file
View File

@@ -0,0 +1,7 @@
a.out
*.d
*.i
*.s
*.d.tmp
wump
pathnames.h