X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=71c7540669b2b3b8e178220360a89dd4cb8b9ea6;hb=521033165b32ab1bdfd5f3fcecc8e86bd97ec967;hp=ee2ac25cd95a90a07b559548240959359f7391bd;hpb=e9aff2568f200be6cf47ec0bd945902a636bbd71;p=open-adventure.git diff --git a/misc.c b/misc.c index ee2ac25..71c7540 100644 --- a/misc.c +++ b/misc.c @@ -50,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) @@ -262,7 +291,7 @@ bool YES(const char* question, const char* yes_response, const char* no_response reply = get_input(); - char* firstword = (char*) xmalloc(strlen(reply)); + char* firstword = (char*) xmalloc(strlen(reply)+1); sscanf(reply, "%s", firstword); for (int i = 0; i < (int)strlen(firstword); ++i)