projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve GitLab issue #3. Applies MISRA and CERT guidelines.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 2b6d21742885a7d636e6247561db012fd50aa2ae..0abccbca11f31920a2723d778d0ffcdb43c77408 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-728,9
+728,7
@@
static int lock(token_t verb, token_t obj)
if (!game.panic)game.clock2 = PANICTIME;
game.panic = true;
} else {
if (!game.panic)game.clock2 = PANICTIME;
game.panic = true;
} else {
- spk = game.prop[GRATE] ? GRATE_LOCKED : ALREADY_LOCKED;
- game.prop[GRATE] = 1;
- if (verb == LOCK)game.prop[GRATE] = 0;
+ game.prop[GRATE] = (verb == LOCK) ? 0 : 1;
spk = game.prop[GRATE] ? GRATE_UNLOCKED : GRATE_LOCKED;
}
}
spk = game.prop[GRATE] ? GRATE_UNLOCKED : GRATE_LOCKED;
}
}
@@
-800,23
+798,19
@@
static int read(struct command_t command)
if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
command.obj = command.obj * NOBJECTS + i;
}
if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
command.obj = command.obj * NOBJECTS + i;
}
- if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc)) return GO_UNKNOWN;
+ if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
+ return GO_UNKNOWN;
}
if (DARK(game.loc)) {
SETPRM(1, command.wd1, command.wd1x);
RSPEAK(NO_SEE);
}
if (DARK(game.loc)) {
SETPRM(1, command.wd1, command.wd1x);
RSPEAK(NO_SEE);
- return GO_CLEAROBJ;
- }
- if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
+ } else if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
RSPEAK(ACTSPK[command.verb]);
RSPEAK(ACTSPK[command.verb]);
- return GO_CLEAROBJ;
- }
- if (command.obj == OYSTER && !game.clshnt) {
+ } else if (command.obj == OYSTER && !game.clshnt) {
game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
- return GO_CLEAROBJ;
- }
- PSPEAK(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
+ } else
+ PSPEAK(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}