X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=61a2267a59b183f6879f132c9001493938888111;hb=c83df10dc62412a57dc4342a0c1d22ffa048246c;hp=6ad7c3669289b77ced08c8efae7f07e41c676071;hpb=3001fb1dc1761502f875bb266706a311ee5ff24f;p=open-adventure.git diff --git a/main.c b/main.c index 6ad7c36..61a2267 100644 --- a/main.c +++ b/main.c @@ -13,7 +13,7 @@ * and for the offensive globals. Applying the Structured Program * Theorem can be hard. */ -#define DEFINE_GLOBALS_FROM_INCLUDES + #include #include #include @@ -29,9 +29,6 @@ struct game_t game; -long LNLENG, LNPOSN; -char rawbuf[LINESIZE], INLINE[LINESIZE + 1]; - FILE *logfp = NULL, *rfp = NULL; bool oldstyle = false; bool editline = true; @@ -45,7 +42,7 @@ static void sig_handler(int signo) if (logfp != NULL) fflush(logfp); } - exit(0); + exit(EXIT_FAILURE); } // LCOV_EXCL_STOP @@ -116,7 +113,7 @@ int main(int argc, char *argv[]) #endif fprintf(stderr, " -s suppress command editing\n"); - exit(-1); + exit(EXIT_FAILURE); break; } } @@ -425,7 +422,8 @@ static bool dwarfmove(void) game.odloc[i] = game.dloc[i]; game.dloc[i] = tk[j]; game.dseen[i] = (game.dseen[i] && INDEEP(game.loc)) || (game.dloc[i] == game.loc || game.odloc[i] == game.loc); - if (!game.dseen[i]) continue; + if (!game.dseen[i]) + continue; game.dloc[i] = game.loc; if (spotted_by_pirate(i)) continue; @@ -448,7 +446,8 @@ static bool dwarfmove(void) rspeak(game.dtotal == 1 ? DWARF_SINGLE : DWARF_PACK, game.dtotal); if (attack == 0) return true; - if (game.dflag == 2)game.dflag = 3; + if (game.dflag == 2) + game.dflag = 3; if (attack > 1) { rspeak(THROWN_KNIVES, attack); rspeak(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT), stick); @@ -519,7 +518,7 @@ static void croak(void) * him, so we need game.oldlc2, which is the last place he was * safe.) */ -static bool playermove(token_t verb, int motion) +static bool playermove( int motion) { int scratchloc, travel_entry = tkey[game.loc]; game.newloc = game.loc; @@ -596,17 +595,21 @@ static bool playermove(token_t verb, int motion) if (T_TERMINATE(travel[travel_entry]) || travel[travel_entry].motion == motion) break; if (travel[travel_entry].stop) { - /* FIXME: Magic numbers! */ /* Couldn't find an entry matching the motion word passed * in. Various messages depending on word given. */ int spk = CANT_APPLY; - if (motion >= 43 && motion <= 50)spk = BAD_DIRECTION; - 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 == INVENTORY)spk = NEARBY; - if (motion == 62 || motion == 65)spk = NOTHING_HAPPENS; - if (motion == 17)spk = WHICH_WAY; + if (motion >= EAST && motion <= NW) + spk = BAD_DIRECTION; + if (motion == UP || motion == DOWN) + spk = BAD_DIRECTION; + if (motion == FORWARD || motion == LEFT || motion == RIGHT) + spk = UNSURE_FACING; + if (motion == OUTSIDE || motion == INSIDE) + spk = NO_INOUT_HERE; + if (motion == XYZZY || motion == PLUGH) + spk = NOTHING_HAPPENS; + if (motion == CRAWL) + spk = WHICH_WAY; rspeak(spk); return true; } @@ -710,8 +713,10 @@ static bool playermove(token_t verb, int motion) return true; } else { game.newloc = objects[TROLL].plac + objects[TROLL].fixd - game.loc; - if (game.prop[TROLL] == 0)game.prop[TROLL] = 1; - if (!TOTING(BEAR)) return true; + if (game.prop[TROLL] == 0) + game.prop[TROLL] = 1; + if (!TOTING(BEAR)) + return true; rspeak(BRIDGE_COLLAPSE); game.prop[CHASM] = 1; game.prop[TROLL] = 2; @@ -872,7 +877,8 @@ static void lampcheck(void) if (!game.lmwarn && HERE(LAMP)) { game.lmwarn = true; int spk = GET_BATTERIES; - if (game.place[BATTERY] == LOC_NOWHERE)spk = LAMP_DIM; + if (game.place[BATTERY] == LOC_NOWHERE) + spk = LAMP_DIM; if (game.prop[BATTERY] == DEAD_BATTERIES) spk = MISSING_BATTERIES; rspeak(spk); @@ -893,7 +899,8 @@ static void listobjects(void) ++game.abbrev[game.loc]; for (int i = game.atloc[game.loc]; i != 0; i = game.link[i]) { long obj = i; - if (obj > NOBJECTS)obj = obj - NOBJECTS; + if (obj > NOBJECTS) + obj = obj - NOBJECTS; if (obj == STEPS && TOTING(NUGGET)) continue; if (game.prop[obj] < 0) { @@ -939,7 +946,8 @@ static bool do_command() if (OUTSID(game.newloc) && game.newloc != 0 && game.closng) { rspeak(EXIT_CLOSED); game.newloc = game.loc; - if (!game.panic)game.clock2 = PANICTIME; + if (!game.panic) + game.clock2 = PANICTIME; game.panic = true; } @@ -980,10 +988,11 @@ static bool do_command() } msg = arbitrary_messages[PITCH_DARK]; } - if (TOTING(BEAR))rspeak(TAME_BEAR); + if (TOTING(BEAR)) + rspeak(TAME_BEAR); speak(msg); if (FORCED(game.loc)) { - if (playermove(command.verb, 1)) + if (playermove(HERE)) return true; else continue; /* back to top of main interpreter loop */ @@ -1020,6 +1029,8 @@ L2600: /* This is where we get a new command from the user */ char* input; + char inputbuf[LINESIZE]; + for (;;) { input = get_input(); if (input == NULL) @@ -1031,8 +1042,12 @@ L2600: if (strcmp(input, "") != 0) break; } + + strncpy(inputbuf, input, LINESIZE - 1); + linenoiseFree(input); + long tokens[4]; - tokenize(input, tokens); + tokenize(inputbuf, tokens); command.wd1 = tokens[0]; command.wd1x = tokens[1]; command.wd2 = tokens[2]; @@ -1109,7 +1124,7 @@ Lookup: defn = get_vocab_id(word1); if (defn == -1) { /* Gee, I don't understand. */ - if (fallback_handler(input)) + if (fallback_handler(inputbuf)) continue; rspeak(DONT_KNOW, command.wd1, command.wd1x); goto L2600; @@ -1117,7 +1132,7 @@ Lookup: kmod = MOD(defn, 1000); switch (defn / 1000) { case 0: - if (playermove(command.verb, kmod)) + if (playermove(kmod)) return true; else continue; /* back to top of main interpreter loop */ @@ -1141,7 +1156,7 @@ Laction: case GO_TERMINATE: return true; case GO_MOVE: - playermove(command.verb, NUL); + playermove(NUL); return true; case GO_TOP: continue; /* back to top of main interpreter loop */ @@ -1172,7 +1187,6 @@ Laction: default: BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE } - linenoiseFree(input); } }