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 5cdbcc48e488047da5f7feea1e62b0f7f34e5c4e..c1ebe0e0583bb6410b86102f8b5733aa42fcf1aa 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1089,10 +1089,10 @@ Lclearobj:
 
 #ifdef BROKEN
         /* Handling of actionless object followed by objectless action */
 
 #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;
             command.obj = preserve.obj;

-#endif
-
+#endif /* BROKEN */
+       

         ++game.turns;
 
         if (closecheck()) {
         ++game.turns;
 
         if (closecheck()) {