X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=16ad02ac6045df58f30596da5c7e12616e6dbf8f;hb=f715091db6a55e49ab1c21c891011c9ae535a93c;hp=6fe53ce6335be67207f7150fb3f2e0f01aa1fe17;hpb=1173a9a265a3132688830c26077129e3c624cd13;p=open-adventure.git diff --git a/misc.c b/misc.c index 6fe53ce..16ad02a 100644 --- a/misc.c +++ b/misc.c @@ -3,15 +3,102 @@ #include #include #include +#include #include "advent.h" #include "database.h" #include "linenoise/linenoise.h" +#include "newdb.h" -#define PERCENT 63 /* partly hide the packed encoding */ +void* xmalloc(size_t size) +{ + void* ptr = malloc(size); + if (ptr == NULL) + { + fprintf(stderr, "Out of memory!\n"); + exit(EXIT_FAILURE); + } + return(ptr); +} + +void packed_to_token(long packed, char token[6]) +{ + for (int i = 0; i < 5; ++i) + { + char advent = (packed >> i * 6) & 63; + token[i] = advent_to_ascii[advent]; + } + token[5] = '\0'; +} /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ +void newspeak(char* msg) +{ + // Do nothing if we got a null pointer. + if (msg == NULL) + return; + + // Do nothing if we got an empty string. + if (strlen(msg) == 0) + return; + + // Print a newline if the global game.blklin says to. + if (game.blklin == true) + printf("\n"); + + // Create a copy of our string, so we can edit it. + char* copy = (char*) xmalloc(strlen(msg) + 1); + strncpy(copy, msg, strlen(msg) + 1); + + // Staging area for parameters. + char parameters[2000][5]; + + // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s. + int param_index = 0; + for (int i = 0; i < strlen(msg); ++i) + { + if (msg[i] == '%') + { + ++param_index; + + // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify these. Future work may eliminate the need for this. + if (msg[i + 1] == 'd') + { + copy[i + 1] = 's'; + sprintf(parameters[param_index], "%d", PARMS[param_index]); + } + + // Plain string specifier. + if (msg[i + 1] == 's') + { + packed_to_token(PARMS[param_index], parameters[param_index]); + } + + // Plural replacement specifier. + if (msg[i + 1] == 'S') + { + copy[i + 1] = 's'; + if (PARMS[param_index - 1] > 1) + { + sprintf(parameters[param_index], "%s", "s"); + } + else + { + sprintf(parameters[param_index], "%s", ""); + } + } + } + } + + // Render the final string. + char rendered[2000]; + sprintf(&rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); + + // Print the message. + printf("%s\n", rendered); +} + void SPEAK(vocab_t msg) /* Print the message which starts at LINES[N]. Precede it with a blank line * unless game.blklin is false. */ @@ -35,7 +122,7 @@ void SPEAK(vocab_t msg) ++LNPOSN; while (LNPOSN <= LNLENG) { - if (INLINE[LNPOSN] != PERCENT) { + if (INLINE[LNPOSN] != ascii_to_advent['%']) { ++LNPOSN; continue; } @@ -45,64 +132,44 @@ void SPEAK(vocab_t msg) * If PARAM=1, else 'S' (optional plural ending), 33 (W) = word * (two 30-bit values) with trailing spaces suppressed, 22 (L) or * 31 (U) = word but map to lower/upper case, 13 (C) = word in - * lower case with first letter capitalised, 30 (T) = text ending - * with a word of -1, 65-73 (1-9) = number using that many - * characters, 12 (B) = variable number of blanks. */ - if (prmtyp == 1) + * lower case with first letter capitalised, 65-73 (1-9) = + * number using that many characters. */ + if (prmtyp == ascii_to_advent['!']) return; - if (prmtyp == 29) { + if (prmtyp == ascii_to_advent['S']) { SHFTXT(LNPOSN+2,-1); - INLINE[LNPOSN] = 55; + INLINE[LNPOSN] = ascii_to_advent['s']; if (PARMS[nparms] == 1) SHFTXT(LNPOSN+1,-1); ++nparms; continue; } - if (prmtyp == 30) { - SHFTXT(LNPOSN+2,-2); - state=0; - casemake=2; - - while (PARMS[nparms] > 0) { - if (PARMS[nparms+1] < 0) - casemake=0; - PUTTXT(PARMS[nparms],&state,casemake); - ++nparms; - } - ++nparms; - continue; - } - if (prmtyp == 12) { - prmtyp=PARMS[nparms]; - SHFTXT(LNPOSN+2,prmtyp-2); - if (prmtyp != 0) { - for (i=1; i<=prmtyp; i++) { - INLINE[LNPOSN]=0; - ++LNPOSN; - } - } - ++nparms; - continue; - } - if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) { + if (prmtyp == ascii_to_advent['W'] || prmtyp == ascii_to_advent['L'] || prmtyp == ascii_to_advent['U'] || prmtyp == ascii_to_advent['C']) { SHFTXT(LNPOSN+2,-2); state = 0; casemake = -1; - if (prmtyp == 31) + if (prmtyp == ascii_to_advent['U']) casemake=1; - if (prmtyp == 33) + if (prmtyp == ascii_to_advent['W']) casemake=0; i = LNPOSN; PUTTXT(PARMS[nparms],&state,casemake); PUTTXT(PARMS[nparms+1],&state,casemake); - if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62) - INLINE[i] -= 26; + if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z']) + { + // Convert to uppercase. + // Round-trip to ASCII and back so that this code doesn't break when the mapping changes. + // This can be simplified when mapping goes away. + char this = advent_to_ascii[INLINE[i]]; + char uc_this = toupper(this); + INLINE[i] = ascii_to_advent[uc_this]; + } nparms += 2; continue; } prmtyp=prmtyp-64; - if (prmtyp < 1 || prmtyp > 9) { + if (prmtyp < ascii_to_advent['!'] || prmtyp > ascii_to_advent['-']) { ++LNPOSN; continue; } @@ -140,25 +207,16 @@ void PSPEAK(vocab_t msg,int skip) * the index of the inventory message for object. (INVEN+N+1 message * is game.prop=N message). */ { - long i, m; - - m=PTEXT[msg]; - if (skip >= 0) { - for (i=0; i <=skip; i++) { - do { - m=labs(LINES[m]); - } while - (LINES[m] >= 0); - } - } - SPEAK(m); + if (skip >= 0) + newspeak(object_descriptions[msg].longs[skip]); + else + newspeak(object_descriptions[msg].inventory); } void RSPEAK(vocab_t i) /* Print the i-th "random" message (section 6 of database). */ { - if (i != 0) - SPEAK(RTEXT[i]); + newspeak(arbitrary_messages[i]); } void SETPRM(long first, long p1, long p2) @@ -259,21 +317,21 @@ long GETTXT(bool skip, bool onewrd, bool upper) if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0)) continue; char current=INLINE[LNPOSN]; - if (current < PERCENT) { + if (current < ascii_to_advent['%']) { splitting = -1; - if (upper && current >= 37) + if (upper && current >= ascii_to_advent['a']) current=current-26; text=text+current; ++LNPOSN; continue; } if (splitting != LNPOSN) { - text=text+PERCENT; + text=text+ascii_to_advent['%']; splitting = LNPOSN; continue; } - text=text+current-PERCENT; + text=text+current-ascii_to_advent['%']; splitting = -1; ++LNPOSN; } @@ -330,8 +388,8 @@ void PUTTXT(token_t word, long *state, long casemake) return; byte=w/div; w=(w-byte*div)*64; - if (!(*state != 0 || byte != PERCENT)) { - *state=PERCENT; + if (!(*state != 0 || byte != ascii_to_advent['%'])) { + *state=ascii_to_advent['%']; continue; } SHFTXT(LNPOSN,1); @@ -668,7 +726,7 @@ bool MAPLIN(FILE *fp) strcpy(INLINE+1, rawbuf); LNLENG=0; for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) { - val=INLINE[i]+1; + val=INLINE[i]; INLINE[i]=ascii_to_advent[val]; if (INLINE[i] != 0) LNLENG=i; @@ -691,7 +749,7 @@ void TYPE(void) } for (i=1; i<=LNLENG; i++) { - INLINE[i]=advent_to_ascii[INLINE[i]+1]; + INLINE[i]=advent_to_ascii[INLINE[i]]; } INLINE[LNLENG+1]=0; printf("%s\n", INLINE+1);