Comment cleanup, semantic types, information hiding.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 2a2f99e3451a05845500c829309488c57d25f3ba..faa353b514be4001c04d0506170d0e660fbc47ef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -137,6 +137,7 @@ static bool fallback_handler(struct command_t command)
 /* fallback handler for commands not handled by FORTRANish parser */
 {
     long sv;
+    turn_t turnlimit;
     char buf[DIM(command.raw1) + DIM(command.raw2) + 1];
     sprintf(buf, "%s %s", command.raw1, command.raw2);
 
@@ -146,8 +147,8 @@ static bool fallback_handler(struct command_t command)
         // autogenerated, so don't charge user time for it.
         --game.turns;
         return true;
-    } else if (sscanf(buf, "waste %ld", &sv) == 1) {
-        game.limit -= sv;
+    } else if (sscanf(buf, "waste %ld", &turnlimit) == 1) {
+        game.limit -= turnlimit;
         printf("Game limit is now %ld\n", game.limit);
         return true;
     }
@@ -318,7 +319,7 @@ static bool dwarfmove(void)
 /* Dwarves move.  Return true if player survives, false if he dies. */
 {
     int kk, stick, attack;
-    long tk[21];
+    loc_t tk[21];
 
     /*  Dwarf stuff.  See earlier comments for description of
      *  variables.  Remember sixth dwarf is pirate and is thus
@@ -508,7 +509,7 @@ static void croak(void)
     }
 }
 
-static bool traveleq(long a, long b)
+static bool traveleq(int a, int b)
 /* Are two travel entries equal for purposes of skip after failed condition? */
 {
     return (travel[a].condtype == travel[b].condtype)
@@ -670,7 +671,7 @@ static void playermove( int motion)
 
                 /* We arrive here on conditional failure.
                  * Skip to next non-matching destination */
-                long te_tmp = travel_entry;
+                int te_tmp = travel_entry;
                 do {
                     if (travel[te_tmp].stop)
                         BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
@@ -947,7 +948,7 @@ static void listobjects(void)
     if (!DARK(game.loc)) {
         ++game.abbrev[game.loc];
         for (int i = game.atloc[game.loc]; i != 0; i = game.link[i]) {
-            long obj = i;
+            obj_t obj = i;
             if (obj > NOBJECTS)
                 obj = obj - NOBJECTS;
             if (obj == STEPS && TOTING(NUGGET))
@@ -986,36 +987,6 @@ static void listobjects(void)
     }
 }
 
-static bool get_command_input(struct command_t *command)
-{
-    char inputbuf[LINESIZE];
-    char* input;
-
-    for (;;) {
-        input = get_input();
-        if (input == NULL)
-            return false;
-        if (word_count(input) > 2) {
-            rspeak(TWO_WORDS);
-            free(input);
-            continue;
-        }
-        if (strcmp(input, "") != 0)
-            break;
-        free(input);
-    }
-
-    strncpy(inputbuf, input, LINESIZE - 1);
-    free(input);
-
-    tokenize(inputbuf, command);
-
-    get_vocab_metadata(command->raw1, &(command->id1), &(command->type1));
-    get_vocab_metadata(command->raw2, &(command->id2), &(command->type2));
-
-    return true;
-}
-
 static bool do_command()
 /* Get and execute a command */
 {
@@ -1116,7 +1087,7 @@ Lclearobj:
             lampcheck();
 
         if (command.type1 == MOTION && command.id1 == ENTER
-           && (command.id2 == STREAM || command.id2 == WATER)) {
+            && (command.id2 == STREAM || command.id2 == WATER)) {
             if (LIQLOC(game.loc) == WATER)
                 rspeak(FEET_WET);
             else
@@ -1126,6 +1097,21 @@ Lclearobj:
         }
 
         if (command.type1 == OBJECT) {
+            if (command.id1 == GRATE) {
+                command.type1 = MOTION;
+                if (game.loc == LOC_START ||
+                    game.loc == LOC_VALLEY ||
+                    game.loc == LOC_SLIT) {
+                    command.id1 = DEPRESSION;
+                }
+                if (game.loc == LOC_COBBLE ||
+                    game.loc == LOC_DEBRIS ||
+                    game.loc == LOC_AWKWARD ||
+                    game.loc == LOC_BIRD ||
+                    game.loc == LOC_PITTOP) {
+                    command.id1 = ENTRANCE;
+                }
+            }
             if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
                 if (AT(command.id2)) {
                     command.id2 = POUR;