From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 12 Jun 2017 12:03:10 +0000 (-0400)
Subject: More goto elimination.
X-Git-Tag: 1.1~388
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=b0eb54b125c952cd23d71f58238bcb0460d90fb8

More goto elimination.
---

diff --git a/main.c b/main.c
index 17bde07..6f21554 100644
--- a/main.c
+++ b/main.c
@@ -1017,11 +1017,11 @@ L2630:
 	switch (KQ-1)
 	{
 	case 0: goto L8;
-	case 1: part=unknown; obj = KMOD; goto Laction;
-	case 2: part=intransitive; VERB = KMOD; goto Laction;
+	case 1: part=unknown; obj = KMOD; break;
+	case 2: part=intransitive; VERB = KMOD; break;
 	case 3: RSPEAK(KMOD); goto L2012;
+	default: BUG(22);
 	}
-	BUG(22);
 
 Laction:
 	 switch (action(cmdin, part, VERB, obj)) {
@@ -1050,9 +1050,12 @@ Laction:
 	     RSPEAK(136);
 	     score(0);
 	     return true;
+	 default:
+	     BUG(99);
 	     }
-	BUG(99);
 
+	 /* no fallthrough here */
+	 
 	/*  Figure out the new location */
 L8:	if (playermove(cmdin, VERB, KMOD))
 	    return true;