#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);
+}
+
+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) */
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 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], "%d", PARMS[pi]);
+ }
+
+ // Unmodified string specifier.
+ if (msg[i + 1] == 's')
+ {
+ packed_to_token(PARMS[pi], parameters[pi]);
+ }
+
+ // 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");
+ }
+ else
+ {
+ sprintf(parameters[pi], "%s", "");
+ }
+ }
+
+ // 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]);
+ }
+ }
+
+ // 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]);
+ }
+ parameters[pi][0] = toupper(parameters[pi][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", msg);
+ printf("%s\n", rendered);
+
+ free(copy);
}
void SPEAK(vocab_t msg)
* 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)