X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=1bdc64c3fbbc3b733283c9504f62efe207c9704f;hb=94e7cc65050ddfd04a8a1606f8899c7e5be496e8;hp=809574b6c35cc82e02208a05862133463aa26e2b;hpb=9af3ab4ecddbd6dd0347a4adc54a98b5153a9fb6;p=open-adventure.git diff --git a/main.c b/main.c index 809574b..1bdc64c 100644 --- a/main.c +++ b/main.c @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) } } - /* copy inncation line part after switches */ + /* copy invocation line part after switches */ settings.argc = argc - optind; settings.argv = argv + optind; settings.optind = 0; @@ -139,8 +139,8 @@ int main(int argc, char *argv[]) char *myreadline(const char *prompt) { /* - * This function isbn't required for gameplay, readline() straight - * up would suffice for tat. It's where we interpret command-line + * This function isn't required for gameplay, readline() straight + * up would suffice for that. It's where we interpret command-line * logfiles for testing purposes. */ /* Normal case - no script arguments */ @@ -656,7 +656,7 @@ static void playermove(int motion) /* Look for a way to fulfil the motion verb passed in - travel_entry indexes * the beginning of the motion entries for here (game.loc). */ for (;;) { - if (T_TERMINATE(travel[travel_entry]) || + if ((travel[travel_entry].motion == HERE) || travel[travel_entry].motion == motion) break; if (travel[travel_entry].stop) { @@ -1048,10 +1048,10 @@ static void listobjects(void) static bool preprocess_command(command_t *command) /* Pre-processes a command input to see if we need to tease out a few specific cases: * - "enter water" or "enter stream": - * wierd specific case that gets the user wet, and then kicks us back to get another command + * weird specific case that gets the user wet, and then kicks us back to get another command * - : * Irregular form of input, but should be allowed. We switch back to form for - * furtherprocessing. + * further processing. * - "grate": * If in location with grate, we move to that grate. If we're in a number of other places, * we move to the entrance. @@ -1222,7 +1222,7 @@ static bool do_command() if (closecheck() ) return true; - /* loop until all words in command are procesed */ + /* loop until all words in command are processed */ while (command.state == PREPROCESSED ) { command.state = PROCESSING; @@ -1313,7 +1313,7 @@ static bool do_command() default: // LCOV_EXCL_LINE BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE } - } /* while command has nob been fully processed */ + } /* while command has not been fully processed */ } /* while command is not yet given */ } /* while command is not executed */