summaryrefslogtreecommitdiffstats
path: root/battlestar
diff options
context:
space:
mode:
authorjsm <jsm@NetBSD.org>2000-09-22 08:18:20 +0000
committerjsm <jsm@NetBSD.org>2000-09-22 08:18:20 +0000
commit283621ee3b4a30d66d08567b6507c0ba1580dbf1 (patch)
tree4fa26f492760d2a2eae7f4ebb2e822208eb741b4 /battlestar
parent0ba05dd5a679e7723ea4b9f1426175b1651926cf (diff)
downloadbsdgames-darwin-283621ee3b4a30d66d08567b6507c0ba1580dbf1.tar.gz
bsdgames-darwin-283621ee3b4a30d66d08567b6507c0ba1580dbf1.tar.zst
bsdgames-darwin-283621ee3b4a30d66d08567b6507c0ba1580dbf1.zip
Give an appropriate error on "kill all" rather than a crash or
nonsense message. From OpenBSD.
Diffstat (limited to 'battlestar')
-rw-r--r--battlestar/com2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/battlestar/com2.c b/battlestar/com2.c
index 634d4e3d..0de73532 100644
--- a/battlestar/com2.c
+++ b/battlestar/com2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com2.c,v 1.12 2000/09/21 10:38:50 jsm Exp $ */
+/* $NetBSD: com2.c,v 1.13 2000/09/22 08:18:20 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.12 2000/09/21 10:38:50 jsm Exp $");
+__RCSID("$NetBSD: com2.c,v 1.13 2000/09/22 08:18:20 jsm Exp $");
#endif
#endif /* not lint */
@@ -264,7 +264,8 @@ murder()
break;
default:
- if (wordtype[wordnumber] != OBJECT)
+ if (wordtype[wordnumber] != OBJECT ||
+ wordvalue[wordnumber] == EVERYTHING)
puts("You can't kill that!");
else
printf("You can't kill the %s!\n",