X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=16ad02ac6045df58f30596da5c7e12616e6dbf8f;hb=f715091db6a55e49ab1c21c891011c9ae535a93c;hp=978381dd9891d48d3d2f6b2d587eeb2cead27d3a;hpb=cdf6993a51e919ab6a95496beed19af8ab1f5a0a;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 978381d..16ad02a 100644
--- a/misc.c
+++ b/misc.c
@@ -8,6 +8,28 @@
 #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) */
 
@@ -25,8 +47,56 @@ void newspeak(char* msg)
   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", msg);
+  printf("%s\n", rendered);
 }
 
 void SPEAK(vocab_t msg)
@@ -137,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)