X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=cc2f66cedc1348eb781a5ee8c1ffa18425a03835;hb=c818a10f2875b8b9f63c6cf6d5ef1389e37bf857;hp=d0608f60f1d8017ec2d6bdeee1248215d8769a2a;hpb=6c6498b797c84653c04ef0a9fc31d52af159fdf2;p=open-adventure.git

diff --git a/actions.c b/actions.c
index d0608f6..cc2f66c 100644
--- a/actions.c
+++ b/actions.c
@@ -774,11 +774,10 @@ static int quit(FILE *input)
 static int read(FILE *input, token_t verb, token_t obj)
 /*  Read.  Print stuff based on objtxt.  Oyster (?) is special case. */
 {
-    int i;
     int spk = ACTSPK[verb];
     if (obj == INTRANSITIVE) {
 	obj = 0;
-	for (i=1; i<=NOBJECTS; i++) {
+	for (int i=1; i<=NOBJECTS; i++) {
 	    if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
 		obj = obj * NOBJECTS + i;
 	}
@@ -1051,7 +1050,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
 	case intransitive:
 	    if (WD2 > 0 && verb != SAY) return(2800);
 	    if (verb == SAY)obj=WD2;
-	    if (obj == 0) {
+	    if (obj == 0 || obj == INTRANSITIVE) {
 		/*  Analyse an intransitive verb (ie, no object given yet). */
 		    switch (verb-1) {
 		    case  0: /* CARRY */ return carry(verb, INTRANSITIVE);