X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=d11575613113e186e3b5eb37e5f99cd040f8bdf8;hp=95e69732457947eaa61cb891c1068b5cd3f0e4c1;hb=60ab7a63dc7c2b52bf21887f365a58588a08f708;hpb=3bdab31a0d0c8c7397be835cf97bbf4d5a1c97de

diff --git a/main.c b/main.c
index 95e6973..d115756 100644
--- a/main.c
+++ b/main.c
@@ -3,15 +3,15 @@
  *
  * The author - Don Woods - apologises for the style of the code; it
  * is a result of running the original Fortran IV source through a
- * home-brew Fortran-to-C converter.)
+ * home-brew Fortran-to-C converter.
  *
  * Now that the code has been restructured into something much closer
  * to idiomatic C, the following is more appropriate:
  *
  * ESR apologizes for the remaing gotos (now confined to two functions
- * in this file - there used to be hundreds of them, *everywhere*),
- * and the offensive globals.  Applying the Structured Program Theorem
- * can be hard.
+ * in this file - there used to be over 350 of them, *everywhere*),
+ * and for the offensive globals.  Applying the Structured Program
+ * Theorem can be hard.
  */
 #include <stdlib.h>
 #include <stdio.h>
@@ -1026,15 +1026,12 @@ static bool do_command(FILE *cmdin)
 	    part=transitive;
 	    goto Laction;
 	}
-	if (closecheck())
+	if (closecheck()) {
 	    if (game.closed)
 		return true;
-	    else
-		goto L19999;
-
-	lampcheck();
+	} else
+	    lampcheck();
 
-    L19999:
 	k=43;
 	if (LIQLOC(game.loc) == WATER)k=70;
 	V1=VOCAB(WD1,-1);