X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=1938d24be054ce6c904e8d0d7247013f23e39c70;hb=83330fc0fd58d4ed12e6aca99bcc761bb2346011;hp=cbf73f27417b1535dac27c6558ba7a73fea17bdb;hpb=937714f31de5309ce951bfc8eff9f2bd8ecdbb69;p=open-adventure.git diff --git a/actions.c b/actions.c index cbf73f2..1938d24 100644 --- a/actions.c +++ b/actions.c @@ -176,7 +176,7 @@ static void blast(void) if (HERE(ROD2)) game.bonus = SPLATTER_MESSAGE; RSPEAK(game.bonus); - score(endgame); + terminate(endgame); } } @@ -793,7 +793,7 @@ static int quit(FILE *input) /* Quit. Intransitive only. Verify intent and exit if that's what he wants. */ { if (YES(input, REALLY_QUIT, OK_MAN, OK_MAN)) - score(quitgame); + terminate(quitgame); return GO_CLEAROBJ; } @@ -950,13 +950,6 @@ static int throw (FILE *cmdin, long verb, token_t obj) return throw_support((++game.dkill == 1) ? DWARF_SMOKE : KILLED_DWARF); } -static int vscore(void) -/* Score. Call scoring routine but tell it to return. */ -{ - score(scoregame); - return GO_CLEAROBJ; -} - static int wake(token_t verb, token_t obj) /* Wake. Only use is to disturb the dwarves. */ { @@ -1120,7 +1113,8 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj) blast(); return GO_CLEAROBJ; case 23: /* SCOR */ - return vscore(); + score(scoregame); + return GO_CLEAROBJ; case 24: /* FOO */ return bigwords(WD1); case 25: /* BRIEF */