Reflow. master
authorEric S. Raymond <esr@thyrsus.com>
Sun, 22 Sep 2024 17:08:31 +0000 (13:08 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Sun, 22 Sep 2024 17:08:31 +0000 (13:08 -0400)
advent.h
main.c

index 5aadcbbd6502a7d661d6779802bc428a7dbbeca4..17e02eb228404bfbba1b6ef609257e0a522b1dcc 100644 (file)
--- a/advent.h
+++ b/advent.h
 #define PROP_IS_INVALID(val) (val < -MAX_STATE || val > MAX_STATE)
 #define OBJECT_IS_STASHED(obj) (game.objects[obj].prop < 0)
 #define OBJECT_IS_NOTFOUND(obj) (!game.objects[obj].found)
-#define OBJECT_IS_FOUND(obj)                                                     \
+#define OBJECT_IS_FOUND(obj)                                                   \
        (game.objects[obj].found && game.objects[obj].prop == 0)
-#define OBJECT_IS_STASHED_OR_UNSEEN(obj)                                         \
+#define OBJECT_IS_STASHED_OR_UNSEEN(obj)                                       \
        (!game.objects[obj].found || game.objects[obj].prop < 0)
-#define OBJECT_SET_FOUND(obj)                                                    \
+#define OBJECT_SET_FOUND(obj)                                                  \
        do {                                                                   \
                game.objects[obj].found = true;                                \
                game.objects[obj].prop = STATE_FOUND;                          \
diff --git a/main.c b/main.c
index e0e4c58e743afe8ce7c1abc17d2fec88395e2bae..4db38363a540a3cbd6091b43c27d423733972964 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1272,8 +1272,9 @@ static bool do_command(void) {
                                        pspeak(OYSTER, look, true, 1);
                                }
                                for (size_t i = 1; i <= NOBJECTS; i++) {
-                                       if (TOTING(i) && (OBJECT_IS_NOTFOUND(i) ||
-                                                         OBJECT_IS_STASHED(i))) {
+                                       if (TOTING(i) &&
+                                           (OBJECT_IS_NOTFOUND(i) ||
+                                            OBJECT_IS_STASHED(i))) {
                                                game.objects[i].prop =
                                                    OBJECT_STASHED(i);
                                        }
@@ -1282,10 +1283,10 @@ static bool do_command(void) {
 
                        /* Check to see if the room is dark. */
                        game.wzdark = DARK(game.loc);
-                    
+
                        /* If the knife is not here it permanently disappears.
-                       * Possibly this should fire if the knife is here but
-                       * the room is dark? */
+                        * Possibly this should fire if the knife is here but
+                        * the room is dark? */
                        if (game.knfloc > LOC_NOWHERE &&
                            game.knfloc != game.loc) {
                                game.knfloc = LOC_NOWHERE;