X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=ea9bf8fcb49dcdd370c044f334aa8751f4b2ade0;hp=5bf7d9522a57e8d4c360a12791f3388c2fb0164f;hb=039c06882ea0631ca918424b66473bc545b60a99;hpb=8c6593ad0c06b58c2343869b7e1394645caa474a diff --git a/main.c b/main.c index 5bf7d95..ea9bf8f 100644 --- a/main.c +++ b/main.c @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) } /* Initialize game variables */ - long seedval = initialise(); + int seedval = initialise(); #ifndef ADVENT_NOSAVE if (!rfp) { @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) #endif if (settings.logfp) - fprintf(settings.logfp, "seed %ld\n", seedval); + fprintf(settings.logfp, "seed %d\n", seedval); /* interpret commands until EOF or interrupt */ for (;;) { @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) terminate(quitgame); } -/* Check if this loc is eligible for any hints. If been here long +/* Check if this loc is eligible for any hints. If been here int * enough, display. Ignore "HINTS" < 4 (special stuff, see database * notes). */ static void checkhints(void) @@ -141,7 +141,7 @@ static void checkhints(void) if (!CNDBIT(game.loc, hint + 1 + COND_HBASE)) game.hintlc[hint] = -1; ++game.hintlc[hint]; - /* Come here if he's been long enough at required loc(s) for some + /* Come here if he's been int enough at required loc(s) for some * unused hint. */ if (game.hintlc[hint] >= hints[hint].turns) { int i; @@ -653,8 +653,8 @@ static void playermove(int motion) for (;;) { /* L12 loop */ for (;;) { enum condtype_t condtype = travel[travel_entry].condtype; - long condarg1 = travel[travel_entry].condarg1; - long condarg2 = travel[travel_entry].condarg2; + int condarg1 = travel[travel_entry].condarg1; + int condarg2 = travel[travel_entry].condarg2; if (condtype < cond_not) { /* YAML N and [pct N] conditionals */ if (condtype == cond_goto || condtype == cond_pct) { @@ -1212,7 +1212,7 @@ static bool do_command() clear_command(&command); continue; } - break; + break;// LCOV_EXCL_LINE default: // LCOV_EXCL_LINE BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE }