Restructure some code.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 74d67566af2619ed2f1a169fbdc8a88e4218cfc9..05b9224663aefadf87817cceb8197fc9f390fdca 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -578,7 +578,7 @@ static int find(token_t verb, token_t obj)
         obj == LIQLOC(game.loc) ||
         (obj == DWARF && ATDWRF(game.loc) > 0))
         spk = YOU_HAVEIT;
-    if (game.closed)spk = NEEDED_NEreplace;
+    if (game.closed)spk = NEEDED_NEARBY;
     if (TOTING(obj))spk = ALREADY_CARRYING;
     RSPEAK(spk);
     return GO_CLEAROBJ;
@@ -792,7 +792,7 @@ static int pour(token_t verb, token_t obj)
 static int quit(void)
 /*  Quit.  Intransitive only.  Verify intent and exit if that's what he wants. */
 {
-    if (YES(REALLY_QUIT, OK_MAN, OK_MAN))
+    if (YES(arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
         terminate(quitgame);
     return GO_CLEAROBJ;
 }
@@ -820,7 +820,7 @@ static int read(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     }
     if (obj == OYSTER && !game.clshnt) {
-        game.clshnt = YES(CLUE_QUERY, WAYOUT_CLUE, OK_MAN);
+        game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
         return GO_CLEAROBJ;
     }
     PSPEAK(obj, OBJTXT[obj] + game.prop[obj]);
@@ -891,7 +891,7 @@ static int throw_support(long spk)
     return GO_MOVE;
 }
 
-static int throw (FILE *cmdin, long verb, token_t obj)
+static int throw(FILE *cmdin, long verb, token_t obj)
 /*  Throw.  Same as discard unless axe.  Then same as attack except
  *  ignore bird, and if dwarf is present then one might be killed.
  *  (Only way to do so!)  Axe also special for dragon, bear, and
@@ -922,32 +922,36 @@ static int throw (FILE *cmdin, long verb, token_t obj)
     }
     if (obj != AXE)
         return (discard(verb, obj, false));
-    int i = ATDWRF(game.loc);
-    if (i <= 0) {
-        if (AT(DRAGON) && game.prop[DRAGON] == 0)
-            return throw_support(DRAGON_SCALES);
-        if (AT(TROLL))
-            return throw_support(TROLL_RETURNS);
-        else if (AT(OGRE))
-            return throw_support(OGRE_DODGE);
-        else if (HERE(BEAR) && game.prop[BEAR] == 0) {
-            /* This'll teach him to throw the axe at the bear! */
-            DROP(AXE, game.loc);
-            game.fixed[AXE] = -1;
-            game.prop[AXE] = 1;
-            JUGGLE(BEAR);
-            RSPEAK(AXE_LOST);
-            return GO_CLEAROBJ;
-        }
-        return (attack(cmdin, verb, 0));
-    }
+    else {
+       int i = ATDWRF(game.loc);
+       if (i <= 0) {
+           if (AT(DRAGON) && game.prop[DRAGON] == 0)
+               return throw_support(DRAGON_SCALES);
+           if (AT(TROLL))
+               return throw_support(TROLL_RETURNS);
+           else if (AT(OGRE))
+               return throw_support(OGRE_DODGE);
+           else if (HERE(BEAR) && game.prop[BEAR] == 0) {
+               /* This'll teach him to throw the axe at the bear! */
+               DROP(AXE, game.loc);
+               game.fixed[AXE] = -1;
+               game.prop[AXE] = 1;
+               JUGGLE(BEAR);
+               RSPEAK(AXE_LOST);
+               return GO_CLEAROBJ;
+           }
+           return (attack(cmdin, verb, 0));
+       }
 
-    if (randrange(NDWARVES + 1) < game.dflag) {
-        return throw_support(DWARF_DODGES);
+       if (randrange(NDWARVES + 1) < game.dflag) {
+           return throw_support(DWARF_DODGES);
+       } else {
+           game.dseen[i] = false;
+           game.dloc[i] = 0;
+           return throw_support((++game.dkill == 1)
+                                ? DWARF_SMOKE : KILLED_DWARF);
+       }
     }
-    game.dseen[i] = false;
-    game.dloc[i] = 0;
-    return throw_support((++game.dkill == 1) ? DWARF_SMOKE : KILLED_DWARF);
 }
 
 static int wake(token_t verb, token_t obj)