X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=b01662f5120f4739cea47623b433c7e15ae58cc2;hp=906834291e7cca0b21c894e26913178889f75cf2;hb=94aca03203cbba94c25fba00b7ff80e529d275c7;hpb=59243cf8bc1939348467810bc63e107728a680c4

diff --git a/misc.c b/misc.c
index 9068342..b01662f 100644
--- a/misc.c
+++ b/misc.c
@@ -15,8 +15,11 @@ void* xmalloc(size_t size)
 {
     void* ptr = malloc(size);
     if (ptr == NULL) {
+        // LCOV_EXCL_START
+        // exclude from coverage analysis because we can't simulate an out of memory error in testing
         fprintf(stderr, "Out of memory!\n");
         exit(EXIT_FAILURE);
+        // LCOV_EXCL_STOP 
     }
     return (ptr);
 }
@@ -41,18 +44,6 @@ 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)
@@ -172,16 +163,16 @@ void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
     va_start(ap, skip);
     switch (mode) {
     case touch:
-        vspeak(object_descriptions[msg].inventory, ap);
+        vspeak(objects[msg].inventory, ap);
 	break;
     case look: 
-        vspeak(object_descriptions[msg].longs[skip], ap);
+        vspeak(objects[msg].longs[skip], ap);
 	break;
     case hear:
-        vspeak(object_descriptions[msg].sounds[skip], ap);
+        vspeak(objects[msg].sounds[skip], ap);
 	break;
     case study:
-        vspeak(object_descriptions[msg].texts[skip], ap);
+        vspeak(objects[msg].texts[skip], ap);
 	break;
     }
     va_end(ap);