#include <stdio.h>
#include <string.h>
#include <sys/time.h>
+#include <ctype.h>
#include "advent.h"
#include "database.h"
#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);
+ if (ptr == NULL)
+ {
+ fprintf(stderr, "Out of memory!\n");
+ exit(EXIT_FAILURE);
+ }
+ return(ptr);
+}
+
+void packed_to_token(long packed, char token[6])
+{
+ // Unpack and map back to ASCII.
+ for (int i = 0; i < 5; ++i)
+ {
+ char advent = (packed >> i * 6) & 63;
+ token[4 - i] = advent_to_ascii[advent];
+ }
+
+ // Ensure the last character is \0.
+ token[5] = '\0';
+
+ // Replace trailing whitespace with \0.
+ for (int i = 4; i >= 0; --i)
+ {
+ if (token[i] == ' ' || token[i] == '\t')
+ token[i] = '\0';
+ else
+ break;
+ }
+}
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
-void SPEAK(vocab_t msg)
-/* Print the message which starts at LINES[N]. Precede it with a blank line
- * unless game.blklin is false. */
+void newspeak(char* msg)
{
- long blank, casemake, i, nxt, neg, nparms, param, prmtyp, state;
+ // Do nothing if we got a null pointer.
+ if (msg == NULL)
+ return;
- if (msg == 0)
- return;
- blank=game.blklin;
- nparms=1;
- do {
- nxt=labs(LINES[msg])-1;
- ++msg;
- LNLENG=0;
- LNPOSN=1;
- state=0;
- for (i = msg; i <= nxt; i++) {
- PUTTXT(LINES[i],&state,2);
- }
- LNPOSN=0;
- ++LNPOSN;
+ // 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 = xstrdup(msg);
- while (LNPOSN <= LNLENG) {
- if (INLINE[LNPOSN] != ascii_to_advent['%']) {
- ++LNPOSN;
- continue;
+ // Staging area for stringified parameters.
+ char parameters[5][100]; // FIXME: to be replaced with dynamic allocation
+
+ // 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)
+ {
+ if (msg[i] == '%')
+ {
+ ++pi;
+
+ // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify everything. Future work may eliminate the need for this.
+ if (msg[i + 1] == 'd')
+ {
+ copy[i + 1] = 's';
+ sprintf(parameters[pi], "%ld", PARMS[pi]);
}
- prmtyp = INLINE[LNPOSN+1];
- /* A "%"; the next character determine the type of
- * parameter: 1 (!) = suppress message completely, 29 (S) = NULL
- * 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 == ascii_to_advent['!'])
- return;
- if (prmtyp == ascii_to_advent['S']) {
- SHFTXT(LNPOSN+2,-1);
- INLINE[LNPOSN] = 55;
- if (PARMS[nparms] == 1)
- SHFTXT(LNPOSN+1,-1);
- ++nparms;
- continue;
+
+ // Unmodified string specifier.
+ if (msg[i + 1] == 's')
+ {
+ packed_to_token(PARMS[pi], parameters[pi]);
}
- if (prmtyp == ascii_to_advent['T']) {
- 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;
+
+ // Singular/plural specifier.
+ if (msg[i + 1] == 'S')
+ {
+ copy[i + 1] = 's';
+ if (PARMS[pi - 1] > 1) // look at the *previous* parameter (which by necessity must be numeric)
+ {
+ sprintf(parameters[pi], "%s", "s");
}
- ++nparms;
- continue;
- }
- if (prmtyp == ascii_to_advent['B']) {
- prmtyp=PARMS[nparms];
- SHFTXT(LNPOSN+2,prmtyp-2);
- if (prmtyp != 0) {
- for (i=1; i<=prmtyp; i++) {
- INLINE[LNPOSN]=0;
- ++LNPOSN;
- }
+ else
+ {
+ sprintf(parameters[pi], "%s", "");
}
- ++nparms;
- continue;
- }
- 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 == ascii_to_advent['U'])
- casemake=1;
- if (prmtyp == ascii_to_advent['W'])
- casemake=0;
- i = LNPOSN;
- PUTTXT(PARMS[nparms],&state,casemake);
- PUTTXT(PARMS[nparms+1],&state,casemake);
- if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z'])
- INLINE[i] -= 26;
- nparms += 2;
- continue;
}
- prmtyp=prmtyp-64;
- if (prmtyp < ascii_to_advent['!'] || prmtyp > ascii_to_advent['-']) {
- ++LNPOSN;
- continue;
+ // All-lowercase specifier.
+ if (msg[i + 1] == 'L')
+ {
+ copy[i + 1] = 's';
+ packed_to_token(PARMS[pi], parameters[pi]);
+ for (int i = 0; i < strlen(parameters[pi]); ++i)
+ {
+ parameters[pi][i] = tolower(parameters[pi][i]);
+ }
}
- SHFTXT(LNPOSN+2,prmtyp-2);
- LNPOSN += prmtyp;
- param=labs(PARMS[nparms]);
- neg=0;
- if (PARMS[nparms] < 0)
- neg=9;
- for (i=1; i <= prmtyp; i++) {
- --LNPOSN;
- INLINE[LNPOSN]=MOD(param,10)+64;
- if (i != 1 && param == 0) {
- INLINE[LNPOSN]=neg;
- neg=0;
+
+ // First char uppercase, rest lowercase.
+ if (msg[i + 1] == 'C')
+ {
+ copy[i + 1] = 's';
+ packed_to_token(PARMS[pi], parameters[pi]);
+ for (int i = 0; i < strlen(parameters[pi]); ++i)
+ {
+ parameters[pi][i] = tolower(parameters[pi][i]);
}
- param=param/10;
+ parameters[pi][0] = toupper(parameters[pi][0]);
}
- LNPOSN += prmtyp;
- ++nparms;
- continue;
- }
+ }
+ }
- if (blank)
- TYPE0();
- blank=false;
- TYPE();
- msg = nxt + 1;
- } while
- (LINES[msg] >= 0);
+ // Render the final string.
+ char rendered[2000]; // FIXME: to be replaced with dynamic allocation
+ sprintf(rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); // FIXME: to be replaced with vsprintf()
+
+ // Print the message.
+ printf("%s\n", rendered);
+
+ free(copy);
}
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)
* and is not changed thereafter unless the routines on this page choose
* to do so. */
- if (!oldstyle && !isatty(1))
- fputs("> ", stdout);
do {
- if (oldstyle) {
+ if (!editline) {
+ if (prompt)
+ fputs("> ", stdout);
IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp));
eof = (feof(fp));
} else {
fclose(logfp);
return false;
} else {
+ FILE *efp = NULL;
if (logfp && fp == stdin)
- IGNORE(fputs(rawbuf, logfp));
+ efp = logfp;
else if (!isatty(0))
- IGNORE(fputs(rawbuf, stdout));
+ efp = stdout;
+ if (efp != NULL)
+ {
+ if (prompt)
+ fputs("> ", efp);
+ IGNORE(fputs(rawbuf, efp));
+ }
strcpy(INLINE+1, rawbuf);
LNLENG=0;
for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) {
*t = (long) tv.tv_usec;
}
-long MOD(long n, long m)
-{
- return(n%m);
-}
+/* end */
projects / open-adventure.git / blobdiff