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

Static analysis warnings squished

Browse source
This commit is contained in:
NHOrus 2017-07-05 17:45:12 +03:00
parent 7be7ac9406
commit c35cf99966
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
actions.c
View file

@ -303,7 +303,7 @@ static int vcarry(token_t verb, token_t obj)
} }
if (game.fixed[obj] != IS_FREE) { if (game.fixed[obj] != IS_FREE) {
/* Next guard tests whether plant is tiny or stashed */ /* Next guard tests whether plant is tiny or stashed */
if (obj == PLANT && game.prop[PLANT] <= PLANT_THIRSTY) { if (obj == PLANT && game.prop[PLANT] <= PLANT_THIRSTY) {
rspeak(DEEP_ROOTS); rspeak(DEEP_ROOTS);
return GO_CLEAROBJ; return GO_CLEAROBJ;
@ -503,9 +503,9 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
game.loc == objects[PILLOW].plac) { game.loc == objects[PILLOW].plac) {
rspeak(OK_MAN); rspeak(OK_MAN);
} else { } else {
state_change(VASE, AT(PILLOW) state_change(VASE, AT(PILLOW)
? VASE_WHOLE ? VASE_WHOLE
: VASE_DROPPED); : VASE_DROPPED);
if (game.prop[VASE] != VASE_WHOLE) if (game.prop[VASE] != VASE_WHOLE)
game.fixed[VASE] = IS_FIXED; game.fixed[VASE] = IS_FIXED;
} }
@ -742,8 +742,8 @@ int fill(token_t verb, token_t obj)
} }
state_change(BOTTLE, (LIQLOC(game.loc) == OIL) state_change(BOTTLE, (LIQLOC(game.loc) == OIL)
? OIL_BOTTLE ? OIL_BOTTLE
: WATER_BOTTLE); : WATER_BOTTLE);
if (TOTING(BOTTLE)) if (TOTING(BOTTLE))
game.place[LIQUID()] = CARRIED; game.place[LIQUID()] = CARRIED;
return GO_CLEAROBJ; return GO_CLEAROBJ;

16
misc.c
View file

@ -118,11 +118,11 @@ void tokenize(char* raw, struct command_t *cmd)
* possible an emulation of the original UI. * possible an emulation of the original UI.
*/ */
if (settings.oldstyle) { if (settings.oldstyle) {
cmd->raw1[TOKLEN+TOKLEN] = cmd->raw1[TOKLEN+TOKLEN] = '\0'; cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN + TOKLEN] = '\0';
for (int i = 0; i < strlen(cmd->raw1); i++) for (size_t i = 0; i < strlen(cmd->raw1); i++)
cmd->raw1[i] = toupper(cmd->raw1[i]); cmd->raw1[i] = toupper(cmd->raw1[i]);
for (int i = 0; i < strlen(cmd->raw2); i++) for (size_t i = 0; i < strlen(cmd->raw2); i++)
cmd->raw2[i] = toupper(cmd->raw2[i]); cmd->raw2[i] = toupper(cmd->raw2[i]);
} }
} }
@ -351,11 +351,10 @@ char* get_input()
bool silent_yes() bool silent_yes()
{ {
char* reply;
bool outcome; bool outcome;
for (;;) { for (;;) {
reply = get_input(); char* reply = get_input();
if (reply == NULL) { if (reply == NULL) {
// LCOV_EXCL_START // LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL // Should be unreachable. Reply should never be NULL
@ -398,13 +397,12 @@ bool yes(const char* question, const char* yes_response, const char* no_response
/* Print message X, wait for yes/no answer. If yes, print Y and return true; /* Print message X, wait for yes/no answer. If yes, print Y and return true;
* if no, print Z and return false. */ * if no, print Z and return false. */
{ {
char* reply;
bool outcome; bool outcome;
for (;;) { for (;;) {
speak(question); speak(question);
reply = get_input(); char* reply = get_input();
if (reply == NULL) { if (reply == NULL) {
// LCOV_EXCL_START // LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL // Should be unreachable. Reply should never be NULL