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

Merge branch 'master' into magic-number

Browse source
This commit is contained in:
Peje Nilsson 2017-06-20 00:06:49 +02:00
commit 4b93fb327a
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
advent.h
View file

@ -90,6 +90,7 @@ extern bool oldstyle, editline, prompt;
extern void* xmalloc(size_t size);
extern char* xstrdup(const char*);
extern void packed_to_token(long, char token[]);
extern void token_to_packed(char token[], long*);
extern void speak(const char*);
extern bool wordeq(token_t, token_t);
extern bool wordempty(token_t);

12
misc.c
View file

@ -50,6 +50,18 @@ 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)