X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=e9b5c84e18c083819f1f9bca8ad67e5f9c34e94b;hb=1329da1087dd91d0b4d1a7e0a63f9a669ec57d8c;hp=16c6a78d6b30e02d599cba31bafb7caaf90c2a95;hpb=fb93f9d67e2b5146bd65a670fa210ff77917f635;p=open-adventure.git diff --git a/misc.c b/misc.c index 16c6a78..e9b5c84 100644 --- a/misc.c +++ b/misc.c @@ -10,17 +10,6 @@ #include "linenoise/linenoise.h" #include "newdb.h" -void* xmalloc(size_t size) -{ - void* ptr = malloc(size); - if (ptr == NULL) - { - fprintf(stderr, "Out of memory!\n"); - exit(EXIT_FAILURE); - } - return(ptr); -} - char* xstrdup(const char* s) { char* ptr = strdup(s); @@ -38,7 +27,7 @@ void packed_to_token(long packed, char token[6]) for (int i = 0; i < 5; ++i) { char advent = (packed >> i * 6) & 63; - token[4 - i] = advent_to_ascii[advent]; + token[4 - i] = advent_to_ascii[(int) advent]; } // Ensure the last character is \0. @@ -78,7 +67,7 @@ void newspeak(char* msg) // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s. int pi = 0; // parameter index - for (int i = 0; i < strlen(msg); ++i) + for (int i = 0; i < (int)strlen(msg); ++i) { if (msg[i] == '%') { @@ -116,9 +105,9 @@ void newspeak(char* msg) { copy[i + 1] = 's'; packed_to_token(PARMS[pi], parameters[pi]); - for (int i = 0; i < strlen(parameters[pi]); ++i) + for (int j = 0; j < (int)strlen(parameters[pi]); ++j) { - parameters[pi][i] = tolower(parameters[pi][i]); + parameters[pi][j] = tolower(parameters[pi][j]); } } @@ -127,9 +116,9 @@ void newspeak(char* msg) { copy[i + 1] = 's'; packed_to_token(PARMS[pi], parameters[pi]); - for (int i = 0; i < strlen(parameters[pi]); ++i) + for (int j = 0; j < (int)strlen(parameters[pi]); ++j) { - parameters[pi][i] = tolower(parameters[pi][i]); + parameters[pi][j] = tolower(parameters[pi][j]); } parameters[pi][0] = toupper(parameters[pi][0]); } @@ -207,7 +196,7 @@ bool GETIN(FILE *input, (junk > 0); if (GETTXT(true,true,true) <= 0) return true; - RSPEAK(53); + RSPEAK(TWO_WORDS); } } @@ -228,7 +217,7 @@ long YES(FILE *input, vocab_t x, vocab_t y, vocab_t z) RSPEAK(z); return false; } - RSPEAK(185); + RSPEAK(PLEASE_ANSWER); } } @@ -327,16 +316,16 @@ long VOCAB(long id, long init) * (Thus "STEPS", which is a motion verb as well as an object, may be located * as an object.) And it also means the KTAB value is taken modulo 1000. */ { - long i, lexeme; + long lexeme; - for (i=1; i<=TABSIZ; i++) { + for (long i=1; i<=TABSIZ; i++) { if (KTAB[i] == -1) { lexeme= -1; if (init < 0) return(lexeme); BUG(5); } - if (init >= 0 && KTAB[i]/1000 != init) + if (init >= 0 && KTAB[i]/1000 != init) continue; if (ATAB[i] == id) { lexeme=KTAB[i]; @@ -378,7 +367,7 @@ void MOVE(long object, long where) from=game.fixed[object-NOBJECTS]; else from=game.place[object]; - if (from > 0 && from <= 300) + if (from != NOWHERE && from != CARRIED && !SPECIAL(from)) CARRY(object,from); DROP(object,where); } @@ -399,9 +388,9 @@ void CARRY(long object, long where) long temp; if (object <= NOBJECTS) { - if (game.place[object] == -1) + if (game.place[object] == CARRIED) return; - game.place[object]= -1; + game.place[object] = CARRIED; ++game.holdng; } if (game.atloc[where] == object) { @@ -423,7 +412,7 @@ void DROP(long object, long where) game.fixed[object-NOBJECTS] = where; else { - if (game.place[object] == -1) + if (game.place[object] == CARRIED) --game.holdng; game.place[object] = where; } @@ -438,13 +427,13 @@ long ATDWRF(long where) * there (or if dwarves not active yet), -1 if all dwarves are dead. Ignore * the pirate (6th dwarf). */ { - long at, i; + long at; at =0; if (game.dflag < 2) return(at); at = -1; - for (i=1; i<=NDWARVES-1; i++) { + for (long i=1; i<=NDWARVES-1; i++) { if (game.dloc[i] == where) return i; if (game.dloc[i] != 0) @@ -471,21 +460,21 @@ bool TSTBIT(long mask, int bit) void set_seed(long seedval) /* Set the LCG seed */ { - lcgstate.x = (unsigned long) seedval % lcgstate.m; + game.lcg_x = (unsigned long) seedval % game.lcg_m; } unsigned long get_next_lcg_value(void) /* Return the LCG's current value, and then iterate it. */ { - unsigned long old_x = lcgstate.x; - lcgstate.x = (lcgstate.a * lcgstate.x + lcgstate.c) % lcgstate.m; + unsigned long old_x = game.lcg_x; + game.lcg_x = (game.lcg_a * game.lcg_x + game.lcg_c) % game.lcg_m; return old_x; } long randrange(long range) /* Return a random integer from [0, range). */ { - return range * get_next_lcg_value() / lcgstate.m; + return range * get_next_lcg_value() / game.lcg_m; } long RNDVOC(long second, long force) @@ -552,34 +541,29 @@ void BUG(long num) bool MAPLIN(FILE *fp) { - long i, val; bool eof; - /* Read a line of input, from the specified input source, - * translate the chars to integers in the range 0-126 and store - * them in the common array "INLINE". Integer values are as follows: - * 0 = space [ASCII CODE 40 octal, 32 decimal] - * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal] - * 3-10 = '()*+,-. [ASCII 47-56 octal, 39-46 decimal] - * 11-36 = upper-case letters - * 37-62 = lower-case letters - * 63 = percent (%) [ASCII 45 octal, 37 decimal] - * 64-73 = digits, 0 through 9 - * Remaining characters can be translated any way that is convenient; - * The "TYPE" routine below is used to map them back to characters when - * necessary. The above mappings are required so that certain special - * characters are known to fit in 6 bits and/or can be easily spotted. - * Array elements beyond the end of the line should be filled with 0, - * and LNLENG should be set to the index of the last character. + /* Read a line of input, from the specified input source. + * This logic is complicated partly because it has to serve + * several cases with different requirements and partly because + * of a quirk in linenoise(). * - * If the data file uses a character other than space (e.g., tab) to - * separate numbers, that character should also translate to 0. + * The quirk shows up when you paste a test log from the clipboard + * to the program's command prompt. While fgets (as expected) + * consumes it a line at a time, linenoise() returns the first + * line and discards the rest. Thus, there needs to be an + * editline (-s) option to fall back to fgets while still + * prompting. Note that linenoise does behave properly when + * fed redirected stdin. * - * This procedure may use the map1,map2 arrays to maintain static data for - * the mapping. MAP2(1) is set to 0 when the program starts - * and is not changed thereafter unless the routines on this page choose - * to do so. */ - + * The logging is a bit of a mess because there are two distinct cases + * in which you want to echo commands. One is when shipping them to + * a log under the -l option, in which case you want to suppress + * prompt generation (so test logs are unadorned command sequences). + * On the other hand, if you redirected stdin and are feeding the program + * a logfile, you *do* want prompt generation - it makes checkfiles + * easier to read when the commands are marked by a preceding prompt. + */ do { if (!editline) { if (prompt) @@ -592,7 +576,7 @@ bool MAPLIN(FILE *fp) if (!eof) { strncpy(rawbuf, cp, sizeof(rawbuf)-1); linenoiseHistoryAdd(rawbuf); - strncat(rawbuf, "\n", sizeof(rawbuf)-1); + strncat(rawbuf, "\n", sizeof(rawbuf) - strlen(rawbuf) - 1); linenoiseFree(cp); } } @@ -610,14 +594,37 @@ bool MAPLIN(FILE *fp) efp = stdout; if (efp != NULL) { - if (prompt) + if (prompt && efp == stdout) fputs("> ", efp); IGNORE(fputs(rawbuf, efp)); } strcpy(INLINE+1, rawbuf); + /* translate the chars to integers in the range 0-126 and store + * them in the common array "INLINE". Integer values are as follows: + * 0 = space [ASCII CODE 40 octal, 32 decimal] + * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal] + * 3-10 = '()*+,-. [ASCII 47-56 octal, 39-46 decimal] + * 11-36 = upper-case letters + * 37-62 = lower-case letters + * 63 = percent (%) [ASCII 45 octal, 37 decimal] + * 64-73 = digits, 0 through 9 + * Remaining characters can be translated any way that is convenient; + * The "TYPE" routine below is used to map them back to characters when + * necessary. The above mappings are required so that certain special + * characters are known to fit in 6 bits and/or can be easily spotted. + * Array elements beyond the end of the line should be filled with 0, + * and LNLENG should be set to the index of the last character. + * + * If the data file uses a character other than space (e.g., tab) to + * separate numbers, that character should also translate to 0. + * + * This procedure may use the map1,map2 arrays to maintain static data for + * the mapping. MAP2(1) is set to 0 when the program starts + * and is not changed thereafter unless the routines on this page choose + * to do so. */ LNLENG=0; - for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) { - val=INLINE[i]; + for (long i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) { + long val=INLINE[i]; INLINE[i]=ascii_to_advent[val]; if (INLINE[i] != 0) LNLENG=i; @@ -640,7 +647,7 @@ void TYPE(void) } for (i=1; i<=LNLENG; i++) { - INLINE[i]=advent_to_ascii[INLINE[i]]; + INLINE[i]=advent_to_ascii[(int) INLINE[i]]; } INLINE[LNLENG+1]=0; printf("%s\n", INLINE+1);