archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some disused stuff.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-06-30 10:56:38 -07:00
parent 39a25f8ec7
commit d9d089bdcc
4 changed files with 35 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

69
misc.c
View file

@ -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);