From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 28 Jun 2017 21:29:33 +0000 (-0400)
Subject: More magic-number removal.
X-Git-Tag: 1.1~40
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=d96d5db51fd1ed0040bdbca514441a4628814aff

More magic-number removal.
---

diff --git a/actions.c b/actions.c
index 677b609..910d46c 100644
--- a/actions.c
+++ b/actions.c
@@ -288,7 +288,7 @@ static int vcarry(token_t verb, token_t obj)
         game.place[LIQUID()] = CARRIED;
     if (GSTONE(obj) && game.prop[obj] != 0) {
         game.prop[obj] = 0;
-        game.prop[CAVITY] = 1;
+        game.prop[CAVITY] = CAVITY_EMPTY;
     }
     rspeak(OK_MAN);
     return GO_CLEAROBJ;
@@ -350,12 +350,12 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             if (game.closed) return GO_DWARFWAKE;
             DESTROY(SNAKE);
             /* Set game.prop for use by travel options */
-            game.prop[SNAKE] = 1;
+            game.prop[SNAKE] = SNAKE_CHASED;
 
-        } else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) {
+        } else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != CAVITY_FULL)) {
             rspeak(GEM_FITS);
             game.prop[obj] = 1;
-            game.prop[CAVITY] = 0;
+            game.prop[CAVITY] = CAVITY_FULL;
             if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != 2) || (obj == RUBY &&
                               game.prop[RUG] == 2))) {
                 spk = RUG_RISES;
diff --git a/adventure.yaml b/adventure.yaml
index 1e7bc32..2228016 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -3363,8 +3363,8 @@ objects: !!omap
     locations: LOC_NOWHERE
     immovable: true
     descriptions:
-    - '' # something in it
-    - 'There is a small urn-shaped cavity in the rock.'
+    - [CAVITY_FULL, ''] # something in it
+    - [CAVITY_EMPTY, 'There is a small urn-shaped cavity in the rock.']
 - BLOOD:
     words: ['blood']
     inventory: '*blood'