X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=b991117222a3ccd9e4dd4263ae7b1ec8610aad2e;hb=037f1df7dd8faf29622654ec4a79c2437b927b28;hp=4d5dd31cc4eb50d29abde887c9e20d67b56864fa;hpb=9bac28878d14fc8eebc1cc654586f689dfa3a06d;p=open-adventure.git diff --git a/misc.c b/misc.c index 4d5dd31..b991117 100644 --- a/misc.c +++ b/misc.c @@ -194,8 +194,7 @@ bool GETIN(FILE *input, for (;;) { if (game.blklin) TYPE0(); - MAPLIN(input); - if (feof(input)) + if (!MAPLIN(input)) return false; *pword1=GETTXT(true,true,true); if (game.blklin && *pword1 < 0) @@ -701,7 +700,7 @@ void BUG(long num) /* Machine dependent routines (MAPLIN, TYPE, SAVEIO) */ -void MAPLIN(FILE *fp) +bool MAPLIN(FILE *fp) { long i, val; @@ -739,6 +738,7 @@ void MAPLIN(FILE *fp) if (feof(fp)) { if (logfp && fp == stdin) fclose(logfp); + return false; } else { if (logfp && fp == stdin) IGNORE(fputs(rawbuf, logfp)); @@ -753,6 +753,7 @@ void MAPLIN(FILE *fp) LNLENG=i; } LNPOSN=1; + return true; } }