X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=09244625cfe0c536bb866fcf17eccf21356d5e48;hp=d097bad0a0b4e82c26c41ce1171e99541eb6b15a;hb=67ed99b29cfe5c32b3db72091de3fb174195e032;hpb=04eca720d9a5282b47f51c5d19910a094f3d1882 diff --git a/misc.c b/misc.c index d097bad..0924462 100644 --- a/misc.c +++ b/misc.c @@ -12,13 +12,12 @@ void* xmalloc(size_t size) { - void* ptr = malloc(size); - if (ptr == NULL) - { - fprintf(stderr, "Out of memory!\n"); - exit(EXIT_FAILURE); + void* ptr = malloc(size); + if (ptr == NULL) { + fprintf(stderr, "Out of memory!\n"); + exit(EXIT_FAILURE); } - return(ptr); + return (ptr); } char* xstrdup(const char* s) @@ -51,6 +50,35 @@ void packed_to_token(long packed, char token[6]) } } +void token_to_packed(char token[6], long* packed) +{ + *packed = 0; + for (size_t i = 0; i < 5; ++i) + { + if (token[4 - i] == '\0') + continue; + char mapped = ascii_to_advent[(int) token[4 - i]]; + *packed |= (mapped << (6 * i)); + } +} + +/* Hide the fact that wods are corrently packed longs */ + +bool wordeq(token_t a, token_t b) +{ + return a == b; +} + +bool wordempty(token_t a) +{ + return a == 0; +} + +void wordclear(token_t *v) +{ + *v = 0; +} + /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ void speak(const char* msg) @@ -198,101 +226,101 @@ bool GETIN(FILE *input, void echo_input(FILE* destination, char* input_prompt, char* input) { - size_t len = strlen(input_prompt) + strlen(input) + 1; - char* prompt_and_input = (char*) xmalloc(len); - strcpy(prompt_and_input, input_prompt); - strcat(prompt_and_input, input); - fprintf(destination, "%s\n", prompt_and_input); - free(prompt_and_input); + size_t len = strlen(input_prompt) + strlen(input) + 1; + char* prompt_and_input = (char*) xmalloc(len); + strcpy(prompt_and_input, input_prompt); + strcat(prompt_and_input, input); + fprintf(destination, "%s\n", prompt_and_input); + free(prompt_and_input); } char* get_input() -{ - // Set up the prompt - char input_prompt[] = "> "; - if (!prompt) - input_prompt[0] = '\0'; - - // Print a blank line if game.blklin tells us to. - if (game.blklin == true) - printf("\n"); - - char* input; - while (true) - { - if (editline) - input = linenoise(input_prompt); - else - { - input = NULL; - size_t n = 0; - if (isatty(0)) - printf("%s", input_prompt); - IGNORE(getline(&input, &n, stdin)); - } - - if (input == NULL) // Got EOF; quit. - exit(EXIT_SUCCESS); - else if (input[0] == '#') // Ignore comments. - continue; - else // We have a 'normal' line; leave the loop. - break; +{ + // Set up the prompt + char input_prompt[] = "> "; + if (!prompt) + input_prompt[0] = '\0'; + + // Print a blank line if game.blklin tells us to. + if (game.blklin == true) + printf("\n"); + + char* input; + while (true) { + if (editline) + input = linenoise(input_prompt); + else { + input = NULL; + size_t n = 0; + if (isatty(0)) + printf("%s", input_prompt); + IGNORE(getline(&input, &n, stdin)); + } + + if (input == NULL) // Got EOF; return with it. + return(input); + else if (input[0] == '#') // Ignore comments. + continue; + else // We have a 'normal' line; leave the loop. + break; } - // Strip trailing newlines from the input - input[strcspn(input, "\n")] = 0; + // Strip trailing newlines from the input + input[strcspn(input, "\n")] = 0; - linenoiseHistoryAdd(input); + linenoiseHistoryAdd(input); - if (!isatty(0)) - echo_input(stdout, input_prompt, input); + if (!isatty(0)) + echo_input(stdout, input_prompt, input); - if (logfp) - echo_input(logfp, input_prompt, input); - - return(input); + if (logfp) + echo_input(logfp, input_prompt, input); + + return (input); } -bool YES(vocab_t question, vocab_t yes_response, vocab_t no_response) +bool YES(const char* question, const char* yes_response, const char* no_response) /* Print message X, wait for yes/no answer. If yes, print Y and return true; * if no, print Z and return false. */ { char* reply; bool outcome; - + for (;;) { - RSPEAK(question); - - reply = get_input(); - - char* firstword = (char*) xmalloc(strlen(reply)); - sscanf(reply, "%s", firstword); - - for (int i = 0; i < (int)strlen(firstword); ++i) - firstword[i] = tolower(firstword[i]); - - int yes = strncmp("yes", firstword, sizeof("yes") - 1); - int y = strncmp("y", firstword, sizeof("y") - 1); - int no = strncmp("no", firstword, sizeof("no") - 1); - int n = strncmp("n", firstword, sizeof("n") - 1); - - free(firstword); - - if (yes == 0 || y == 0) { - RSPEAK(yes_response); - outcome = true; - break; - } - else if (no == 0 || n == 0) { - RSPEAK(no_response); - outcome = false; - break; + speak(question); + + reply = get_input(); + if (reply == NULL) { + linenoiseFree(reply); + exit(EXIT_SUCCESS); } - else - RSPEAK(PLEASE_ANSWER); + + char* firstword = (char*) xmalloc(strlen(reply)+1); + sscanf(reply, "%s", firstword); + + for (int i = 0; i < (int)strlen(firstword); ++i) + firstword[i] = tolower(firstword[i]); + + int yes = strncmp("yes", firstword, sizeof("yes") - 1); + int y = strncmp("y", firstword, sizeof("y") - 1); + int no = strncmp("no", firstword, sizeof("no") - 1); + int n = strncmp("n", firstword, sizeof("n") - 1); + + free(firstword); + + if (yes == 0 || y == 0) { + speak(yes_response); + outcome = true; + break; + } else if (no == 0 || n == 0) { + speak(no_response); + outcome = false; + break; + } else + RSPEAK(PLEASE_ANSWER); } linenoiseFree(reply); - return(outcome); + return (outcome); } /* Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT) */ @@ -422,7 +450,7 @@ void MOVE(long object, long where) from = game.fixed[object - NOBJECTS]; else from = game.place[object]; - if (from != NOWHERE && from != CARRIED && !SPECIAL(from)) + if (from != LOC_NOWHERE && from != CARRIED && !SPECIAL(from)) CARRY(object, from); DROP(object, where); } @@ -639,10 +667,10 @@ bool MAPLIN(FILE *fp) * 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. */ + * This procedure may use the map1,map2 arrays to maintain + * static data for he mapping. MAP2(1) is set to 0 when the + * program starts and is not changed thereafter unless the + * routines in this module choose to do so. */ LNLENG = 0; for (long i = 1; i <= (long)sizeof(INLINE) && INLINE[i] != 0; i++) { long val = INLINE[i]; @@ -663,4 +691,10 @@ void DATIME(long* d, long* t) *t = (long) tv.tv_usec; } +void bug(enum bugtype num, const char *error_string) +{ + fprintf(stderr, "Fatal error %d, %s.\n", num, error_string); + exit(EXIT_FAILURE); +} + /* end */