De-FORTRANIZE some IDs.

This commit is contained in:
Eric S. Raymond 2017-07-16 16:05:26 -04:00
parent 2fca59d9fd
commit 9b5142af5a
2 changed files with 10 additions and 12 deletions

View file

@ -1315,14 +1315,14 @@ int action(struct command_t *command)
if (game.loc == LOC_START || if (game.loc == LOC_START ||
game.loc == LOC_VALLEY || game.loc == LOC_VALLEY ||
game.loc == LOC_SLIT) { game.loc == LOC_SLIT) {
command->obj = DPRSSN; command->obj = DEPRESSION;
} }
if (game.loc == LOC_COBBLE || if (game.loc == LOC_COBBLE ||
game.loc == LOC_DEBRIS || game.loc == LOC_DEBRIS ||
game.loc == LOC_AWKWARD || game.loc == LOC_AWKWARD ||
game.loc == LOC_BIRD || game.loc == LOC_BIRD ||
game.loc == LOC_PITTOP) { game.loc == LOC_PITTOP) {
command->obj = ENTRNC; command->obj = ENTRANCE;
} }
} else if (command->obj == DWARF && atdwrf(game.loc) > 0) } else if (command->obj == DWARF && atdwrf(game.loc) > 0)
/* FALL THROUGH */; /* FALL THROUGH */;

View file

@ -246,9 +246,9 @@ motions: !!omap
words: ['slab', 'slabr'] words: ['slab', 'slabr']
- XYZZY: - XYZZY:
words: ['xyzzy'] words: ['xyzzy']
- DPRSSN: - DEPRESSION:
words: ['depre'] words: ['depre']
- ENTRNC: - ENTRANCE:
words: ['entra'] words: ['entra']
- PLUGH: - PLUGH:
words: ['plugh'] words: ['plugh']
@ -256,23 +256,21 @@ motions: !!omap
words: ['secre'] words: ['secre']
- CAVE: - CAVE:
words: ['cave'] words: ['cave']
- MOT_68: - CROSS:
words: !!null
- MOT_69:
words: ['cross'] words: ['cross']
- BEDQUILT: - BEDQUILT:
words: ['bedqu'] words: ['bedqu']
- PLOVER: - PLOVER:
words: ['plove'] words: ['plove']
- FORWARD2: - ORIENTAL:
words: ['orien'] words: ['orien']
- FORWARD3: - CAVERN:
words: ['caver'] words: ['caver']
- FORWARD4: - SHELLROOM:
words: ['shell'] words: ['shell']
- FORWARD5: - RESERVOIR:
words: ['reser'] words: ['reser']
- FORWARD6: - OFFICE:
words: ['main', 'offic'] words: ['main', 'offic']
hints: hints: