projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7be7ac9
)
Static analysis warnings squished
212/head
author
NHOrus
<jy6x2b32pie9@yahoo.com>
Wed, 5 Jul 2017 14:45:12 +0000
(17:45 +0300)
committer
NHOrus
<jy6x2b32pie9@yahoo.com>
Wed, 5 Jul 2017 14:45:12 +0000
(17:45 +0300)
actions.c
patch
|
blob
|
history
misc.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index 06da68805481e1526c7a24687b09c9224188b6b1..2ac545c726e699bcd60065f11948ac95c613b73a 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-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) {
rspeak(DEEP_ROOTS);
return GO_CLEAROBJ;
if (obj == PLANT && game.prop[PLANT] <= PLANT_THIRSTY) {
rspeak(DEEP_ROOTS);
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) {
rspeak(OK_MAN);
} else {
game.loc == objects[PILLOW].plac) {
rspeak(OK_MAN);
} else {
- state_change(VASE, AT(PILLOW)
- ? VASE_WHOLE
- : VASE_DROPPED);
+
state_change(VASE, AT(PILLOW)
+
? VASE_WHOLE
+
: VASE_DROPPED);
if (game.prop[VASE] != VASE_WHOLE)
game.fixed[VASE] = IS_FIXED;
}
if (game.prop[VASE] != VASE_WHOLE)
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
- : WATER_BOTTLE);
+
? OIL_BOTTLE
+
: WATER_BOTTLE);
if (TOTING(BOTTLE))
game.place[LIQUID()] = CARRIED;
return GO_CLEAROBJ;
if (TOTING(BOTTLE))
game.place[LIQUID()] = CARRIED;
return GO_CLEAROBJ;
diff --git
a/misc.c
b/misc.c
index 5b1068e379084b872f90ebcd6da91876b855ee2a..a2626b4d3f02ae66ea69ed4dbf99c4c1939debe0 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-118,11
+118,11
@@
void tokenize(char* raw, struct command_t *cmd)
* possible an emulation of the original UI.
*/
if (settings.oldstyle) {
* possible an emulation of the original UI.
*/
if (settings.oldstyle) {
-
cmd->raw1[TOKLEN+TOKLEN] = cmd->raw1[TOKLEN+
TOKLEN] = '\0';
-
for (in
t i = 0; i < strlen(cmd->raw1); i++)
- cmd->raw1[i] = toupper(cmd->raw1[i]);
-
for (in
t i = 0; i < strlen(cmd->raw2); i++)
- cmd->raw2[i] = toupper(cmd->raw2[i]);
+
cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN +
TOKLEN] = '\0';
+
for (size_
t i = 0; i < strlen(cmd->raw1); i++)
+
cmd->raw1[i] = toupper(cmd->raw1[i]);
+
for (size_
t i = 0; i < strlen(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;
for (;;) {
bool outcome;
for (;;) {
- reply = get_input();
+
char*
reply = get_input();
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
if (reply == NULL) {
// LCOV_EXCL_START
// 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;
* if no, print Z and return false. */
{
/* Print message X, wait for yes/no answer. If yes, print Y and return true;
* if no, print Z and return false. */
{
- char* reply;
bool outcome;
for (;;) {
speak(question);
bool outcome;
for (;;) {
speak(question);
- reply = get_input();
+
char*
reply = get_input();
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL