From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 11 Jun 2017 12:33:30 +0000 (-0400)
Subject: More goto elimination.
X-Git-Tag: 1.1~434
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=0dcd87202a8dbcc882aecc37a27cb226d8f9965d;p=open-adventure.git

More goto elimination.
---

diff --git a/main.c b/main.c
index 8bf0c1a..681ad8a 100644
--- a/main.c
+++ b/main.c
@@ -581,34 +581,33 @@ static bool playermove(FILE *cmdin, token_t verb)
     }
     LL=LL/1000;
 
-L11:
-    game.newloc=LL/1000;
-    K=MOD(game.newloc,100);
-    if (game.newloc <= 300) {
-    	if (game.newloc <= 100)
-	    goto L14;
-	if (TOTING(K) || (game.newloc > 200 && AT(K)))
-	    goto L16;
-	goto L12;
+    for (;;) {
+	game.newloc=LL/1000;
+	K=MOD(game.newloc,100);
+	if (game.newloc <= 300) {
+	    if (game.newloc <= 100) {
+		if (game.newloc == 0 || PCT(game.newloc))
+		    break;
+		/* else fall through */
+	    } if (TOTING(K) || (game.newloc > 200 && AT(K)))
+		  break;
+	    /* else fall through */
+	}
+	else if (game.prop[K] != game.newloc/100-3)
+	    break;
+    L12:
+	do {
+	    if (TRAVEL[KK] < 0)BUG(25);
+	    ++KK;
+	    game.newloc=labs(TRAVEL[KK])/1000;
+	} while
+	    (game.newloc == LL);
+	LL=game.newloc;
     }
-    if (game.prop[K] != game.newloc/100-3)
-	goto L16;
-L12:
-    do {
-	if (TRAVEL[KK] < 0)BUG(25);
-	++KK;
-	game.newloc=labs(TRAVEL[KK])/1000;
-    } while
-        (game.newloc == LL);
-    LL=game.newloc;
-    goto L11;
 
-L14:
-    if (game.newloc != 0 && !PCT(game.newloc))
-	goto L12;
-L16:
     game.newloc=MOD(LL,1000);
-    if (game.newloc <= 300) return true;
+    if (game.newloc <= 300)
+	return true;
     if (game.newloc <= 500) {
 	game.newloc=game.newloc-300;
 	switch (game.newloc)