X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=aa6e6dac4ad6a1c482fba14fccf9ce07d61ddb6f;hb=d61cab352ee4345311eb9dd1a40fe11fb979f463;hp=9a68f268429a0f5ed1c9c615164fc1e325996850;hpb=bfa06be62d73a8ed7559b5344672d8a3f9bd947e;p=open-adventure.git

diff --git a/actions.c b/actions.c
index 9a68f26..aa6e6da 100644
--- a/actions.c
+++ b/actions.c
@@ -177,6 +177,7 @@ static int blast(void)
 	game.bonus=135;
     RSPEAK(game.bonus);
     score(0);
+    return GO_CLEAROBJ;	/* pacify compiler - we never get here */
 }
 
 static int vbreak(token_t verb, token_t obj)
@@ -234,9 +235,9 @@ static int carry(token_t verb, token_t obj)
     if (obj == RUG && game.prop[RUG] == 2)spk=222;
     if (obj == SIGN)spk=196;
     if (obj == MESSAG) {
-	spk=190;
-	return GO_CLEAROBJ;
+	RSPEAK(190);
 	DSTROY(MESSAG);
+	return GO_CLEAROBJ;
     }
     if (game.fixed[obj] != 0) {
 	RSPEAK(spk);
@@ -1052,12 +1053,12 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
 	    if (verb == SAY)obj=WD2;
 	    if (obj == 0) {
 		/*  Analyse an intransitive verb (ie, no object given yet). */
-		switch (verb-1) {
-		case  0: /* CARRY */ return carry(verb, INTRANSITIVE);
+		    switch (verb-1) {
+		    case  0: /* CARRY */ return carry(verb, INTRANSITIVE);
 		    case  1: /* DROP  */ return(8000); 
 		    case  2: /* SAY   */ return(8000); 
 		    case  3: /* UNLOC */ return lock(verb, INTRANSITIVE);    
-		    case  4: /* NOTHI */ {RSPEAK(54); return(20012);}
+		    case  4: /* NOTHI */ {RSPEAK(54); return(GO_CLEAROBJ);}
 		    case  5: /* LOCK  */ return lock(verb, INTRANSITIVE);    
 		    case  6: /* LIGHT */ return light(verb, INTRANSITIVE);    
 		    case  7: /* EXTIN */ return extinguish(verb, INTRANSITIVE);    
@@ -1098,7 +1099,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
 	        case  1: /* DROP  */ return discard(verb, obj, false);    
 		case  2: /* SAY   */ return say();    
 		case  3: /* UNLOC */ return lock(verb, obj);    
-		case  4: /* NOTHI */ {RSPEAK(54); return(20012);}
+		case  4: /* NOTHI */ {RSPEAK(54); return(GO_CLEAROBJ);}
 		case  5: /* LOCK  */ return lock(verb, obj);    
 		case  6: /* LIGHT */ return light(verb, obj);    
 		case  7: /* EXTI  */ return extinguish(verb, obj);