archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use enums for object number mnemonics instead of VOCWRD() calls.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-06-26 11:27:27 -07:00
parent 0bab67e106
commit 6ac098170c
5 changed files with 86 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

59
init.c
View file

@ -72,64 +72,7 @@ void initialise(void)
game.hintlc[i] = 0;
}
/* Define some handy mnemonics. These correspond to object numbers. */
AXE = VOCWRD(WORD_AXE, 1);
BATTERY = VOCWRD(WORD_BATTERY, 1);
BEAR = VOCWRD(WORD_BEAR, 1);
BIRD = VOCWRD(WORD_BIRD, 1);
BLOOD = VOCWRD(WORD_BLOOD, 1);
BOTTLE = VOCWRD(WORD_BOTTLE, 1);
CAGE = VOCWRD(WORD_CAGE, 1);
CAVITY = VOCWRD(WORD_CAVITY, 1);
CHASM = VOCWRD(WORD_CHASM, 1);
CLAM = VOCWRD(WORD_CLAM, 1);
DOOR = VOCWRD(WORD_DOOR, 1);
DRAGON = VOCWRD(WORD_DRAGON, 1);
DWARF = VOCWRD(WORD_DWARF, 1);
FISSURE = VOCWRD(WORD_FISSURE, 1);
FOOD = VOCWRD(WORD_FOOD, 1);
GRATE = VOCWRD(WORD_GRATE, 1);
KEYS = VOCWRD(WORD_KEYS, 1);
KNIFE = VOCWRD(WORD_KNIFE, 1);
LAMP = VOCWRD(WORD_LAMP, 1);
MAGAZINE = VOCWRD(WORD_MAGAZINE, 1);
MESSAG = VOCWRD(WORD_MESSAG, 1);
MIRROR = VOCWRD(WORD_MIRROR, 1);
OGRE = VOCWRD(WORD_OGRE, 1);
OIL = VOCWRD(WORD_OIL, 1);
OYSTER = VOCWRD(WORD_OYSTER, 1);
PILLOW = VOCWRD(WORD_PILLOW, 1);
PLANT = VOCWRD(WORD_PLANT, 1);
PLANT2 = PLANT + 1;
RESER = VOCWRD(WORD_RESER, 1);
ROD = VOCWRD(WORD_ROD, 1);
ROD2 = ROD + 1;
SIGN = VOCWRD(WORD_SIGN, 1);
SNAKE = VOCWRD(WORD_SNAKE, 1);
STEPS = VOCWRD(WORD_STEPS, 1);
TROLL = VOCWRD(WORD_TROLL, 1);
TROLL2 = TROLL + 1;
URN = VOCWRD(WORD_URN, 1);
VEND = VOCWRD(WORD_VEND, 1);
VOLCANO = VOCWRD(WORD_VOLCANO, 1);
WATER = VOCWRD(WORD_WATER, 1);
/* Vocabulary for treasures */
AMBER = VOCWRD(WORD_AMBER, 1);
CHAIN = VOCWRD(WORD_CHAIN, 1);
CHEST = VOCWRD(WORD_CHEST, 1);
COINS = VOCWRD(WORD_COINS, 1);
EGGS = VOCWRD(WORD_EGGS, 1);
EMERALD = VOCWRD(WORD_EMERALD, 1);
JADE = VOCWRD(WORD_JADE, 1);
NUGGET = VOCWRD(WORD_NUGGET, 1);
PEARL = VOCWRD(WORD_PEARL, 1);
PYRAMID = VOCWRD(WORD_PYRAMID, 1);
RUBY = VOCWRD(WORD_RUBY, 1);
RUG = VOCWRD(WORD_RUG, 1);
SAPPH = VOCWRD(WORD_SAPPH, 1);
TRIDENT = VOCWRD(WORD_TRIDENT, 1);
VASE = VOCWRD(WORD_VASE, 1);
/* Define some handy mnemonics. */
/* These are motion-verb numbers. */
BACK = VOCWRD(WORD_BACK, 0);