break;
}
/* show score and exit */
- score(quitgame);
+ terminate(quitgame);
}
static bool fallback_handler(char *buf)
/* He died during closing time. No resurrection. Tally up a
* death and exit. */
RSPEAK(DEATH_CLOSING);
- score(endgame);
-
+ terminate(endgame);
}
/* FIXME: Arithmetic on message numbers */
else if (game.numdie == MAXDIE || !YES(cmdin, WATCH_IT + game.numdie * 2, WHICH_WAY + game.numdie * 2, OK_MAN))
- score(endgame);
+ terminate(endgame);
else {
game.place[WATER] = game.place[OIL] = NOWHERE;
if (TOTING(LAMP))
/* else fall through */
} else if (game.prop[motion] != game.newloc / 100 - 3)
break;
+ L12:
do {
if (TRAVEL[kk] < 0)BUG(25);
++kk;
* actual motion, but can be spotted by "go back". */
/* FIXME: Arithmetic on location numbers */
game.newloc = 99 + 100 - game.loc;
- if (game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD)))
- return true;
- game.newloc = game.loc;
- RSPEAK(MUST_DROP);
+ if (game.holdng > 1 || (game.holdng == 1 && !TOTING(EMRALD))) {
+ game.newloc = game.loc;
+ RSPEAK(MUST_DROP);
+ }
return true;
case 2:
/* Travel 302. Plover transport. Drop the emerald (only use
* plover-passage to get it out. Having dropped it, go back and
* pretend he wasn't carrying it after all. */
DROP(EMRALD, game.loc);
- do {
- if (TRAVEL[kk] < 0)BUG(25);
- ++kk;
- game.newloc = labs(TRAVEL[kk]) / 1000;
- } while
- (game.newloc == scratchloc);
- continue; /* back to top of do/while loop */
+ goto L12;
case 3:
/* Travel 303. Troll bridge. Must be done only as special
* motion so that dwarves won't wander across and encounter
game.prop[BEAR] = 3;
game.oldlc2 = game.newloc;
croak(cmdin);
- return false;
}
}
BUG(20);
}
} while
- (false);
+ (false);
/* FIXME: Arithmetic on location number, becoming a message number */
RSPEAK(game.newloc - 500);
game.newloc = game.loc;
msg = arbitrary_messages[PITCH_DARK];
}
if (TOTING(BEAR))RSPEAK(TAME_BEAR);
- newspeak(msg);
+ speak(msg);
if (FORCED(game.loc)) {
if (playermove(cmdin, verb, 1))
return true;
game.foobar = (game.foobar > 0 ? -game.foobar : 0);
++game.turns;
if (game.turns == game.thresh) {
- newspeak(turn_threshold_messages[game.trndex]);
+ speak(turn_threshold_messages[game.trndex]);
game.trnluz = game.trnluz + TRNVAL[game.trndex] / 100000;
++game.trndex;
game.thresh = -1;
case GO_DWARFWAKE:
/* Oh dear, he's disturbed the dwarves. */
RSPEAK(DWARVES_AWAKEN);
- score(endgame);
- return true;
+ terminate(endgame);
default:
BUG(99);
}