X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=ad91e03b9516c537759e4f04001b8261cdf3a3b2;hb=d92da991062fac03934d029aa4323962a9afa7e1;hp=0e56f254beeffa6e227e2ee8a557b8dc69ca9881;hpb=59a558b7622f1d12e4b52c4852f5577c55be26f6;p=open-adventure.git

diff --git a/actions.c b/actions.c
index 0e56f25..ad91e03 100644
--- a/actions.c
+++ b/actions.c
@@ -174,11 +174,11 @@ static void blast(void)
     if (game.prop[ROD2] < 0 || !game.closed)
 	RSPEAK(REQUIRES_DYNAMITE);
     else {
-	game.bonus=133;
+	game.bonus=VICTORY_MESSAGE;
 	if (game.loc == LOC_NE)
-	    game.bonus=134;
+	    game.bonus=DEFEAT_MESSAGE;
 	if (HERE(ROD2))
-	    game.bonus=135;
+	    game.bonus=SPLATTER_MESSAGE;
 	RSPEAK(game.bonus);
 	score(endgame);
     }
@@ -633,7 +633,7 @@ static int inven(void)
     return GO_CLEAROBJ;
 }
 
-int light(token_t verb, token_t obj)
+static int light(token_t verb, token_t obj)
 /*  Light.  Applicable only to lamp and urn. */
 {
     int spk = ACTSPK[verb];
@@ -644,12 +644,12 @@ int light(token_t verb, token_t obj)
     }
 
     if (obj == URN) {
-	spk=URN_EMPTY;
-	if (game.prop[URN] == 0)
-	    {RSPEAK(spk); return GO_CLEAROBJ;}
-	spk=URN_LIT;
-	game.prop[URN]=2;
-	RSPEAK(spk);
+	if (game.prop[URN] == 0) {
+	    RSPEAK(URN_EMPTY);
+	} else {
+	    game.prop[URN] = 2;
+	    RSPEAK(URN_LIT);
+	}
 	return GO_CLEAROBJ;
     } else {
 	if (obj != LAMP)
@@ -814,7 +814,7 @@ static int reservoir(void)
 /*  Z'ZZZ (word gets recomputed at startup; different each game). */
 {
     if (!AT(RESER) && game.loc != game.fixed[RESER]-1) {
-	RSPEAK(RUB_NOGO);
+	RSPEAK(NOTHING_HAPPENS);
 	return GO_CLEAROBJ;
     } else {
 	PSPEAK(RESER,game.prop[RESER]+1);