pspeak(DRAGON, look, 3);
game.prop[DRAGON] = 1;
game.prop[RUG] = 0;
- int k = (PLAC[DRAGON] + FIXD[DRAGON]) / 2;
+ int k = (object_descriptions[DRAGON].plac + object_descriptions[DRAGON].fixd) / 2;
MOVE(DRAGON + NOBJECTS, -1);
MOVE(RUG + NOBJECTS, 0);
MOVE(DRAGON, k);
MOVE(RUG, k);
DROP(BLOOD, k);
for (obj = 1; obj <= NOBJECTS; obj++) {
- if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
+ if (game.place[obj] == object_descriptions[DRAGON].plac || game.place[obj] == object_descriptions[DRAGON].fixd)
MOVE(obj, k);
}
game.loc = k;
return GO_CLEAROBJ;
}
game.foobar = 0;
- if (game.place[EGGS] == PLAC[EGGS] || (TOTING(EGGS) && game.loc == PLAC[EGGS])) {
+ if (game.place[EGGS] == object_descriptions[EGGS].plac || (TOTING(EGGS) && game.loc == object_descriptions[EGGS].plac)) {
rspeak(spk);
return GO_CLEAROBJ;
} else {
game.prop[TROLL] = 1;
k = 2;
if (HERE(EGGS))k = 1;
- if (game.loc == PLAC[EGGS])k = 0;
- MOVE(EGGS, PLAC[EGGS]);
+ if (game.loc == object_descriptions[EGGS].plac)k = 0;
+ MOVE(EGGS, object_descriptions[EGGS].plac);
pspeak(EGGS, look, k);
return GO_CLEAROBJ;
}
} else {
spk = CHAIN_LOCKED;
if (game.prop[CHAIN] != 0)spk = ALREADY_LOCKED;
- if (game.loc != PLAC[CHAIN])spk = NO_LOCKSITE;
+ if (game.loc != object_descriptions[CHAIN].plac)spk = NO_LOCKSITE;
if (spk != CHAIN_LOCKED) {
rspeak(spk);
return GO_CLEAROBJ;
if (spk != RUG_WIGGLES) {
int k = 2 - game.prop[RUG];
game.prop[RUG] = k;
- if (k == 2) k = PLAC[SAPPH];
+ if (k == 2) k = object_descriptions[SAPPH].plac;
MOVE(RUG + NOBJECTS, k);
}
}
rspeak(TROLL_SCAMPERS);
MOVE(TROLL, 0);
MOVE(TROLL + NOBJECTS, 0);
- MOVE(TROLL2, PLAC[TROLL]);
- MOVE(TROLL2 + NOBJECTS, FIXD[TROLL]);
+ MOVE(TROLL2, object_descriptions[TROLL].plac);
+ MOVE(TROLL2 + NOBJECTS, object_descriptions[TROLL].fixd);
JUGGLE(CHASM);
game.prop[TROLL] = 2;
- } else if (obj != VASE || game.loc == PLAC[PILLOW]) {
+ } else if (obj != VASE || game.loc == object_descriptions[PILLOW].plac) {
rspeak(OK_MAN);
} else {
game.prop[VASE] = 2;
if (command.obj == INTRANSITIVE) {
command.obj = 0;
for (int i = 1; i <= NOBJECTS; i++) {
- if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
+ if (HERE(i) && object_descriptions[i].texts[0] != NULL && game.prop[i] >= 0)
command.obj = command.obj * NOBJECTS + i;
}
if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
rspeak(NO_SEE, command.wd1, command.wd1x);
} else if (command.obj == OYSTER && !game.clshnt && game.closed) {
game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
- } else if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
+ } else if (object_descriptions[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
rspeak(ACTSPK[command.verb]);
} else
pspeak(command.obj, study, game.prop[command.obj]);
rspeak(spk);
return GO_CLEAROBJ;
}
- if (command->obj >= MINTRS && command->obj <= MAXTRS && AT(TROLL)) {
+ if (object_descriptions[command->obj].is_treasure && AT(TROLL)) {
spk = TROLL_SATISFIED;
/* Snarf a treasure for the troll. */
DROP(command->obj, 0);
MOVE(TROLL, 0);
MOVE(TROLL + NOBJECTS, 0);
- DROP(TROLL2, PLAC[TROLL]);
- DROP(TROLL2 + NOBJECTS, FIXD[TROLL]);
+ DROP(TROLL2, object_descriptions[TROLL].plac);
+ DROP(TROLL2 + NOBJECTS, object_descriptions[TROLL].fixd);
JUGGLE(CHASM);
rspeak(spk);
return GO_CLEAROBJ;