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.
This commit is contained in:
jsm 2000-09-22 12:37:32 +00:00
parent fd5d3908d3
commit 016903dbdb
1 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: com4.c,v 1.11 2000/09/22 08:19:21 jsm Exp $ */
/* $NetBSD: com4.c,v 1.12 2000/09/22 12:37:32 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.11 2000/09/22 08:19:21 jsm Exp $");
__RCSID("$NetBSD: com4.c,v 1.12 2000/09/22 12:37:32 jsm Exp $");
#endif
#endif /* not lint */
@ -78,12 +78,12 @@ take(from)
win--;
} else if (testbit(inven, value))
printf("You're already holding%s%s.\n", (objsht[value][n - 1] == 's' ? " " : " a "), objsht[value]);
else if (!testbit(from, value))
printf("I dont see any %s around here.\n", objsht[value]);
else if (!heavy)
printf("The %s %s too heavy.\n", objsht[value], (objsht[value][n - 1] == 's' ? "are" : "is"));
else if (!bulky)
printf("The %s %s too cumbersome to hold.\n", objsht[value], (objsht[value][n - 1] == 's' ? "are" : "is"));
else
printf("I dont see any %s around here.\n", objsht[value]);
printf("The %s %s too cumbersome to hold.\n", objsht[value], (objsht[value][n - 1] == 's' ? "are" : "is"));
if (wordnumber < wordcount - 1 && wordvalue[++wordnumber] == AND)
wordnumber++;
else