Skip to content

Commit

Permalink
Updated Zork to address issue with bad message when opening non-funct…
Browse files Browse the repository at this point in the history
…ional windows.

Addresses this issue:  heasm66/mdlzork#58
And this fix: heasm66/mdlzork#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.
  • Loading branch information
eswenson1 committed Nov 19, 2023
1 parent 7b2ff9a commit 381cc3f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build/zork.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 5 additions & 0 deletions src/lcf/act1.255 → src/lcf/act1.256
Original file line number Diff line number Diff line change
Expand Up @@ -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>>>
Expand Down
4 changes: 4 additions & 0 deletions src/lcf/comp.xxfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ n
<FILE-COMPILE "act1 >">
p
J
<QUIT>
:pcomp
<FLOAD "lcf;comp preamb">
J
<FILE-COMPILE "act2 >">
p
J
Expand Down
8 changes: 4 additions & 4 deletions src/lcf/dung.355 → src/lcf/dung.356
Original file line number Diff line number Diff line change
Expand Up @@ -1509,11 +1509,11 @@ threat to his livelihood."]]!]>
WATER-FUNCTION>

<GOBJECT DWINDOW
["WINDO"]
["DWIND" "WINDO"]
[]
"window"
,OVISON
<>>
DWIND-FUNCTION>

\

Expand Down Expand Up @@ -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>)>
Expand All @@ -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>)>
Expand Down

0 comments on commit 381cc3f

Please sign in to comment.