int k = VOCAB(foo, 3);
int spk = NOTHING_HAPPENS;
if (game.foobar != 1 - k) {
- if (game.foobar != 0)spk = START_OVER;
+ if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER;
rspeak(spk);
return GO_CLEAROBJ;
} else {
if (LIQUID() != 0)
spk = BOTTLE_FULL;
if (spk == BOTTLED_WATER) {
- game.prop[BOTTLE] = MOD(COND[game.loc], 4) / 2 * 2;
+ game.prop[BOTTLE] = MOD(conditions[game.loc], 4) / 2 * 2;
k = LIQUID();
if (TOTING(BOTTLE))
game.place[k] = CARRIED;
static int listen(void)
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */
{
- int k;
+ long k;
int spk = ALL_SILENT;
- k = LOCSND[game.loc];
- if (k != 0) {
+ k = locations[game.loc].sound;
+ if (k != SILENT) {
rspeak(labs(k));
if (k < 0) return GO_CLEAROBJ;
spk = NO_MESSAGE;