summaryrefslogtreecommitdiffstats
path: root/battlestar
diff options
context:
space:
mode:
authorjsm <jsm@NetBSD.org>2000-09-22 12:38:10 +0000
committerjsm <jsm@NetBSD.org>2000-09-22 12:38:10 +0000
commit0bfea32141170c7e1c0a67aaa35497f8b5f60c56 (patch)
tree5977ce6933dde3c8dae699553e19e8e91a0a70ce /battlestar
parent050ea43e165e4eb6cde52cd008b61052cd38019c (diff)
downloadbsdgames-darwin-0bfea32141170c7e1c0a67aaa35497f8b5f60c56.tar.gz
bsdgames-darwin-0bfea32141170c7e1c0a67aaa35497f8b5f60c56.tar.zst
bsdgames-darwin-0bfea32141170c7e1c0a67aaa35497f8b5f60c56.zip
Don't say "Kicked." of an object not present; give sensible messages.
From OpenBSD.
Diffstat (limited to 'battlestar')
-rw-r--r--battlestar/com4.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/battlestar/com4.c b/battlestar/com4.c
index 31c04b97..a29cb4df 100644
--- a/battlestar/com4.c
+++ b/battlestar/com4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com4.c,v 1.12 2000/09/22 12:37:32 jsm Exp $ */
+/* $NetBSD: com4.c,v 1.13 2000/09/22 12:38:10 jsm Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)com4.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: com4.c,v 1.12 2000/09/22 12:37:32 jsm Exp $");
+__RCSID("$NetBSD: com4.c,v 1.13 2000/09/22 12:38:10 jsm Exp $");
#endif
#endif /* not lint */
@@ -304,8 +304,12 @@ drop(name)
else if (*name == 'G')
puts("Given anyway.");
}
- } else
+ } else if (testbit(location[position].objects, value))
puts("Kicked.");
+ else if (testbit(wear, value))
+ puts("Not while it's being worn.");
+ else
+ puts("Not found.");
}
if (wordnumber < wordcount - 1 && wordvalue[++wordnumber] == AND)
wordnumber++;