DESTROY(BIRD);
spk = BIRD_DEAD;
} else if (obj == VEND) {
- pspeak(VEND, game.prop[VEND] + 2);
- game.prop[VEND] = 3 - game.prop[VEND];
+ bool blocking = (game.prop[VEND] == VEND_BLOCKS);
+ game.prop[VEND] = blocking ? VEND_UNBLOCKS : VEND_BLOCKS;
+ rspeak(blocking ? MACHINE_SWINGOUT : MACHINE_SWINGBACK);
return GO_CLEAROBJ;
}
GETIN(input, &command->wd1, &command->wd1x, &command->wd2, &command->wd2x);
if (command->wd1 != MAKEWD(WORD_YINIT) && command->wd1 != MAKEWD(WORD_YES))
return GO_CHECKFOO;
- pspeak(DRAGON, 3);
+ pspeak(DRAGON, look, 3);
game.prop[DRAGON] = 1;
game.prop[RUG] = 0;
int k = (PLAC[DRAGON] + FIXD[DRAGON]) / 2;
if (HERE(EGGS))k = 1;
if (game.loc == PLAC[EGGS])k = 0;
MOVE(EGGS, PLAC[EGGS]);
- pspeak(EGGS, k);
+ pspeak(EGGS, look, k);
return GO_CLEAROBJ;
}
}
} else if (obj == COINS && HERE(VEND)) {
DESTROY(COINS);
DROP(BATTERY, game.loc);
- pspeak(BATTERY, FRESH_BATTERIES);
+ pspeak(BATTERY, look, FRESH_BATTERIES);
return GO_CLEAROBJ;
} else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
rspeak(BIRD_BURNT);
} else {
game.prop[VASE] = 2;
if (AT(PILLOW))game.prop[VASE] = 0;
- pspeak(VASE, game.prop[VASE] + 1);
+ pspeak(VASE, look, game.prop[VASE] + 1);
if (game.prop[VASE] != 0)game.fixed[VASE] = -1;
}
}
if (spk == NO_CARRY)
rspeak(NOW_HOLDING);
game.blklin = false;
- pspeak(i, -1);
+ pspeak(i, touch, -1);
game.blklin = true;
spk = NO_MESSAGE;
}
spk = NO_MESSAGE;
}
for (int i = 1; i <= NOBJECTS; i++) {
- if (!HERE(i) || OBJSND[i] == 0 || game.prop[i] < 0)
+ if (!HERE(i) || object_descriptions[i].sounds[0] == NULL || game.prop[i] < 0)
continue;
- int mi = OBJSND[i] + game.prop[i];
+ int mi = game.prop[i];
if (i == BIRD)
- /* FIXME: Arithmetic on state values */
mi += 3 * game.blooded;
- pspeak(i, mi, game.zzword);
+ pspeak(i, hear, mi, game.zzword);
spk = NO_MESSAGE;
- if (i == BIRD && OBJSND[i] + game.prop[i] == 8)
+ /* FIXME: Magic number, sensitive to bird state logic */
+ if (i == BIRD && game.prop[i] == 5)
DESTROY(BIRD);
}
rspeak(spk);
rspeak(spk);
return GO_CLEAROBJ;
}
- pspeak(PLANT, game.prop[PLANT] + 3);
+ pspeak(PLANT, look, game.prop[PLANT] + 3);
game.prop[PLANT] = MOD(game.prop[PLANT] + 1, 3);
game.prop[PLANT2] = game.prop[PLANT];
return GO_MOVE;
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))
if (DARK(game.loc)) {
rspeak(NO_SEE, command.wd1, command.wd1x);
- } else if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
- rspeak(ACTSPK[command.verb]);
- } else if (command.obj == OYSTER && !game.clshnt) {
+ } 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 (object_descriptions[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
+ rspeak(ACTSPK[command.verb]);
} else
- pspeak(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
+ pspeak(command.obj, study, game.prop[command.obj]);
return GO_CLEAROBJ;
}
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
} else {
- pspeak(RESER, game.prop[RESER] + 1);
+ pspeak(RESER, look, game.prop[RESER] + 1);
game.prop[RESER] = 1 - game.prop[RESER];
if (AT(RESER))
return GO_CLEAROBJ;
}
if (HERE(BIRD))rspeak(spk);
game.prop[FISSURE] = 1 - game.prop[FISSURE];
- pspeak(FISSURE, 2 - game.prop[FISSURE]);
+ pspeak(FISSURE, look, 2 - game.prop[FISSURE]);
return GO_CLEAROBJ;
}
}