Commit Graph

939 Commits

Author SHA1 Message Date
jwise 9baf035b4e Break out curses display-related globals into a new header file, so that
<curses.h> doesn't have to be included all over the place.
2001-01-04 04:41:41 +00:00
jwise 61a39e0b38 More rationalization of include files:
a.) Don't include a zillion system headers from "extern.h" (actually, don't
    include any).
b.) Break a global jmp_buf variable into a new file, so <setjmp.h> doesn't
    have to be pulled in everywhere (it's only used in two places).

The (one line) new file is (c) TNF with a three-clause license, FW(L)IW.
2001-01-04 03:51:23 +00:00
jwise aac077fce8 Rationalize inclusion of header files: cut down on `include everything
everywhere' a little (more to go), and as per KNF, local includes after
system includes.
2001-01-04 03:21:16 +00:00
jwise 43894be666 Second half of static-ization of local funcs. 2001-01-04 02:43:32 +00:00
jwise d5c5fed0c7 G/C undocumented and unimplemented `-D' (debug) option. 2001-01-04 01:56:27 +00:00
jwise bca097d567 First half of static-ization of local funcs. 2001-01-04 01:53:24 +00:00
jwise a6dfac213f De-`register' 2001-01-04 01:13:34 +00:00
jwise 3ad2426f33 Fix getopt usage (again) in case where user does not choose a scenario on
the command line.
2001-01-01 22:33:01 +00:00
jwise fdb512d4b5 Missed commit -- ANSIfy in preparation for further work. 2001-01-01 22:23:29 +00:00
jwise e6d2cd0771 Fix getopt() usage. 2001-01-01 22:05:04 +00:00
jwise dfea9f08db ANSIfy in preparation for further work. 2001-01-01 21:57:37 +00:00
sommerfeld 83454472f9 ${PRINTOBJDIR}ify 2000-12-30 17:51:26 +00:00
mycroft 9fcf4550a2 Another one that really belongs here... 2000-12-17 10:08:08 +00:00
mycroft 34fedde795 Compress the other entries vertically. 2000-12-17 09:35:21 +00:00
mycroft 562421c4f3 Reformat one entry for vertical space. 2000-12-17 09:25:38 +00:00
mycroft c1647142f9 Yes, it's about damn time fortune(6) got some new material. 2000-12-17 09:17:51 +00:00
tsarna 793ecee1b1 CNN, BSD declare Bush winner. 2000-12-14 02:38:02 +00:00
jwise 8ebca10bc2 Fix warning. 2000-11-30 22:07:24 +00:00
jwise 3e7481b12e Use random() instead of rand(), and seed from time(3) instead of from getpid(). 2000-11-30 22:06:04 +00:00
jwise 48253ebcef Change the macro to roll a six-sided die from die() to dieroll() (for
obvious reasons of convention).
2000-11-30 22:02:20 +00:00
jwise f876814eec ANSIfy in preparation for changes. 2000-11-30 21:50:58 +00:00
jwise 91d3d6a540 Use getopt(3) for flag processing. 2000-11-30 21:38:57 +00:00
jwise 65d4c9fc15 Fix style nit. 2000-11-30 21:31:33 +00:00
jwise ed516eb73f ANSIfy in preparation for other changes. 2000-11-30 21:29:32 +00:00
soren 3dbb440e9f Just print basename in usage string. 2000-11-21 00:18:52 +00:00
lukem 51ea0cba47 remove unnecessary command name after .Nm 2000-11-07 05:51:54 +00:00
lukem 87567a7fcd use lowercase with .Nm to match actual command name 2000-11-07 05:49:31 +00:00
mrg f601feea40 fix a bug in the call to srandom(): xor time() with getpid(), don't add them!
now fortune(6) run in an unending loop does not appear to show the same
fortunes over and over and over.
2000-10-31 13:27:56 +00:00
hubertf 42f9d6c1e4 NetBSD will put hair on a UNIX admin's chest
-- Jason R. Fink
2000-10-09 00:58:16 +00:00
mjl b1342ea8af Removed duplicate entry. Fixes FreeBSD PR/21629. 2000-09-29 00:40:40 +00:00
jsm 5fd015d6f6 In cypher(), don't attempt to make sense of words other than VERBs or
KNIFE when a verb is required.  Add AUXVERB for "make", "move",
"climb" (as in "make love", "climb up") and ignore AUXVERB as a verb,
going on to the next word, instead of treating these words as
adjectives.  When creating new verbs from "put on", "put down", "take
off", mark them as type VERB.  Mostly from Paul Janzen
<pjanzen@foatdi.harvard.edu>.
2000-09-25 19:37:58 +00:00
jsm ca0c4d77e3 Add new flags OBJ_PERSON and OBJ_NONOBJ to the objflags array. 2000-09-25 14:44:59 +00:00
jsm e2872de219 Add OBJ_AN flag to objflags so as to use "a" or "an" appropriately in
messages; avoids "a amulet", "a Elf".  Define and use macros to use
"a", "an", "the", "is", "are" appropriately.  Partly based on OpenBSD.
2000-09-25 14:08:08 +00:00
jsm 293597460a Remove excess blank lines. From OpenBSD. 2000-09-25 14:06:20 +00:00
jsm 4cf0caf4ef Fix loving already loved goddess; avoid fallthrough after loving
goddess; give error on "love amulet".  From OpenBSD.
2000-09-25 14:05:52 +00:00
jsm 9cffc34578 Use defined constant FINAL instead of hardcoded 275. From OpenBSD. 2000-09-25 00:33:18 +00:00
jsm f97a3c82c3 Fix logic error in use of n and wordnumber in murder() when using
laser.  From OpenBSD.
2000-09-25 00:28:54 +00:00
jsm 572a824811 Discard any part of a line of input that goes beyond our buffer rather
than treating it as our next line of input.  From OpenBSD.
2000-09-24 15:51:40 +00:00
jsm 96232c1c4d Give less cryptic messages than "-1%" when WEIGHT or CUMBER are zero. 2000-09-24 14:42:18 +00:00
jsm ad9cea40fa Add explicit no-ops to empty loops following the NetBSD style guide. 2000-09-24 14:20:23 +00:00
jsm 579d7e283b Make hash table static in parse.c. 2000-09-24 14:11:09 +00:00
jsm 91d0e30d01 Use NULL instead of 0 (from OpenBSD). Also add or adjust comments. 2000-09-24 09:47:22 +00:00
jsm ac1f171d5b Correct spelling "dont" to "don't". From OpenBSD. 2000-09-24 09:46:57 +00:00
jsm 44c05578b0 Make functions local to parse.c static. 2000-09-24 09:46:28 +00:00
jsm b40caee28a Give a better message for trying to eat things it doesn't make sense
to eat.  For something eatable, check first whether you're holding it,
then whether you have a knife, then whether you're stuffed (gives
better message for "eat coconuts" when you don't have any).  From
OpenBSD.
2000-09-24 09:46:03 +00:00
jsm 6e6404a77d Clean up fly.c by making local variables and functions static and
removing abs() macro.
2000-09-24 09:44:28 +00:00
jsm c2a6fb8d9d Prevent CUMBER from going negative; avoid division by zero if it is
zero.
2000-09-24 09:41:53 +00:00
jsm 1b39778596 Attempt to disambiguate BODY for kicking. Avoid crashing or nonsense
messages on "kick door" and "kick man".  From OpenBSD.
2000-09-24 09:39:56 +00:00
jsm 1781c4f837 Allow for bathing goddess in love(); give better message for a lover
that isn't present and for certain choices of lover.  From OpenBSD.
2000-09-23 19:51:02 +00:00
jsm d2c1d833b2 Allow for the bathing goddess in ravage(). From OpenBSD. 2000-09-23 19:45:07 +00:00
jsm d3579258c9 Use a lookup table to identify whether objects are plural or singular,
instead of testing the final character against 's' in each place.
Avoids oddities about "pot of jewels" and "compass".
2000-09-23 19:23:57 +00:00
simonb cd2e1c1e91 Use ${COPY} instead of -c for ${INSTALL} commands. 2000-09-23 13:53:41 +00:00
jhawk 650c1aea1c Correct descriptions of "marked" vs. "ignored" -- they were swapped. 2000-09-23 01:52:50 +00:00
jsm 05ca74ab1c Don't say "Kicked." of an object not present; give sensible messages.
From OpenBSD.
2000-09-22 12:38:10 +00:00
jsm 016903dbdb Check for an object being taken not being there before checking for
whether it is too heavy or too bulky; gives a better message for "take
viper" with the viper not present.
2000-09-22 12:37:32 +00:00
jsm d67a03db02 Give appropriate messages (rather than saying nothing) if an verb is
used with "all" and nothing relevant is present.  From OpenBSD.
2000-09-22 08:19:57 +00:00
jsm 0f933d0d56 Remove all adjectives in parse(), since they are nowhere used. Fixes
crash on "carry old all" shown up by fuzz testing.  Patch from Paul
Janzen <pjanzen@foatdi.harvard.edu>.
2000-09-22 08:19:21 +00:00
jsm b283f74760 Give an appropriate error on "kill all" rather than a crash or
nonsense message.  From OpenBSD.
2000-09-22 08:18:20 +00:00
jsm 1fc5d09e80 Various improvements to parsing in battlestar, mostly from OpenBSD.
Define a constant WORDLEN.  Always use this constant and NWORD where
appropriate.

Use NWORD - 1 in battlestar.c to avoid off-by-one error.

Increment wordnumber after the INVEN verb to allow it to be followed
by a comma and other actions.

Avoid overflowing elements of the words array if input words are too
long.

Parse "," as AND except when followed by a verb, to allow such
constructions as "take foo, bar, and baz".  Trim AND AND which may
occur from the ", and" in such a list.

Avoid crashes from EVERYTHING in the wrong place by moving it to the
start of OBJECT AND EVERYTHING and NOUNS AND EVERYTHING sequences, and
trimming EVERYTHING AND EVERYTHING.
2000-09-21 17:44:34 +00:00
jsm 6d1847f667 Don't try to wear anything that isn't OBJECT or NOUNS. Don't try to
wear DOOR or anything without a short description.  Fixes crashes on
"wear knfo" (bug reported by Peter Maydell
<pmaydell@chiark.greenend.org.uk>), "wear wear", "wear kick", "wear
door" and "wear goddess".  Partly from OpenBSD.
2000-09-21 10:38:50 +00:00
jsm a4454d2982 If no hand-to-hand weapons are available, try using the laser to kill
in murder().  From OpenBSD.
2000-09-21 10:22:36 +00:00
jsm 16d8e9af6f die() on EOF; based on OpenBSD. 2000-09-21 09:49:03 +00:00
jsm 956f5c6ba6 From OpenBSD: in kiss(), "take" the bathing goddess if required, and
give a better error message if the person to kiss is not present.
2000-09-21 09:48:10 +00:00
jsm ca5dbcecd4 Add missing initialisers (avoid gcc -W warnings) and comments giving
room numbers.
2000-09-18 06:14:31 +00:00
jsm 819ea9d1a6 Clean up formatting; partly from OpenBSD. 2000-09-17 23:04:17 +00:00
jsm 31b523eee5 Patches from OpenBSD: add verbs "open"/"unlock" (essentially a no-op),
and "verbose"/"brief" (in verbose mode, always show long room
descriptions), and synonyms "papaya" for "papayas" and "coconut" for
"coconuts".
2000-09-17 23:03:43 +00:00
jsm cf35dbffa1 Based on OpenBSD: spelling, punctuation, grammar and line length
adjustments, and support for '=' in room descriptions meaning a
literal '-'.
2000-09-10 10:52:56 +00:00
jsm 3e02203ec6 Wording, punctuation and line length improvements. Also adjust test
for killing nonsensical things to fix crash with "kill door".  From
OpenBSD.
2000-09-10 10:51:16 +00:00
jsm d71839604a Make spacing nicer and add explicit NULL initializers. 2000-09-09 18:03:58 +00:00
jsm c6bbb5288d Store copy of username with strdup rather than using a fixed length
buffer.  Also make initialization functions and arrays static.
2000-09-09 09:37:58 +00:00
jsm ce85e35a32 Put prototypes in alphabetical order. 2000-09-09 09:36:23 +00:00
jsm a7c82eea02 Spelling and punctuation corrections or improvements from OpenBSD. 2000-09-08 17:25:31 +00:00
jsm af3dee978f Make code clearer; add a macro ROOMDESC for the number of times a room
should be visited for the short description only to be used, and don't
increment beenthere[position] beyond this value.  From OpenBSD.
2000-09-08 17:22:01 +00:00
jsm ec240586d1 Manpage improvements based on OpenBSD. 2000-09-08 17:18:36 +00:00
abs 90a84d2445 If we install limerick-o.dat, we should also install limerick-o to make it
usable.
2000-08-17 16:54:28 +00:00
abs 5b783e3f48 Split netbsd fortunes into offensive and non offensive.
Split could be considered somewhat arbitrary.
2000-08-17 16:48:52 +00:00
abs ad603791f5 NetBSD: A pmap for every occasion 2000-08-17 16:27:38 +00:00
mason a6cd58daee Corrected quote. It was totally missing its (well-known) equivalent of
a punch line.
2000-08-12 23:04:15 +00:00
simonb 251d3a61d0 Use a local implementation of htonl() called h2nl(). htonl() is not
available in all cross-compile environments.

Patches from Chris Demetriou.
2000-07-31 11:39:00 +00:00
ad 689c315829 Add 3 from me. 2000-07-31 11:38:21 +00:00
simonb 959e90b8fb Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros for host programs -
use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:35:03 +00:00
simonb 38a3de49cd Use a local implementation of htonl() called h2nl(). htonl() is not
available in all cross-compile environments.

Patches from Chris Demetriou.
2000-07-31 11:32:33 +00:00
simonb 11a429897a Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros or <err.h> err
function for host programs - use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:29:48 +00:00
simonb f221c30583 Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros or <err.h> err/warnx
functions for host programs - use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:28:48 +00:00
simonb 0ac29f6624 Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros or <err.h> err/errx
functions for host programs - use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:25:50 +00:00
mycroft 15b7289f72 Rename move() to moveplayer() to avoid clashing with libcurses. 2000-07-23 23:57:23 +00:00
itojun d303927592 printf() pedant - do not pass variable alone, use %s.
idea from openbsd.  after looking at freebsd commit msgs from kris@freebsd.
2000-07-10 10:19:25 +00:00
msaitoh f6f00e2615 remove extra period in SEE ALL section 2000-07-05 15:45:28 +00:00
mjl d9e9bbbcb4 After weeding out duplicate, modify entry to be mathematically
correct at least. (Yes, both were wrong. People can't integrate
nowadays anymore :)
2000-07-03 18:51:45 +00:00
mjl 217fd277fd Remove duplicate (and incorrect) entry. From Anton Berezin
<tobez@tobez.org> in FreeBSD PR/19670
2000-07-03 17:23:37 +00:00
matt 3233065035 More include additions for exit, abs, strcmp, etc. 2000-07-03 03:57:39 +00:00
mason caa691ec0a Offered horse brutality to a previously incorrect RHPS quote. 2000-06-30 04:04:09 +00:00
matt 568a487125 Make this produce local objects with .lo suffix. 2000-06-20 16:07:04 +00:00
scw eaeb39f657 NetBSD: Ports to * boards. 2000-06-14 08:10:06 +00:00
mycroft 72e0a45036 Don't make /var/games/sail here. 2000-06-11 15:37:51 +00:00
jwise 7e7d991f01 Remove one of mine that really wasn't very good, and add:
NetBSD: abandon all hype, oh ye who enter here.
2000-06-07 14:04:45 +00:00
blymn 99bf72c6bb Fix core dump. 2000-05-24 14:43:00 +00:00
blymn 51164fe56a Fix coredump on start. 2000-05-24 14:20:29 +00:00
blymn 494e4c93a6 Converted games to use the new termcap interface. 2000-05-22 12:42:46 +00:00
blymn cd583077db * Fix termcap handling to use the new interface to avoid buffer
overflows with extended termcap entries.
* Made delay_output use usleep instead of the grungy tgoto hack it had.
2000-05-20 14:01:42 +00:00
hubertf 010dad14ae Fix typo, pointed out by seebs@plethora.net in PR bin/10131. 2000-05-17 02:30:25 +00:00
mycroft f9eca6973d Use setgid(), not setregid(). 2000-05-08 07:55:59 +00:00
pooka c528cb8edd NetBSD - because Unix isn't just #include <linux.h>, i386, ELF, ...! 2000-05-02 11:41:24 +00:00
thorpej 64d8df2f33 Cast pointer diffs to long for printing with %ld. 2000-04-27 19:31:23 +00:00
thorpej 29eeaf21f2 Cast pointer difference to long when printing w/ %ld. 2000-04-27 17:49:15 +00:00
jdc 54db2fd199 Clear to end of line on the correct window. 2000-04-27 00:33:49 +00:00
jdc d6d7f0531f Fix arguments to *printw(). 2000-04-27 00:30:51 +00:00
simonb 47bb19e7b2 While everyone's beating up on rot13 - use 'exec' to loose the shell
process.
2000-04-24 15:42:40 +00:00
perry 29e1592111 $* -> "$@", not that it does anything. yet. 2000-04-24 15:37:32 +00:00
perry bd513ae4a9 keep it simple. 2000-04-24 15:30:34 +00:00
pk b63c26a995 HOST_CC -> HOST_LINK.c 2000-04-24 15:15:05 +00:00
hubertf 6afb31ba03 Don't rely upon /usr/games being in PATH, include it explicitly.
Fixes PR 9968 by yyrkoo@imrryr.org.
2000-04-24 13:21:26 +00:00
simonb 48a5c3efa9 Don't declare 'extern opt*' getopt variables. 2000-04-14 05:58:01 +00:00
simonb 915c06c281 Greatly simplify these by using <bsd.hostprog.mk>. Should do the same
for games/hack and games/monop and a few other places, but that requires
making subdirs for the tools.  One day...
2000-04-14 04:12:18 +00:00
simonb 924021df91 Curses works - define USE_CURSES for BSD44 and don't try to do our own
thing (using curses internal data structures anyway!).
2000-04-13 06:07:06 +00:00
soren 7e6625d720 Missing word. From Paul Janzen. 2000-04-11 03:45:40 +00:00
mycroft 1f8979f4f7 Don't insert leading 0s in the score display. (HI CHRISTOS!) 2000-04-09 23:02:52 +00:00
jsm aec3f4964a Correct capital of the Philippines, allow usual spelling of Jakarta
and prefer the usual name of Cambodia to Khmer.

Problems reported by Robert Vollmert <rvollmert@gmx.net>.
2000-04-09 22:37:40 +00:00
jwise b0cbfed510 Tyop fix. 2000-04-06 02:19:23 +00:00
jdolecek 8c9b24b9ca Fix two ubiquitous operator precedence error of type
bar = foo + (cond) ? x : y.
Patch sent by John Darrow in bin/9698.
2000-03-30 11:01:13 +00:00
tron d344de0b31 Use an equal probability single draw algorithm to get card from deck.
Patch supplied by John Darrow in PR bin/9651.
2000-03-28 19:37:54 +00:00
soren 67d5a84c5a Fix doubled 'the'. 2000-03-13 23:57:23 +00:00
soren 89c5a767f8 Fix doubled 'the's. 2000-03-13 22:55:05 +00:00
soren 3872dc30f7 Fix doubled 'the'. 2000-03-13 22:53:22 +00:00
soren 1594850f00 Fix doubled 'the' in comment. 2000-03-13 22:46:59 +00:00
kleink 76073cb333 Include <sys/param.h> for MAXHOSTNAMELEN. 2000-03-02 18:22:31 +00:00
kleink f48d30b904 POSIX.2: Ignore a null PAGER as well. 2000-03-02 18:19:06 +00:00
enami 0c23f966e9 Fix .Nm usage. 2000-03-02 13:27:53 +00:00
hubertf 4de7a614c7 Fix wrong reference to trek documentation
Submitted in PR bin/9514 by Thilo.Manske@HEH.Uni-Oldenburg.DE
2000-03-01 23:38:51 +00:00
jwise 3626a95b76 fix tyop 2000-02-27 05:40:36 +00:00
pooka 8ef8262b5d NetBSD: We come in peace. We offer reliability.
+ correct a typo
2000-02-15 13:56:02 +00:00
pooka e287a2d6fa NetBSD: We don't negotiate with terrorists. 2000-02-12 10:12:58 +00:00
itojun 687e7b9dbd avoid failure on "make install" when /var/games/sail already exists. 2000-02-12 10:03:30 +00:00
pooka e74bc9575e Add Chris Baird's email address per his request 2000-02-10 13:10:43 +00:00
jsm 01be126759 Fix insecure /tmp usage in sail.
Essentially concludes the merge into NetBSD of those changes in the
Linux port of the NetBSD games which it is fairly clear to me should
be so merged.
2000-02-09 22:27:55 +00:00
pooka 022eb906f9 Add NetBSD slogans for fortune database. 2000-02-06 11:59:29 +00:00
jsm e788ff0231 Don't initialise curses until after the initial non-curses setup (the
choice of scenario uses puts() rather than curses functions).
2000-01-31 11:08:53 +00:00
drochner 32e3df96e2 need an ${.OBJDIR} now 2000-01-25 21:41:18 +00:00
mycroft 615ac255bd More .mk file fallout. *sigh* 2000-01-23 22:10:52 +00:00
mycroft 58b54f196f Get the build ordering right for dependall. 2000-01-23 22:10:22 +00:00
mycroft a73ccc591a More .mk file fallout. *sigh* 2000-01-23 21:55:44 +00:00
jsm abf77ff779 Add manpage wargames(6), contributed by Joey Hess <joeyh@kitenet.net>.
No special formatting used for the movie name for now, following
discussion on tech-userlevel suggesting that at present there's
nothing really appropriate.
2000-01-23 21:04:55 +00:00
mycroft f5d7100e26 Nuke `extern int errno;' in code we compile with -Wstrict-prototypes. We get
the correct definition from errno.h.
2000-01-21 17:08:33 +00:00
jsm 233f519d3d Clean up error reporting in tetris. 2000-01-21 02:10:56 +00:00
jsm 7e681e294b Fix high score table formatting bug.
Bug report and fix from Malcolm Parsons <malcolm@bits.bris.ac.uk>.
2000-01-21 00:54:53 +00:00
jsm d8d956c46c Improve snscore error handling. 2000-01-21 00:27:03 +00:00
jsm be7d4de5f0 Report scores as auto-bot or not correctly.
Bug report and fix from Malcolm Parsons <malcolm@bits.bris.ac.uk>.
2000-01-20 13:24:11 +00:00
jsm 5c54ba1b0d Ensure correct prompt asking about another game is given at the end of
each game.

Bug report and fix from Malcolm Parsons <malcolm@bits.bris.ac.uk>.
2000-01-19 19:43:42 +00:00
jsm a645bf0f29 Typo fix in unknown option message (from Malcolm Parsons
<malcolm@bits.bris.ac.uk>).
2000-01-19 19:19:43 +00:00
jsm 27bcd0d70a Remove definition of __cputchar. 2000-01-19 19:02:27 +00:00