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:
c3453db
)
Code simplification.
author
Eric S. Raymond
<esr@thyrsus.com>
Wed, 14 Jun 2017 00:06:07 +0000
(20:06 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Wed, 14 Jun 2017 00:06:07 +0000
(20:06 -0400)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 1c5749dc632245ccd9f54d074d3ebf1a9d8dae55..d0e690c1d363751e4dee60ebafec728c48d93c62 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-467,14
+467,13
@@
static bool dwarfmove(void)
static void croak(FILE *cmdin)
/* Okay, he's dead. Let's get on with it. */
{
static void croak(FILE *cmdin)
/* Okay, he's dead. Let's get on with it. */
{
+ ++game.numdie;
if (game.closng) {
/* He died during closing time. No resurrection. Tally up a
* death and exit. */
RSPEAK(131);
if (game.closng) {
/* He died during closing time. No resurrection. Tally up a
* death and exit. */
RSPEAK(131);
- ++game.numdie;
score(0);
} else {
score(0);
} else {
- ++game.numdie;
if (!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54))
score(0);
if (game.numdie == MAXDIE)
if (!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54))
score(0);
if (game.numdie == MAXDIE)
@@
-486,10
+485,8
@@
static void croak(FILE *cmdin)
for (int j=1; j<=NOBJECTS; j++) {
int i=NOBJECTS + 1 - j;
if (TOTING(i)) {
for (int j=1; j<=NOBJECTS; j++) {
int i=NOBJECTS + 1 - j;
if (TOTING(i)) {
- int k=game.oldlc2;
- if (i == LAMP)
- k=1;
- DROP(i,k);
+ /* Always leave lamp where it's accessible aboveground */
+ DROP(i, (i == LAMP) ? 1 : game.oldlc2);
}
}
game.loc=3;
}
}
game.loc=3;