From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 12 Mar 2018 03:47:43 +0000 (-0400)
Subject: An attempt to fix GitLab issue #37 failed, but...
X-Git-Tag: 1.5~6
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=f01b3267c87c6d5670aa47e586fde0d622952bae;ds=sidebyside

An attempt to fix GitLab issue #37 failed, but...

...update the condioned-out code to at least make sense with the
current versions of the data structures.
---

diff --git a/main.c b/main.c
index 5cdbcc4..c1ebe0e 100644
--- a/main.c
+++ b/main.c
@@ -1089,10 +1089,10 @@ Lclearobj:
 
 #ifdef BROKEN
         /* Handling of actionless object followed by objectless action */
-        if (preserve.type1 == OBJECT && preserve.type2 == NO_WORD_TYPE && command.id2 == 0)
+        if (preserve.word[0].type == OBJECT && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0 && command.word[0].id == CARRY)
             command.obj = preserve.obj;
-#endif
-
+#endif /* BROKEN */
+	
         ++game.turns;
 
         if (closecheck()) {