summaryrefslogtreecommitdiffstats
path: root/games/battlestar/words.c
diff options
context:
space:
mode:
authorpjanzen <pjanzen@openbsd.org>2000-09-26 04:42:54 +0000
committerpjanzen <pjanzen@openbsd.org>2000-09-26 04:42:54 +0000
commit76104c941bc6ca8eb221af80eacb6686523b15b3 (patch)
tree31c0ee8a50656225b9dce7d4bcbbd665871ad71d /games/battlestar/words.c
parentNo shell escape (diff)
downloadwireguard-openbsd-76104c941bc6ca8eb221af80eacb6686523b15b3.tar.xz
wireguard-openbsd-76104c941bc6ca8eb221af80eacb6686523b15b3.zip
Improve handling of multiple commands on one line. Tidy fight parser.
Handle "all" in one place (almost). Add AUXVERB category and OBJ_PERSON/ OBJ_NONOBJ flags. Most was discussed with jsm@netbsd.org, and some is from him.
Diffstat (limited to 'games/battlestar/words.c')
-rw-r--r--games/battlestar/words.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/games/battlestar/words.c b/games/battlestar/words.c
index 10da4fc1079..52792b43558 100644
--- a/games/battlestar/words.c
+++ b/games/battlestar/words.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: words.c,v 1.7 2000/09/17 21:28:33 pjanzen Exp $ */
+/* $OpenBSD: words.c,v 1.8 2000/09/26 04:42:56 pjanzen Exp $ */
/* $NetBSD: words.c,v 1.3 1995/03/21 15:08:00 cgd Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)words.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: words.c,v 1.7 2000/09/17 21:28:33 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: words.c,v 1.8 2000/09/26 04:42:56 pjanzen Exp $";
#endif
#endif /* not lint */
@@ -151,6 +151,7 @@ struct wlist wlist[] = {
{ "all", EVERYTHING, OBJECT, NULL },
{ "and", AND, CONJ, NULL },
{ ",", AND, CONJ, NULL },
+ { ".", AND, CONJ, NULL },
{ "kill", KILL, VERB, NULL },
{ "fight", KILL, VERB, NULL },
{ "ravage", RAVAGE, VERB, NULL },
@@ -212,9 +213,10 @@ struct wlist wlist[] = {
{ "purple", 0, ADJS, NULL },
{ "kingly", 0, ADJS, NULL },
{ "the", 0, ADJS, NULL },
- { "climb", 0, ADJS, NULL },
- { "move", 0, ADJS, NULL },
- { "make", 0, ADJS, NULL },
+ { "climb", AUXVERB, VERB, NULL },
+ { "move", AUXVERB, VERB, NULL },
+ { "make", AUXVERB, VERB, NULL },
+ { "go", AUXVERB, VERB, NULL },
{ "to", 0, ADJS, NULL },
{ 0, 0, 0, NULL }
};