* Fixed bad merge (that's why sail was broken).

git-svn-id: file:///srv/svn/joey/bsdgames-trunk@5177 a4a2c43b-8ac3-0310-8836-e0e880c912e2
This commit is contained in:
joey
2001-12-29 19:48:57 +00:00
parent b05333c9fe
commit 0a887df528
19 changed files with 420 additions and 440 deletions

View File

@@ -1,4 +1,4 @@
/* $NetBSD: com2.c,v 1.21 2000/09/25 19:37:58 jsm Exp $ */
/* $NetBSD: com2.c,v 1.22 2001/06/02 17:30:28 christos 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.21 2000/09/25 19:37:58 jsm Exp $");
__RCSID("$NetBSD: com2.c,v 1.22 2001/06/02 17:30:28 christos Exp $");
#endif
#endif /* not lint */
@@ -54,7 +54,7 @@ wearit()
while (wordnumber <= wordcount && (wordtype[wordnumber] == OBJECT ||
wordtype[wordnumber] == NOUNS) && wordvalue[wordnumber] != DOOR) {
value = wordvalue[wordnumber];
if (objsht[value] == NULL)
if (value >= 0 && objsht[value] == NULL)
break;
switch (value) {