Reindentation

diff --git a/actions.c b/actions.c
index ec25552237ddd75adfaec1e47126c16d6eb29246..3808f9b119b8ea836eafac3308a7774c73d5106e 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -265,7 +265,7 @@ static int vbreak(verb_t verb, obj_t obj)
             game.fixed[VASE] = IS_FIXED;
             break;
         }
             game.fixed[VASE] = IS_FIXED;
             break;
         }

-       /* FALLTHRU */
+    /* FALLTHRU */

     default:
         speak(actions[verb].message);
     }
     default:
         speak(actions[verb].message);
     }


@@ -592,7 +592,7 @@ static int eat(verb_t verb, obj_t obj)
     case INTRANSITIVE:
         if (!HERE(FOOD))
             return GO_UNKNOWN;
     case INTRANSITIVE:
         if (!HERE(FOOD))
             return GO_UNKNOWN;

-       /* FALLTHRU */
+    /* FALLTHRU */

     case FOOD:
         DESTROY(FOOD);
         rspeak(THANKS_DELICIOUS);
     case FOOD:
         DESTROY(FOOD);
         rspeak(THANKS_DELICIOUS);


@@ -1145,21 +1145,21 @@ static int say(command_t command)
 /* Say.  Echo WD2. Magic words override. */
 {
     if (command.word[1].type == MOTION &&
 /* Say.  Echo WD2. Magic words override. */
 {
     if (command.word[1].type == MOTION &&

-       (command.word[1].id == XYZZY ||
-        command.word[1].id == PLUGH ||
-       command.word[1].id == PLOVER)) {
-           return GO_WORD2;
+        (command.word[1].id == XYZZY ||
+         command.word[1].id == PLUGH ||
+         command.word[1].id == PLOVER)) {
+        return GO_WORD2;

     }
     if (command.word[1].type == ACTION && command.word[1].id == PART)
         return reservoir();
     }
     if (command.word[1].type == ACTION && command.word[1].id == PART)
         return reservoir();

-    
+

     if (command.word[1].type == ACTION &&
         (command.word[1].id == FEE ||
     if (command.word[1].type == ACTION &&
         (command.word[1].id == FEE ||

-        command.word[1].id == FIE ||
-        command.word[1].id == FOE ||
-        command.word[1].id == FOO ||
-        command.word[1].id == FUM ||
-        command.word[1].id == PART)) {
+         command.word[1].id == FIE ||
+         command.word[1].id == FOE ||
+         command.word[1].id == FOO ||
+         command.word[1].id == FUM ||
+         command.word[1].id == PART)) {

         return bigwords(command.word[1].id);
     }
     sspeak(OKEY_DOKEY, command.word[1].raw);
         return bigwords(command.word[1].id);
     }
     sspeak(OKEY_DOKEY, command.word[1].raw);


@@ -1316,14 +1316,14 @@ int action(command_t command)
  *  unless verb is "say", which snarfs arbitrary second word.
  */
 {
  *  unless verb is "say", which snarfs arbitrary second word.
  */
 {

-    /* Previously, actions that result in a message, but don't do anything 
-     * further were called "specials". Now they're handled here as normal 
+    /* Previously, actions that result in a message, but don't do anything
+     * further were called "specials". Now they're handled here as normal

      * actions. If noaction is true, then we spit out the message and return */
     if (actions[command.verb].noaction) {
         speak(actions[command.verb].message);
         return GO_CLEAROBJ;
     }
      * actions. If noaction is true, then we spit out the message and return */
     if (actions[command.verb].noaction) {
         speak(actions[command.verb].message);
         return GO_CLEAROBJ;
     }

-    
+

     if (command.part == unknown) {
         /*  Analyse an object word.  See if the thing is here, whether
          *  we've got a verb yet, and so on.  Object must be here
     if (command.part == unknown) {
         /*  Analyse an object word.  See if the thing is here, whether
          *  we've got a verb yet, and so on.  Object must be here


@@ -1369,9 +1369,9 @@ int action(command_t command)
         if (command.word[1].raw[0] != '\0' && command.verb != SAY)
             return GO_WORD2;
         if (command.verb == SAY)
         if (command.word[1].raw[0] != '\0' && command.verb != SAY)
             return GO_WORD2;
         if (command.verb == SAY)

-           /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE
-            * will do here. We're preventing interpretation as an intransitive
-            * verb when the word is unknown. */
+            /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE
+             * will do here. We're preventing interpretation as an intransitive
+             * verb when the word is unknown. */

             command.obj = command.word[1].raw[0] != '\0' ? KEYS : NO_OBJECT;
         if (command.obj == NO_OBJECT ||
             command.obj == INTRANSITIVE) {
             command.obj = command.word[1].raw[0] != '\0' ? KEYS : NO_OBJECT;
         if (command.obj == NO_OBJECT ||
             command.obj == INTRANSITIVE) {


@@ -1508,7 +1508,7 @@ int action(command_t command)
         case RUB:
             return rub(command.verb, command.obj);
         case THROW:
         case RUB:
             return rub(command.verb, command.obj);
         case THROW:

-            return throw(command);
+            return throw (command);

         case QUIT: {
             speak(actions[command.verb].message);
             return GO_CLEAROBJ;
         case QUIT: {
             speak(actions[command.verb].message);
             return GO_CLEAROBJ;


@@ -1560,11 +1560,11 @@ int action(command_t command)
             speak(actions[command.verb].message);
             return GO_CLEAROBJ;
         }
             speak(actions[command.verb].message);
             return GO_CLEAROBJ;
         }

-       // LCOV_EXCL_START
-       // This case should never happen - here only as placeholder
+        // LCOV_EXCL_START
+        // This case should never happen - here only as placeholder

         case PART:
             return reservoir();
         case PART:
             return reservoir();

-       // LCOV_EXCL_STOP
+        // LCOV_EXCL_STOP

         case SEED:
             return seed(command.verb, command.word[1].raw);
         case WASTE:
         case SEED:
             return seed(command.verb, command.word[1].raw);
         case WASTE:

diff --git a/advent.h b/advent.h
index 4491b42926ae19347f899290f710693399781abb..6d8380738fdc8f48157a8876ce16934dd8266aca 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -134,7 +134,7 @@ struct game_t {
     long dflag;
 
     long dkill;                  // dwarves killed
     long dflag;
 
     long dkill;                  // dwarves killed

-    long dtotal;                 // total dwarves (including pirate)
+    long dtotal;                 // total dwarves (including pirate) in loc

     long foobar;                 // progress in saying "FEE FIE FOE FOO".
     long holdng;                 // number of objects being carried
     long igo;                    // # uses of "go" instead of a direction
     long foobar;                 // progress in saying "FEE FIE FOE FOO".
     long holdng;                 // number of objects being carried
     long igo;                    // # uses of "go" instead of a direction


@@ -147,7 +147,7 @@ struct game_t {
     bool novice;                 // asked for instructions at start-up?
     turn_t numdie;               // number of times killed so far
     loc_t oldloc;                // where player was
     bool novice;                 // asked for instructions at start-up?
     turn_t numdie;               // number of times killed so far
     loc_t oldloc;                // where player was

-    loc_t oldlc2;                // where player was two moves ago 
+    loc_t oldlc2;                // where player was two moves ago

     obj_t oldobj;                // last object player handled
     bool panic;                  // has player found out he's trapped?
     long saved;                  // point penalty for saves
     obj_t oldobj;                // last object player handled
     bool panic;                  // has player found out he's trapped?
     long saved;                  // point penalty for saves


@@ -183,9 +183,9 @@ struct settings_t {
 };
 
 typedef struct {
 };
 
 typedef struct {

-  char raw[LINESIZE];
-  vocab_t id;
-  word_type_t type;
+    char raw[LINESIZE];
+    vocab_t id;
+    word_type_t type;

 } command_word_t;
 
 typedef struct {
 } command_word_t;
 
 typedef struct {


@@ -231,9 +231,9 @@ void bug(enum bugtype, const char *) __attribute__((__noreturn__));
 
 /* represent an empty command word */
 static const command_word_t empty_command_word = {
 
 /* represent an empty command word */
 static const command_word_t empty_command_word = {

-  .raw = "",
-  .id = WORD_EMPTY,
-  .type = NO_WORD_TYPE,
+    .raw = "",
+    .id = WORD_EMPTY,
+    .type = NO_WORD_TYPE,

 };
 
 /* end */
 };
 
 /* end */

diff --git a/main.c b/main.c
index 41bbe9564b04e9e047af2e046d4e71959c4e32ed..6f154c1821cbd6f184abbf44cec24238a444882e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1050,43 +1050,43 @@ Lclearobj:
         if (game.knfloc > 0 && game.knfloc != game.loc)
             game.knfloc = 0;
 
         if (game.knfloc > 0 && game.knfloc != game.loc)
             game.knfloc = 0;
 

-       /* Preserve state from last command for reuse when required */
-       command_t preserve = command;
+        /* Preserve state from last command for reuse when required */
+        command_t preserve = command;

 
 

-       // Get command input from user
+        // Get command input from user

         if (!get_command_input(&command))
             return false;
 
 #ifdef GDEBUG
         if (!get_command_input(&command))
             return false;
 
 #ifdef GDEBUG

-       /* Needs to stay synced with enum word_type_t */
-       const char *types[] = {"NO_WORD_TYPE", "MOTION", "OBJECT", "ACTION", "NUMERIC"};
-       /* needs to stay synced with enum speechpart */
-       const char *roles[] = {"unknown", "intransitive", "transitive"};
-       printf("Preserve: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
-              roles[preserve.part],
-              types[preserve.word[0].type],
-              preserve.word[0].id,
-              types[preserve.word[1].type],
-              preserve.word[1].id);
-       printf("Command: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
-              roles[command.part],
-              types[command.word[0].type],
-              command.word[0].id,
-              types[command.word[1].type],
-              command.word[1].id);
+        /* Needs to stay synced with enum word_type_t */
+        const char *types[] = {"NO_WORD_TYPE", "MOTION", "OBJECT", "ACTION", "NUMERIC"};
+        /* needs to stay synced with enum speechpart */
+        const char *roles[] = {"unknown", "intransitive", "transitive"};
+        printf("Preserve: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
+               roles[preserve.part],
+               types[preserve.word[0].type],
+               preserve.word[0].id,
+               types[preserve.word[1].type],
+               preserve.word[1].id);
+        printf("Command: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
+               roles[command.part],
+               types[command.word[0].type],
+               command.word[0].id,
+               types[command.word[1].type],
+               command.word[1].id);

 #endif
 
 #endif
 

-       /* Handle of objectless action followed by actionless object */
-       if (preserve.word[0].type == ACTION && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0)
-           command.verb = preserve.verb;
+        /* Handle of objectless action followed by actionless object */
+        if (preserve.word[0].type == ACTION && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0)
+            command.verb = preserve.verb;

 
 #ifdef BROKEN
 
 #ifdef BROKEN

-       /* Handling of actionless object followed by objectless action */
-       if (preserve.type1 == OBJECT && preserve.type2 == NO_WORD_TYPE && command.id2 == 0)
-           command.obj = preserve.obj;
+        /* Handling of actionless object followed by objectless action */
+        if (preserve.type1 == OBJECT && preserve.type2 == NO_WORD_TYPE && command.id2 == 0)
+            command.obj = preserve.obj;

 #endif
 
 #endif
 

-       ++game.turns;
+        ++game.turns;

 
         if (closecheck()) {
             if (game.closed)
 
         if (closecheck()) {
             if (game.closed)


@@ -1122,8 +1122,8 @@ Lclearobj:
             }
             if ((command.word[0].id == WATER || command.word[0].id == OIL) && (command.word[1].id == PLANT || command.word[1].id == DOOR)) {
                 if (AT(command.word[1].id)) {
             }
             if ((command.word[0].id == WATER || command.word[0].id == OIL) && (command.word[1].id == PLANT || command.word[1].id == DOOR)) {
                 if (AT(command.word[1].id)) {

-                   command.word[1] = command.word[0];
-                   command.word[0].id = POUR;
+                    command.word[1] = command.word[0];
+                    command.word[0].id = POUR;

                     command.word[0].type = ACTION;
                     strncpy(command.word[0].raw, "pour", LINESIZE - 1);
                 }
                     command.word[0].type = ACTION;
                     strncpy(command.word[0].raw, "pour", LINESIZE - 1);
                 }


@@ -1133,12 +1133,12 @@ Lclearobj:
                 command.word[0].type = ACTION;
             }
 
                 command.word[0].type = ACTION;
             }
 

-           /* From OV to VO form */
-           if (command.word[0].type==OBJECT && command.word[1].type==ACTION) {
-               command_word_t stage = command.word[0];
-               command.word[0] = command.word[1];
-               command.word[1] = stage;
-           }
+            /* From OV to VO form */
+            if (command.word[0].type == OBJECT && command.word[1].type == ACTION) {
+                command_word_t stage = command.word[0];
+                command.word[0] = command.word[1];
+                command.word[1] = stage;
+            }

         }
 
 Lookup:
         }
 
 Lookup:


@@ -1165,7 +1165,7 @@ Lookup:
             command.obj = command.word[0].id;
             break;
         case ACTION:
             command.obj = command.word[0].id;
             break;
         case ACTION:

-            if(command.word[1].type == NUMERIC) 
+            if (command.word[1].type == NUMERIC)

                 command.part = transitive;
             else
                 command.part = intransitive;
                 command.part = transitive;
             else
                 command.part = intransitive;


@@ -1186,11 +1186,11 @@ Lookup:
             continue;  /* back to top of main interpreter loop */
         case GO_WORD2:
 #ifdef GDEBUG
             continue;  /* back to top of main interpreter loop */
         case GO_WORD2:
 #ifdef GDEBUG

-           printf("Word shift\n");
+            printf("Word shift\n");

 #endif /* GDEBUG */
             /* Get second word for analysis. */
 #endif /* GDEBUG */
             /* Get second word for analysis. */

-           command.word[0] = command.word[1];
-           command.word[1] = empty_command_word;
+            command.word[0] = command.word[1];
+            command.word[1] = empty_command_word;

             goto Lookup;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case
             goto Lookup;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case

diff --git a/misc.c b/misc.c
index 5386ff786c27c06538d5bb1964f410ff4fcdb596..03681d0b07389b6eaf7af1cbd5f6eb2da7ec62b2 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -388,22 +388,21 @@ static int get_action_vocab_id(const char* word)
     return (WORD_NOT_FOUND);
 }
 
     return (WORD_NOT_FOUND);
 }
 

-static bool is_valid_int(const char *str) 
-/* Returns true if the string passed in is represents a valid integer, 
+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() */
 {
     // Handle negative number
     if (*str == '-')
         ++str;
 
  * that could then be parsed by atoi() */
 {
     // Handle negative number
     if (*str == '-')
         ++str;
 

-    // Handle empty string or just "-". Should never reach this 
+    // Handle empty string or just "-". Should never reach this

     // point, because this is only used with transitive verbs.
     if (!*str)
         return false; // LCOV_EXCL_LINE
 
     // Check for non-digit chars in the rest of the stirng.
     // point, because this is only used with transitive verbs.
     if (!*str)
         return false; // LCOV_EXCL_LINE
 
     // Check for non-digit chars in the rest of the stirng.

-    while (*str)
-    {
+    while (*str) {

         if (!isdigit(*str))
             return false;
         else
         if (!isdigit(*str))
             return false;
         else