Remove duplicative phase code.

diff --git a/actions.c b/actions.c
index b63f795ddb0dc8bcd7f67f8c1545733b5c5f0965..ec25552237ddd75adfaec1e47126c16d6eb29246 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1575,7 +1575,7 @@ int action(command_t command)
     case unknown:
         /* Unknown verb, couldn't deduce object - might need hint */
         sspeak(WHAT_DO, command.word[0].raw);
     case unknown:
         /* Unknown verb, couldn't deduce object - might need hint */
         sspeak(WHAT_DO, command.word[0].raw);

-        return GO_CHECKHINT;
+        return GO_CLEAROBJ;

     default: // LCOV_EXCL_LINE
         BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
     }
     default: // LCOV_EXCL_LINE
         BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
     }

diff --git a/advent.h b/advent.h
index f5fe672039d37ac9d76be6c94c4dfcbc59cac640..4491b42926ae19347f899290f710693399781abb 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -100,7 +100,6 @@ enum phase_codes {
     GO_MOVE,
     GO_TOP,
     GO_CLEAROBJ,
     GO_MOVE,
     GO_TOP,
     GO_CLEAROBJ,

-    GO_CHECKHINT,

     GO_WORD2,
     GO_UNKNOWN,
     GO_DWARFWAKE,
     GO_WORD2,
     GO_UNKNOWN,
     GO_DWARFWAKE,

diff --git a/main.c b/main.c
index f2e107515a70d212a678a7f47757746d7c01562c..41bbe9564b04e9e047af2e046d4e71959c4e32ed 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1199,7 +1199,6 @@ Lookup:
             sspeak(DO_WHAT, command.word[0].raw);
             command.obj = 0;
         // Fallthrough
             sspeak(DO_WHAT, command.word[0].raw);
             command.obj = 0;
         // Fallthrough

-        case GO_CHECKHINT: // Fallthrough

         case GO_CLEAROBJ:
             goto Lclearobj;
         case GO_DWARFWAKE:
         case GO_CLEAROBJ:
             goto Lclearobj;
         case GO_DWARFWAKE: