Refactor tokenization to save raw tokens and use static buffer space...

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 4f46c0ac8a81dc3c9f6ffda2269b1f5a963efde9..c2c4daa79a5029c26dfe06705b1cba99403d17a8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1054,12 +1054,7 @@ L2600:
         strncpy(inputbuf, input, LINESIZE - 1);
         free(input);
 
-        long tokens[4];
-        tokenize(inputbuf, tokens);
-        command.wd1 = tokens[0];
-        command.wd1x = tokens[1];
-        command.wd2 = tokens[2];
-        command.wd2x = tokens[3];
+        tokenize(inputbuf, &command);
 
         /*  Every input, check "game.foobar" flag.  If zero, nothing's
          *  going on.  If pos, make neg.  If neg, he skipped a word,
@@ -1089,8 +1084,8 @@ L2607:
         } else
             lampcheck();
 
-        char word1[6];
-        char word2[6];
+        char word1[TOKLEN+1];
+        char word2[TOKLEN+1];
         packed_to_token(command.wd1, word1);
         packed_to_token(command.wd2, word2);
         V1 = get_vocab_id(word1);