projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
851f90c
)
Code simplification.
author
Eric S. Raymond
<esr@thyrsus.com>
Fri, 16 Jun 2017 19:58:51 +0000
(15:58 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Fri, 16 Jun 2017 19:58:51 +0000
(15:58 -0400)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 2d9a20701a2513bbcd1196edb344e6e12963036e..d7ecd7797785b1d324d267af1d70fddfc23f2c57 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-475,14
+475,13
@@
static void croak(FILE *cmdin)
* death and exit. */
RSPEAK(DEATH_CLOSING);
score(endgame);
* death and exit. */
RSPEAK(DEATH_CLOSING);
score(endgame);
- } else {
- /* FIXME: Arithmetic on message numbers */
- if (!YES(cmdin,WATCH_IT+game.numdie*2,WHICH_WAY+game.numdie*2,OK_MAN))
- score(endgame);
- if (game.numdie == MAXDIE)
+
+ }
+ /* FIXME: Arithmetic on message numbers */
+ else if (game.numdie == MAXDIE || !YES(cmdin,WATCH_IT+game.numdie*2,WHICH_WAY+game.numdie*2,OK_MAN))
score(endgame);
score(endgame);
- game.place[WATER] = NOWHERE;
- game.place[OIL] = NOWHERE;
+ else {
+ game.place[
WATER] = game.place[
OIL] = NOWHERE;
if (TOTING(LAMP))
game.prop[LAMP]=0;
for (int j=1; j<=NOBJECTS; j++) {
if (TOTING(LAMP))
game.prop[LAMP]=0;
for (int j=1; j<=NOBJECTS; j++) {