From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 6 Apr 2023 14:03:24 +0000 (-0400)
Subject: Magic-number elimination.
X-Git-Tag: 1.16~35
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f5ff25f52aaec53581d371c4d019af75c57fb989;p=open-adventure.git

Magic-number elimination.
---

diff --git a/main.c b/main.c
index 124ba44..80689e3 100644
--- a/main.c
+++ b/main.c
@@ -463,8 +463,7 @@ static void describe_location(void)
 {
     const char* msg = locations[game.loc].description.small;
 
-    if (MOD(game.abbrev[game.loc], game.abbnum) == 0 ||
-        msg == NO_MESSAGE)
+    if (MOD(game.abbrev[game.loc], game.abbnum) == 0 || msg == NO_MESSAGE)
         msg = locations[game.loc].description.big;
 
     if (!FORCED(game.loc) && DARK(game.loc)) {
diff --git a/saveresume.c b/saveresume.c
index db1153b..d7fe76e 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -29,8 +29,7 @@
 
 /*
  * If you change the first three members, the resume function may not properly
- * reject saves from older versions.  Yes, this glues us to a hardware-
- * dependent length of int.  Later members can change, but bump the version
+ * reject saves from older versions. Later members can change, but bump the version
  * when you do that.
  */
 struct save_t {
@@ -123,8 +122,7 @@ int resume(void)
 #endif
     FILE *fp = NULL;
 
-    if (game.loc != 1 ||
-        game.abbrev[1] != 1) {
+    if (game.loc != LOC_START || game.abbrev[LOC_START] != 1) {
         rspeak(RESUME_ABANDON);
         if (!yes_or_no(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
             return GO_CLEAROBJ;