X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=e64cad077d8d94c454bdf07db19b6e4fb99cad2b;hp=6f4aa499a49f4432166c744f8b49ccf430c42da9;hb=e8a627f964a8337caf0c71dd87b1d7533f489f57;hpb=a167945e1963c5fdf4d2ad0283d249cb35d28508

diff --git a/misc.c b/misc.c
index 6f4aa49..e64cad0 100644
--- a/misc.c
+++ b/misc.c
@@ -64,10 +64,7 @@ static void vspeak(const char* msg, bool blank, va_list ap)
             }
         } else {
             i++;
-            // Integer specifier. In order to accommodate the fact
-            // that PARMS can have both legitimate integers *and*
-            // packed tokens, stringify everything. Future work may
-            // eliminate the need for this.
+            // Integer specifier.
             if (msg[i] == 'd') {
                 long arg = va_arg(ap, long);
                 int ret = snprintf(renderp, size, "%ld", arg);
@@ -121,7 +118,7 @@ void speak(const char* msg, ...)
     va_end(ap);
 }
 
-void sspeak(const long msg, ...)
+void sspeak(const int msg, ...)
 {
     va_list ap;
     va_start(ap, msg);
@@ -134,7 +131,7 @@ void sspeak(const long msg, ...)
 void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...)
 /* Find the skip+1st message from msg and print it.  Modes are:
  * feel = for inventory, what you can touch
- * look = the long description for the state the object is in
+ * look = the full description for the state the object is in
  * listen = the sound for the state the object is in
  * study = text on the object. */
 {
@@ -200,7 +197,7 @@ static int word_count(char* str)
     return (count);
 }
 
-static char* get_input()
+static char* get_input(void)
 {
     // Set up the prompt
     char input_prompt[] = "> ";
@@ -238,7 +235,7 @@ static char* get_input()
     return (input);
 }
 
-bool silent_yes()
+bool silent_yes(void)
 {
     bool outcome = false;
 
@@ -389,20 +386,31 @@ static int get_action_vocab_id(const char* word)
     return (WORD_NOT_FOUND);
 }
 
-static int get_special_vocab_id(const char* word)
-// Return the first special number that has 'word' as one of its words.
+static bool is_valid_int(const char *str) 
+/* Returns true if the string passed in is represents a valid integer, 
+ * that could then be parsed by atoi() */
 {
-    for (int i = 0; i < NSPECIALS; ++i) {
-        for (int j = 0; j < specials[i].words.n; ++j) {
-            if (strncasecmp(word, specials[i].words.strs[j], TOKLEN) == 0)
-                return (i);
-        }
+    // Handle negative number
+    if (*str == '-')
+        ++str;
+
+    // Handle empty string or just "-"
+    if (!*str)
+        return false;
+
+    // Check for non-digit chars in the rest of the stirng.
+    while (*str)
+    {
+        if (!isdigit(*str))
+            return false;
+        else
+            ++str;
     }
-    // If execution reaches here, we didn't find the word.
-    return (WORD_NOT_FOUND);
+
+    return true;
 }
 
-static void get_vocab_metadata(const char* word, long* id, enum wordtype* type)
+static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type)
 {
     /* Check for an empty string */
     if (strncmp(word, "", sizeof("")) == 0) {
@@ -411,7 +419,7 @@ static void get_vocab_metadata(const char* word, long* id, enum wordtype* type)
         return;
     }
 
-    long ref_num;
+    vocab_t ref_num;
 
     ref_num = get_motion_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND) {
@@ -434,13 +442,6 @@ static void get_vocab_metadata(const char* word, long* id, enum wordtype* type)
         return;
     }
 
-    ref_num = get_special_vocab_id(word);
-    if (ref_num != WORD_NOT_FOUND) {
-        *id = ref_num;
-        *type = SPECIAL;
-        return;
-    }
-
     // Check for the reservoir magic word.
     if (strcasecmp(word, game.zzword) == 0) {
         *id = PART;
@@ -448,6 +449,13 @@ static void get_vocab_metadata(const char* word, long* id, enum wordtype* type)
         return;
     }
 
+    // Check words that are actually numbers.
+    if (is_valid_int(word)) {
+        *id = WORD_EMPTY;
+        *type = NUMERIC;
+        return;
+    }
+
     *id = WORD_NOT_FOUND;
     *type = NO_WORD_TYPE;
     return;
@@ -459,7 +467,7 @@ static void tokenize(char* raw, struct command_t *cmd)
 
     /* Bound prefix on the %s would be needed to prevent buffer
      * overflow.  but we shortstop this more simply by making each
-     * raw-input buffer as long as the enrire inout buffer. */
+     * raw-input buffer as long as the entire input buffer. */
     sscanf(raw, "%s%s", cmd->raw1, cmd->raw2);
 
     /* (ESR) In oldstyle mode, simulate the uppercasing and truncating
@@ -484,7 +492,7 @@ static void tokenize(char* raw, struct command_t *cmd)
             cmd->raw2[i] = toupper(cmd->raw2[i]);
     }
 
-    /* populate command with parsed vocab metadata */
+    /* populate command with parsed vocabulary metadata */
     get_vocab_metadata(cmd->raw1, &(cmd->id1), &(cmd->type1));
     get_vocab_metadata(cmd->raw2, &(cmd->id2), &(cmd->type2));
 }
@@ -535,7 +543,7 @@ void move(obj_t object, loc_t where)
  *  pick up objects which are not at any loc, since carry wants to
  *  remove objects from game.atloc chains. */
 {
-    long from;
+    loc_t from;
 
     if (object > NOBJECTS)
         from = game.fixed[object - NOBJECTS];
@@ -547,7 +555,7 @@ void move(obj_t object, loc_t where)
     drop(object, where);
 }
 
-long put(obj_t object, loc_t where, long pval)
+loc_t put(obj_t object, loc_t where, long pval)
 /*  put() is the same as move(), except it returns a value used to set up the
  *  negated game.prop values for the repository objects. */
 {
@@ -597,16 +605,16 @@ void drop(obj_t object, loc_t where)
     game.atloc[where] = object;
 }
 
-long atdwrf(loc_t where)
+int atdwrf(loc_t where)
 /*  Return the index of first dwarf at the given location, zero if no dwarf is
  *  there (or if dwarves not active yet), -1 if all dwarves are dead.  Ignore
  *  the pirate (6th dwarf). */
 {
-    long at;
+    int at;
 
     at = 0;
     if (game.dflag < 2)
-        return (at);
+        return at;
     at = -1;
     for (long i = 1; i <= NDWARVES - 1; i++) {
         if (game.dloc[i] == where)
@@ -614,13 +622,13 @@ long atdwrf(loc_t where)
         if (game.dloc[i] != 0)
             at = 0;
     }
-    return (at);
+    return at;
 }
 
 /*  Utility routines (setbit, tstbit, set_seed, get_next_lcg_value,
  *  randrange) */
 
-long setbit(long bit)
+long setbit(int bit)
 /*  Returns 2**bit for use in constructing bit-masks. */
 {
     return (1L << bit);
@@ -638,7 +646,11 @@ void set_seed(long seedval)
     game.lcg_x = (unsigned long) seedval % game.lcg_m;
 
     // once seed is set, we need to generate the Z`ZZZ word
-    make_zzword(game.zzword);
+    for (int i = 0; i < 5; ++i) {
+        game.zzword[i] = 'A' + randrange(26);
+    }
+    game.zzword[1] = '\''; // force second char to apostrophe
+    game.zzword[5] = '\0';
 }
 
 unsigned long get_next_lcg_value(void)
@@ -655,15 +667,6 @@ long randrange(long range)
     return range * get_next_lcg_value() / game.lcg_m;
 }
 
-void make_zzword(char zzword[TOKLEN + 1])
-{
-    for (int i = 0; i < 5; ++i) {
-        zzword[i] = 'A' + randrange(26);
-    }
-    zzword[1] = '\''; // force second char to apostrophe
-    zzword[5] = '\0';
-}
-
 // LCOV_EXCL_START
 void bug(enum bugtype num, const char *error_string)
 {
@@ -674,7 +677,7 @@ void bug(enum bugtype num, const char *error_string)
 
 /* end */
 
-void state_change(obj_t obj, long state)
+void state_change(obj_t obj, int state)
 /* Object must have a change-message list for this to be useful; only some do */
 {
     game.prop[obj] = state;