De-FORTRANIZE some IDs.

diff --git a/actions.c b/actions.c
index 54cd4e0b2d0573d3983ba06e26af20ee93d07e85..e9e7b705e3a09a2de045cc90bfe640e3690b7f76 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1315,14 +1315,14 @@ int action(struct command_t *command)
             if (game.loc == LOC_START ||
                 game.loc == LOC_VALLEY ||
                 game.loc == LOC_SLIT) {
-                command->obj = DPRSSN;
+                command->obj = DEPRESSION;
             }
             if (game.loc == LOC_COBBLE ||
                 game.loc == LOC_DEBRIS ||
                 game.loc == LOC_AWKWARD ||
                 game.loc == LOC_BIRD ||
                 game.loc == LOC_PITTOP) {
-                command->obj = ENTRNC;
+                command->obj = ENTRANCE;
             }
         } else if (command->obj == DWARF && atdwrf(game.loc) > 0)
             /* FALL THROUGH */;

diff --git a/adventure.yaml b/adventure.yaml
index 4e2da1e704ad44cbd0929452232da4d754100e5d..4ee5cc78717a44ca22016a0bffd08562d263155a 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -246,9 +246,9 @@ motions: !!omap
     words: ['slab', 'slabr']
 - XYZZY:
     words: ['xyzzy']
-- DPRSSN:
+- DEPRESSION:
     words: ['depre']
-- ENTRNC:
+- ENTRANCE:
     words: ['entra']
 - PLUGH:
     words: ['plugh']
@@ -256,23 +256,21 @@ motions: !!omap
     words: ['secre']
 - CAVE:
     words: ['cave']
-- MOT_68:
-    words: !!null
-- MOT_69:
+- CROSS:
     words: ['cross']
 - BEDQUILT:
     words: ['bedqu']
 - PLOVER:
     words: ['plove']
-- FORWARD2:
+- ORIENTAL:
     words: ['orien']
-- FORWARD3:
+- CAVERN:
     words: ['caver']
-- FORWARD4:
+- SHELLROOM:
     words: ['shell']
-- FORWARD5:
+- RESERVOIR:
     words: ['reser']
-- FORWARD6:
+- OFFICE:
     words: ['main', 'offic']
 
 hints: