From 381cc3fb1c8ee585d47885cf12cf467ea7175725 Mon Sep 17 00:00:00 2001
From: Eric Swenson <eric@swenson.org>
Date: Sat, 18 Nov 2023 10:52:38 -0800
Subject: [PATCH] Updated Zork to address issue with bad message when opening
 non-functional windows.

Addresses this issue:  https://github.com/heasm66/mdlzork/issues/58
And this fix: https://github.com/heasm66/mdlzork/pull/59

Also updated lcf/comp.xxfile so that it doesn't fail during ACT2 build.  Seems
the occasional failures during zork build can be mitigated by breaking up some
of the compiles into separate jobs.
---
 build/zork.tcl                 | 4 ++--
 src/lcf/{act1.255 => act1.256} | 5 +++++
 src/lcf/comp.xxfile            | 4 ++++
 src/lcf/{dung.355 => dung.356} | 8 ++++----
 4 files changed, 15 insertions(+), 6 deletions(-)
 rename src/lcf/{act1.255 => act1.256} (99%)
 rename src/lcf/{dung.355 => dung.356} (99%)

diff --git a/build/zork.tcl b/build/zork.tcl
index 3b5c325c3..f323b974d 100644
--- a/build/zork.tcl
+++ b/build/zork.tcl
@@ -11,12 +11,12 @@ respond "*" ":link sys1;ts zork, sys; ts rbye\r"
 
 mkdir "cfs"
 
-respond "*" ":xxfile lcf;comp log_lcf;comp xxfile\r"
+respond "*" ":xxfile tty:_lcf;comp xxfile\r"
 expect -timeout 6000 "Job XXFILE interrupted: .VALUE;"
 type "\033p"
 expect ":KILL"
 
-respond "*"  ":xxfile lcf;zork log_lcf;zork xxfile\r"
+respond "*"  ":xxfile tty:_lcf;zork xxfile\r"
 expect "Job XXFILE interrupted: .VALUE;"
 type "\033p"
 expect ":KILL"
diff --git a/src/lcf/act1.255 b/src/lcf/act1.256
similarity index 99%
rename from src/lcf/act1.255
rename to src/lcf/act1.256
index 1bd609f8e..521ad5f60 100644
--- a/src/lcf/act1.255
+++ b/src/lcf/act1.256
@@ -1661,6 +1661,11 @@ probably).">
 	  (<VERB? "MUNG">
 	   <TELL <PICK-ONE ,DOORMUNGS>>)>>
 
+<DEFINE DWIND-FUNCTION ()
+    <COND (<VERB? "OPEN">
+           <TELL
+"The window cannot be opened.">)>>
+
 <DEFINE PUMPER ("AUX" (P <SFIND-OBJ "PUMP">))
   <COND (<OR <IN-ROOM? .P>
 	     <MEMQ .P <AOBJS ,WINNER>>>
diff --git a/src/lcf/comp.xxfile b/src/lcf/comp.xxfile
index c2622a8c6..710cf8ee1 100644
--- a/src/lcf/comp.xxfile
+++ b/src/lcf/comp.xxfile
@@ -37,6 +37,10 @@ n
 <FILE-COMPILE "act1 >">
 p
 J
+<QUIT>
+:pcomp
+<FLOAD "lcf;comp preamb">
+J
 <FILE-COMPILE "act2 >">
 p
 J
diff --git a/src/lcf/dung.355 b/src/lcf/dung.356
similarity index 99%
rename from src/lcf/dung.355
rename to src/lcf/dung.356
index 26abd71e5..9317fdf48 100644
--- a/src/lcf/dung.355
+++ b/src/lcf/dung.356
@@ -1509,11 +1509,11 @@ threat to his livelihood."]]!]>
 	 WATER-FUNCTION>
 
 <GOBJECT DWINDOW
-	 ["WINDO"]
+	 ["DWIND" "WINDO"]
 	 []
 	 "window"
 	 ,OVISON
-	 <>>
+	 DWIND-FUNCTION>
 
 \
 
@@ -1597,7 +1597,7 @@ and all the windows are barred."
        "North of House"
        <EXIT "WEST" "WHOUS" "EAST" "EHOUS" "NORTH" "FORE3"
 	      "SOUTH" #NEXIT "The windows are all barred.">
-       ()
+       (<GET-OBJ "DWIND">)
        <>
        <+ ,RLANDBIT ,RLIGHTBIT ,RNWALLBIT ,RSACREDBIT>
        (RGLOBAL <+ ,DWINDOW ,HOUSEBIT>)>
@@ -1608,7 +1608,7 @@ and all the windows are barred."
        "South of House"
        <EXIT "WEST" "WHOUS" "EAST" "EHOUS" "SOUTH" "FORE2"
 	      "NORTH" #NEXIT "The windows are all barred.">
-       ()
+       (<GET-OBJ "DWIND">)
        <>
        <+ ,RLANDBIT ,RLIGHTBIT ,RNWALLBIT ,RSACREDBIT>
        (RGLOBAL <+ ,DWINDOW ,HOUSEBIT>)>