X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=aef3eff81da99c528bce205e1ed9e5a4b1f77a66;hp=e69fc9bdf495fe2c63b52e2d3e273509db3b5d54;hb=d9d089bdcc31698970747fc829edb057c0a0da5b;hpb=39a25f8ec79c2a6e0f25fb9060cdb932e3383905

diff --git a/misc.c b/misc.c
index e69fc9b..aef3eff 100644
--- a/misc.c
+++ b/misc.c
@@ -10,38 +10,6 @@
 #include "linenoise/linenoise.h"
 #include "dungeon.h"
 
-const char new_advent_to_ascii[] = {
-    ' ', '!', '"', '#', '$', '%', '&', '\'',
-    '(', ')', '*', '+', ',', '-', '.', '/',
-    '0', '1', '2', '3', '4', '5', '6', '7',
-    '8', '9', ':', ';', '<', '=', '>', '?',
-    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-    'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
-};
-
-const char new_ascii_to_advent[] = {
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-
-    0, 1, 2, 3, 4, 5, 6, 7,
-    8, 9, 10, 11, 12, 13, 14, 15,
-    16, 17, 18, 19, 20, 21, 22, 23,
-    24, 25, 26, 27, 28, 29, 30, 31,
-    32, 33, 34, 35, 36, 37, 38, 39,
-    40, 41, 42, 43, 44, 45, 46, 47,
-    48, 49, 50, 51, 52, 53, 54, 55,
-    56, 57, 58, 59, 60, 61, 62, 63,
-
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-};
-
 char* xstrdup(const char* s)
 {
     char* ptr = strdup(s);
@@ -69,10 +37,22 @@ void* xmalloc(size_t size)
 
 void packed_to_token(long packed, char token[6])
 {
+  // The advent->ascii mapping.
+  const char advent_to_ascii[] = {
+    ' ', '!', '"', '#', '$', '%', '&', '\'',
+    '(', ')', '*', '+', ',', '-', '.', '/',
+    '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', ':', ';', '<', '=', '>', '?',
+    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+    'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
+};
+
     // Unpack and map back to ASCII.
     for (int i = 0; i < 5; ++i) {
         char advent = (packed >> i * 6) & 63;
-        token[i] = new_advent_to_ascii[(int) advent];
+        token[i] = advent_to_ascii[(int) advent];
     }
 
     // Ensure the last character is \0.
@@ -89,10 +69,31 @@ void packed_to_token(long packed, char token[6])
 
 long token_to_packed(const char token[6])
 {
+  const char ascii_to_advent[] = {
+    63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63,
+
+    0, 1, 2, 3, 4, 5, 6, 7,
+    8, 9, 10, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23,
+    24, 25, 26, 27, 28, 29, 30, 31,
+    32, 33, 34, 35, 36, 37, 38, 39,
+    40, 41, 42, 43, 44, 45, 46, 47,
+    48, 49, 50, 51, 52, 53, 54, 55,
+    56, 57, 58, 59, 60, 61, 62, 63,
+
+    63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63,
+};
+
     size_t t_len = strlen(token);
     long packed = 0;
     for (size_t i = 0; i < t_len; ++i) {
-        char mapped = new_ascii_to_advent[(int) token[i]];
+        char mapped = ascii_to_advent[(int) token[i]];
         packed |= (mapped << (6 * i));
     }
     return (packed);