From d6dab20801dc0df6c998df927ae325a3dc34fee7 Mon Sep 17 00:00:00 2001 From: NHOrus Date: Fri, 30 Jun 2017 20:03:18 +0300 Subject: [PATCH] Removed line as redundant As of 8675c4facd154b9 lines 612-613 in main.c unreachable due to earlier dispatch at line 1132 that redirects all find/inventory verbs into actions.c Message NEARBY fires from YAML link to those verbs. Also, reduced signature of playermove() to motion only. --- main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 5cb4a87..72c40f3 100644 --- a/main.c +++ b/main.c @@ -521,7 +521,7 @@ static void croak(void) * him, so we need game.oldlc2, which is the last place he was * safe.) */ -static bool playermove(token_t verb, int motion) +static bool playermove( int motion) { int scratchloc, travel_entry = tkey[game.loc]; game.newloc = game.loc; @@ -609,8 +609,6 @@ static bool playermove(token_t verb, int motion) spk = UNSURE_FACING; if (motion == OUTSIDE || motion == INSIDE) spk = NO_INOUT_HERE; - if (verb == FIND || verb == INVENTORY) - spk = NEARBY; if (motion == XYZZY || motion == PLUGH) spk = NOTHING_HAPPENS; if (motion == CRAWL) @@ -997,7 +995,7 @@ static bool do_command() rspeak(TAME_BEAR); speak(msg); if (FORCED(game.loc)) { - if (playermove(command.verb, 1)) + if (playermove(MOT_1)) return true; else continue; /* back to top of main interpreter loop */ @@ -1131,7 +1129,7 @@ Lookup: kmod = MOD(defn, 1000); switch (defn / 1000) { case 0: - if (playermove(command.verb, kmod)) + if (playermove(kmod)) return true; else continue; /* back to top of main interpreter loop */ @@ -1155,7 +1153,7 @@ Laction: case GO_TERMINATE: return true; case GO_MOVE: - playermove(command.verb, NUL); + playermove(NUL); return true; case GO_TOP: continue; /* back to top of main interpreter loop */ -- 2.31.1