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

Cleaned up unused variables

Browse source
This commit is contained in:
NHOrus 2017-07-04 11:15:10 +03:00
parent df2830598c
commit babf08ddc4
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actions.c
View file

@ -1038,9 +1038,7 @@ static int rub(token_t verb, token_t obj)
static int say(struct command_t *command) static int say(struct command_t *command)
/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */ /* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */
{ {
long a = command->wd1;
if (command->wd2 > 0) { if (command->wd2 > 0) {
a = command->wd2;
command->wd1 = command->wd2; command->wd1 = command->wd2;
strcpy(command->raw1, command->raw2); strcpy(command->raw1, command->raw2);
} }

30
misc.c
View file

@ -23,7 +23,7 @@ static void* xmalloc(size_t size)
return (ptr); return (ptr);
} }
void packed_to_token(long packed, char token[TOKLEN+1]) void packed_to_token(long packed, char token[TOKLEN + 1])
{ {
// The advent->ascii mapping. // The advent->ascii mapping.
const char advent_to_ascii[] = { const char advent_to_ascii[] = {
@ -81,7 +81,7 @@ long token_to_packed(const char token[])
size_t t_len = strlen(token); size_t t_len = strlen(token);
if (t_len > TOKLEN) if (t_len > TOKLEN)
t_len = TOKLEN; t_len = TOKLEN;
long packed = 0; long packed = 0;
for (size_t i = 0; i < t_len; ++i) { for (size_t i = 0; i < t_len; ++i) {
char mapped = ascii_to_advent[(int) toupper(token[i])]; char mapped = ascii_to_advent[(int) toupper(token[i])];
@ -95,7 +95,7 @@ void tokenize(char* raw, struct command_t *cmd)
memset(cmd, '\0', sizeof(struct command_t)); memset(cmd, '\0', sizeof(struct command_t));
/* FIXME: put a bound prefix on the %s to prevent buffer overflow */ /* FIXME: put a bound prefix on the %s to prevent buffer overflow */
int word_count = sscanf(raw, "%s%s", cmd->raw1, cmd->raw2); sscanf(raw, "%s%s", cmd->raw1, cmd->raw2);
// pack the substrings // pack the substrings
cmd->wd1 = token_to_packed(cmd->raw1); cmd->wd1 = token_to_packed(cmd->raw1);
@ -274,16 +274,16 @@ int word_count(char* str)
int inblanks = true; int inblanks = true;
for (char *s = str; *s; s++) for (char *s = str; *s; s++)
if (inblanks) { if (inblanks) {
if (strchr(delims, *s) == 0) { if (strchr(delims, *s) == 0) {
++count; ++count;
inblanks = false; inblanks = false;
} }
} else { } else {
if (strchr(delims, *s) != 0) { if (strchr(delims, *s) != 0) {
inblanks = true; inblanks = true;
} }
} }
return (count); return (count);
} }
@ -485,7 +485,7 @@ long get_vocab_id(const char* word)
{ {
/* Check for an empty string */ /* Check for an empty string */
if (strncmp(word, "", sizeof("")) == 0) if (strncmp(word, "", sizeof("")) == 0)
return (WORD_EMPTY); return (WORD_EMPTY);
long ref_num; long ref_num;
@ -649,7 +649,7 @@ long randrange(long range)
return range * get_next_lcg_value() / game.lcg_m; return range * get_next_lcg_value() / game.lcg_m;
} }
void make_zzword(char zzword[TOKLEN+1]) void make_zzword(char zzword[TOKLEN + 1])
{ {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
zzword[i] = 'A' + randrange(26); zzword[i] = 'A' + randrange(26);