X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=8f98db577ec1d199292cbb5649149392878ceacf;hb=d96d5db51fd1ed0040bdbca514441a4628814aff;hp=3d3a8fb705851a3ac0b54efb9edfea7f1087631e;hpb=ceb5c27218469fd3732cf6a9ed16d0a2c4e682df;p=open-adventure.git diff --git a/main.c b/main.c index 3d3a8fb..8f98db5 100644 --- a/main.c +++ b/main.c @@ -37,6 +37,8 @@ bool oldstyle = false; bool editline = true; bool prompt = true; +// LCOV_EXCL_START +// exclude from coverage analysis because it requires interactivity to test static void sig_handler(int signo) { if (signo == SIGINT) { @@ -45,6 +47,7 @@ static void sig_handler(int signo) } exit(0); } +// LCOV_EXCL_STOP /* * MAIN PROGRAM @@ -247,7 +250,7 @@ static void checkhints(void) game.hintlc[hint] = 0; return; default: - BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); + BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE break; } @@ -521,7 +524,7 @@ static bool playermove(token_t verb, int motion) int scratchloc, k2, kk = tkey[game.loc]; game.newloc = game.loc; if (kk == 0) - BUG(LOCATION_HAS_NO_TRAVEL_ENTRIES); + BUG(LOCATION_HAS_NO_TRAVEL_ENTRIES); // LCOV_EXCL_LINE if (motion == NUL) return true; else if (motion == BACK) { @@ -598,7 +601,7 @@ static bool playermove(token_t verb, int motion) if (motion == 29 || motion == 30)spk = BAD_DIRECTION; if (motion == 7 || motion == 36 || motion == 37)spk = UNSURE_FACING; if (motion == 11 || motion == 19)spk = NO_INOUT_HERE; - if (verb == FIND || verb == INVENT)spk = NEARBY; + if (verb == FIND || verb == INVENTORY)spk = NEARBY; if (motion == 62 || motion == 65)spk = NOTHING_HAPPENS; if (motion == 17)spk = WHICH_WAY; rspeak(spk); @@ -637,7 +640,7 @@ static bool playermove(token_t verb, int motion) break; do { if (travel[kk].stop) - BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); + BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE ++kk; game.newloc = T_HIGH(travel[kk]); } while @@ -678,7 +681,7 @@ static bool playermove(token_t verb, int motion) drop(EMERALD, game.loc); do { if (travel[kk].stop) - BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); + BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE ++kk; game.newloc = T_HIGH(travel[kk]); } while @@ -714,13 +717,13 @@ static bool playermove(token_t verb, int motion) game.prop[TROLL] = 2; drop(BEAR, game.newloc); game.fixed[BEAR] = -1; - game.prop[BEAR] = 3; + game.prop[BEAR] = BEAR_DEAD; game.oldlc2 = game.newloc; croak(); return true; } default: - BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST); + BUG(SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE } } break; /* Leave L12 loop */ @@ -777,7 +780,8 @@ static bool closecheck(void) move(TROLL2, objects[TROLL].plac); move(TROLL2 + NOBJECTS, objects[TROLL].fixd); juggle(CHASM); - if (game.prop[BEAR] != 3)DESTROY(BEAR); + if (game.prop[BEAR] != BEAR_DEAD) + DESTROY(BEAR); game.prop[CHAIN] = 0; game.fixed[CHAIN] = 0; game.prop[AXE] = 0; @@ -1110,7 +1114,7 @@ Lookup: rspeak(kmod); goto L2012; default: - BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); + BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE } Laction: @@ -1147,7 +1151,7 @@ Laction: rspeak(DWARVES_AWAKEN); terminate(endgame); default: - BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); + BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE } } }