X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=15e723086487d0cebcf23de6c84653ef274c45d1;hp=1db050f91583e7f42bfcbb2ff9ce440c1aefc0a7;hb=9714c9fc2a9a81436bd654427b7e681ec43dd4ff;hpb=a678b68b39f21f8b2853e45c6138d815a82a3423 diff --git a/main.c b/main.c index 1db050f..15e7230 100644 --- a/main.c +++ b/main.c @@ -115,15 +115,15 @@ int main(int argc, char *argv[]) fprintf(stderr, usage, argv[0]); fprintf(stderr, - " where -l creates a log file of your game named as specified'\n"); + " -l create a log file of your game named as specified'\n"); fprintf(stderr, " -o 'oldstyle' (no prompt, no command editing, displays 'Initialising...')\n"); #ifndef ADVENT_NOSAVE fprintf(stderr, - " -r indicates restoring from specified saved game file\n"); + " -r restore from specified saved game file\n"); #endif fprintf(stderr, - " -s indicates playing with command editing suppressed\n"); + " -s suppress command editing\n"); exit(-1); break; } @@ -184,11 +184,9 @@ static bool fallback_handler(char *buf) return false; } -/* Check if this loc is eligible for any hints. If been here - * long enough, branch to help section (on later page). Hints - * all come back here eventually to finish the loop. Ignore - * "HINTS" < 4 (special stuff, see database notes). - */ +/* Check if this loc is eligible for any hints. If been here long + * enough, display. Ignore "HINTS" < 4 (special stuff, see database + * notes). */ static void checkhints(void) { if (COND[game.loc] >= game.conds) { @@ -457,12 +455,15 @@ static bool dwarfmove(void) if (attack == 0) return true; if (game.dflag == 2)game.dflag = 3; - SETPRM(1, attack, 0); - int k = 6; - if (attack > 1)k = THROWN_KNIVES; - RSPEAK(k); - SETPRM(1, stick, 0); - RSPEAK(k + 1 + 2 / (1 + stick)); /* FIXME: Arithmetic on message number */ + if (attack > 1){ + SETPRM(1, attack, 0); + RSPEAK(THROWN_KNIVES); + SETPRM(1, stick, 0); + RSPEAK(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT)); + } else { + RSPEAK(KNIFE_THROWN); + RSPEAK(MISSES_YOU); + } if (stick == 0) return true; game.oldlc2 = game.loc; @@ -847,12 +848,11 @@ static void lampcheck(void) --game.limit; /* Another way we can force an end to things is by having the - * lamp give out. When it gets close, we come here to warn - * him. First following ar, if the lamp and fresh batteries are + * lamp give out. When it gets close, we come here to warn him. + * First following arm checks if the lamp and fresh batteries are * here, in which case we replace the batteries and continue. - * Second is for other cases of lamp dying. 12400 is when it - * goes out. Even then, he can explore outside for a while - * if desired. */ + * Second is for other cases of lamp dying. Eve after it goes + * out, he can explore outside for a while if desired. */ if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == 0 && HERE(LAMP)) { RSPEAK(REPLACE_BATTERIES); game.prop[BATTERY] = 1; @@ -925,11 +925,11 @@ static void listobjects(void) static bool do_command(FILE *cmdin) /* Get and execute a command */ { - long verb = 0, V1, V2; + long V1, V2; long kmod, defn; static long igo = 0; - static long obj = 0; - enum speechpart part; + static struct command_t command; + command.verb = 0; /* Can't leave cave once it's closing (except by main office). */ if (OUTSID(game.newloc) && game.newloc != 0 && game.closng) { @@ -979,7 +979,7 @@ static bool do_command(FILE *cmdin) if (TOTING(BEAR))RSPEAK(TAME_BEAR); speak(msg); if (FORCED(game.loc)) { - if (playermove(verb, 1)) + if (playermove(command.verb, 1)) return true; else continue; /* back to top of main interpreter loop */ @@ -990,9 +990,9 @@ static bool do_command(FILE *cmdin) listobjects(); L2012: - verb = 0; - game.oldobj = obj; - obj = 0; + command.verb = 0; + game.oldobj = command.obj; + command.obj = 0; L2600: checkhints(); @@ -1024,18 +1024,22 @@ L2600: L2607: game.foobar = (game.foobar > 0 ? -game.foobar : 0); ++game.turns; - if (game.turns == game.thresh) { - speak(turn_threshold_messages[game.trndex]); - game.trnluz = game.trnluz + TRNVAL[game.trndex] / 100000; - ++game.trndex; - game.thresh = -1; - if (game.trndex <= TRNVLS) - game.thresh = MOD(TRNVAL[game.trndex], 100000) + 1; - } - if (verb == SAY && WD2 > 0) - verb = 0; - if (verb == SAY) { - part = transitive; + + /* If a turn threshold has been met, apply penalties and tell + * the player about it. */ + for (int i = 0; i < turn_threshold_count; ++i) + { + if (game.turns == turn_thresholds[i].threshold + 1) + { + game.trnluz += turn_thresholds[i].point_loss; + speak(turn_thresholds[i].message); + } + } + + if (command.verb == SAY && WD2 > 0) + command.verb = 0; + if (command.verb == SAY) { + command.part = transitive; goto Laction; } if (closecheck()) { @@ -1091,17 +1095,17 @@ Lookup: kmod = MOD(defn, 1000); switch (defn / 1000) { case 0: - if (playermove(verb, kmod)) + if (playermove(command.verb, kmod)) return true; else continue; /* back to top of main interpreter loop */ case 1: - part = unknown; - obj = kmod; + command.part = unknown; + command.obj = kmod; break; case 2: - part = intransitive; - verb = kmod; + command.part = intransitive; + command.verb = kmod; break; case 3: RSPEAK(kmod); @@ -1111,11 +1115,11 @@ Lookup: } Laction: - switch (action(cmdin, part, verb, obj)) { + switch (action(cmdin, command)) { case GO_TERMINATE: return true; case GO_MOVE: - playermove(verb, NUL); + playermove(command.verb, NUL); return true; case GO_TOP: continue; /* back to top of main interpreter loop */ @@ -1138,7 +1142,7 @@ Laction: * (see attack()). */ SETPRM(1, WD1, WD1X); RSPEAK(DO_WHAT); - obj = 0; + command.obj = 0; goto L2600; case GO_DWARFWAKE: /* Oh dear, he's disturbed the dwarves. */