From 524f035e764fda464fc7c3aaa2c2eaa894805e48 Mon Sep 17 00:00:00 2001 From: NHOrus Date: Fri, 23 Nov 2018 20:19:22 +0300 Subject: [PATCH] Reindentation, typo fix --- main.c | 20 ++++++++++---------- misc.c | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/main.c b/main.c index dc879a1..adb0c99 100644 --- a/main.c +++ b/main.c @@ -968,14 +968,14 @@ void clear_command(command_t *cmd) cmd->obj = NO_OBJECT; } -/* +/* * This function probably does too many disparate things. It checks for hints, - * sees if the gamed is closed, checks for darkness, gets user input, increments - * the turns in the game state, checks to see if we should be closing, gets the - * command input, and preprocesses some implied verbs in the case that the user + * sees if the gamed is closed, checks for darkness, gets user input, increments + * the turns in the game state, checks to see if we should be closing, gets the + * command input, and preprocesses some implied verbs in the case that the user * put in a single word motion or object command. - * - * This was the lesser evil -- it got rid of a really nasty goto in the main + * + * This was the lesser evil -- it got rid of a really nasty goto in the main * input parser/state transition engine. This should be refactored further. */ bool get_preprocessed_command_input(command_t *command) @@ -1150,7 +1150,7 @@ static bool do_command() listobjects(); clear_command(&command); - + do { // Get pre-processed command input from user command_given = get_preprocessed_command_input(&command); @@ -1205,7 +1205,7 @@ static bool do_command() BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE } - if(command_given) { + if (command_given) { switch (action(command)) { case GO_TERMINATE: return true; @@ -1216,7 +1216,7 @@ static bool do_command() continue; /* back to top of main interpreter loop */ case GO_CLEAROBJ: clear_command(&command); - /* FALL THROUGH */ + /* FALL THROUGH */ case GO_CHECKHINT: command_given = false; break; @@ -1247,7 +1247,7 @@ static bool do_command() } } while (!command_executed); } while (!command_given); - } + } } /* end */ diff --git a/misc.c b/misc.c index 0e6b50e..0d9405e 100644 --- a/misc.c +++ b/misc.c @@ -5,7 +5,7 @@ * Copyright (c) 2017 by Eric S. Raymond * SPDX-License-Identifier: BSD-2-clause */ - + #include #include #include @@ -476,9 +476,9 @@ static void tokenize(char* raw, command_t *cmd) { /* * Be caereful about modifing this. We do not want to nuke the - * the speech part or ID from the previous turn. + * the speech part or ID from the previous turn. */ - memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0],raw)); + memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0].raw)); memset(&cmd->word[1].raw, '\0', sizeof(cmd->word[1].raw)); /* Bound prefix on the %s would be needed to prevent buffer @@ -590,9 +590,9 @@ void carry(obj_t object, loc_t where) if (game.place[object] == CARRIED) return; game.place[object] = CARRIED; - - if (object!= BIRD) - ++game.holdng; + + if (object != BIRD) + ++game.holdng; } if (game.atloc[where] == object) { game.atloc[where] = game.link[object]; @@ -613,14 +613,14 @@ void drop(obj_t object, loc_t where) game.fixed[object - NOBJECTS] = where; else { if (game.place[object] == CARRIED) - if (object != BIRD) - /* The bird has to be weightless. This ugly hack (and the - * corresponding code in the drop function) brought to you - * by the fact that when the bird is caged, we need to be able - * to either 'take bird' or 'take cage' and have the right thing - * happen. - */ - --game.holdng; + if (object != BIRD) + /* The bird has to be weightless. This ugly hack (and the + * corresponding code in the drop function) brought to you + * by the fact that when the bird is caged, we need to be able + * to either 'take bird' or 'take cage' and have the right thing + * happen. + */ + --game.holdng; game.place[object] = where; } if (where == LOC_NOWHERE || -- 2.31.1