From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 11 Jun 2017 15:25:31 +0000 (-0400)
Subject: Abolish 18999 return from actions().
X-Git-Tag: 1.1~428
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=bfda14305af68b1d8a2deb4bdb2718a8493f035e;p=open-adventure.git

Abolish 18999 return from actions().
---

diff --git a/actions.c b/actions.c
index 3e811f9..5d1c6a3 100644
--- a/actions.c
+++ b/actions.c
@@ -180,8 +180,8 @@ static int vbreak(token_t obj)
 	game.fixed[VASE]= -1;
     } else {
 	if (obj == MIRROR && game.closed) {
-	    SPK=197;
-	    return(18999);
+	    RSPEAK(197);
+	    return(190000);
 	}
     }
     RSPEAK(SPK);
@@ -926,8 +926,8 @@ static int wake(token_t obj)
 /* Wake.  Only use is to disturb the dwarves. */
 {
     if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;}
-    SPK=199;
-    return(18999);
+    RSPEAK(199);
+    return(19000);
 }
 
 static int wave(token_t obj)
@@ -949,7 +949,10 @@ static int wave(token_t obj)
 	RSPEAK(SPK);
 	return 2012;
     } else {
-	if (game.closed) return(18999);
+	if (game.closed) {
+	    RSPEAK(SPK);	/* FIXME: How is SPK set here? */
+	    return(19000);
+	}
 	if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;}
 	if (HERE(BIRD))RSPEAK(SPK);
 	game.prop[FISSUR]=1-game.prop[FISSUR];
diff --git a/main.c b/main.c
index 8497ea4..760283a 100644
--- a/main.c
+++ b/main.c
@@ -1041,14 +1041,11 @@ Laction:
 	       RSPEAK(257);
 	       obj=0;
 	       goto L2600;
-	   case 18999:
-	       /*  Oh dear, he's disturbed the dwarves. */
-		RSPEAK(SPK);
-	       /* fall through */
 	   case 19000:
-		 RSPEAK(136);
-		 score(0);
-		 return true;
+	       /*  Oh dear, he's disturbed the dwarves. */
+	       RSPEAK(136);
+	       score(0);
+	       return true;
 	   }
 	BUG(99);