Move a few prototypes and static'ed a few functions

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 0e56f254beeffa6e227e2ee8a557b8dc69ca9881..aa63f6c83bfe09eafe2c61704fcfb151fd999e45 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -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);