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

diff --git a/misc.c b/misc.c
index 9068342..f05e518 100644
--- a/misc.c
+++ b/misc.c
@@ -41,18 +41,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 +160,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);