Code cleanup.

This commit is contained in:
Eric S. Raymond 2017-07-14 13:10:13 -04:00
parent 1954c04ccc
commit d1e29319fa
3 changed files with 1 additions and 9 deletions

View file

@ -545,9 +545,7 @@ static int discard(verb_t verb, obj_t obj)
} else } else
rspeak(OK_MAN); rspeak(OK_MAN);
game.prop[BIRD] = BIRD_UNCAGED; game.prop[BIRD] = FOREST(game.loc) ? BIRD_FOREST_UNCAGED : BIRD_UNCAGED;
if (FOREST(game.loc))
game.prop[BIRD] = BIRD_FOREST_UNCAGED;
drop(obj, game.loc); drop(obj, game.loc);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }

View file

@ -208,7 +208,6 @@ extern void packed_to_token(long, char token[]);
extern long token_to_packed(const char token[]); extern long token_to_packed(const char token[]);
extern void tokenize(char*, struct command_t *); extern void tokenize(char*, struct command_t *);
extern void vspeak(const char*, bool, va_list); extern void vspeak(const char*, bool, va_list);
extern bool wordempty(token_t);
extern void wordclear(token_t *); extern void wordclear(token_t *);
extern void speak(const char*, ...); extern void speak(const char*, ...);
extern void sspeak(long msg, ...); extern void sspeak(long msg, ...);

5
misc.c
View file

@ -128,11 +128,6 @@ void tokenize(char* raw, struct command_t *cmd)
/* Hide the fact that wods are corrently packed longs */ /* Hide the fact that wods are corrently packed longs */
bool wordempty(token_t a)
{
return a == 0;
}
void wordclear(token_t *v) void wordclear(token_t *v)
{ {
*v = 0; *v = 0;