From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 14 Jun 2017 00:06:07 +0000 (-0400)
Subject: Code simplification.
X-Git-Tag: 1.1~331
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=473bdfaa2aeb0af235ede9b57fb7b990e0ced861;p=open-adventure.git

Code simplification.
---

diff --git a/main.c b/main.c
index 1c5749d..d0e690c 100644
--- 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. */
 {
+    ++game.numdie;
     if (game.closng) {
 	/*  He died during closing time.  No resurrection.  Tally up a
 	 *  death and exit. */
 	RSPEAK(131);
-	++game.numdie;
 	score(0);
     } else {
-	++game.numdie;
 	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)) {
-		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;