Remove duplicative phase code.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 3d03d830e5f0da9b71e04c80395fbc47492ab8bf..ec25552237ddd75adfaec1e47126c16d6eb29246 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1360,8 +1360,6 @@ int action(command_t command)
             return GO_CLEAROBJ;
         }
 
-        if (command.word[1].id != WORD_EMPTY && command.word[1].id != WORD_NOT_FOUND)
-            return GO_WORD2;
         if (command.verb != 0)
             command.part = transitive;
     }
@@ -1577,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);
-        return GO_CHECKHINT;
+        return GO_CLEAROBJ;
     default: // LCOV_EXCL_LINE
         BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE
     }