Skip to content

Fix problem with styled spans inside (collect words) #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dstelzer merged 3 commits into from
Sep 1, 2026
Merged

Fix problem with styled spans inside (collect words) #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c060fe
fix problem with styled spans inside (collect words)
dstelzer Aug 29, 2026
2bfcc80
readme
dstelzer Aug 29, 2026
5504f0e
Merge branch 'main' into z-cwl-div
dstelzer Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ Release notes:
Backend: fixed bug with hex colors (#ff8800) on Z-machine
causing problems for older interpreters.

Backend: colored spans inside (collect words) no longer corrupt
the stack on Z-machine.

Unit test runner: (game over) and (game over $) are
now overridden in unit.dg, to enable testing of win
conditions.
Expand Down
7 changes: 7 additions & 0 deletions src/runtime_z.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@ struct rtroutine rtroutines[] = {
// 0 (param): styles to set for this box class
// 1 (param): styles to unset for this box class
(struct zinstr []) {
{Z_JNZ, {VALUE(REG_FORWORDS)}, 0, RFALSE},

{Z_CALL2N, {ROUTINE(R_AUX_PUSH1), VALUE(REG_STYLE)}}, // Save the previous value of REG_STYLE
{Z_JE, {VALUE(REG_STYLE), SMALL(STYLE_INVISIBLE)}, 0, RFALSE}, // Then if we're currently in an invisible box, don't save anything, the style should remain invisible until we exit the original invisible box

Expand Down Expand Up @@ -794,6 +796,8 @@ struct rtroutine rtroutines[] = {
1,
// 0: previous value of REG_STYLE for checking things
(struct zinstr []) {
{Z_JNZ, {VALUE(REG_FORWORDS)}, 0, RFALSE},

{Z_STORE, {SMALL(REG_LOCAL+0), VALUE(REG_STYLE)}}, // Save the current value of REG_STYLE to check something
{Z_DEC, {SMALL(REG_COLL)}}, // Pull the previous value of REG_STYLE back off the stack
{Z_LOADW, {VALUE(REG_AUXBASE), VALUE(REG_COLL)}, REG_STYLE},
Expand All @@ -813,6 +817,8 @@ struct rtroutine rtroutines[] = {
// 0 (param): foreground color to use
// 1 (param): background color to use
(struct zinstr []) {
{Z_JNZ, {VALUE(REG_FORWORDS)}, 0, RFALSE},

// Push BGCOLOR, then FGCOLOR
{Z_CALL2N, {ROUTINE(R_AUX_PUSH1), VALUE(REG_BGCOLOR)}},
{Z_CALL2N, {ROUTINE(R_AUX_PUSH1), VALUE(REG_FGCOLOR)}},
Expand All @@ -837,6 +843,7 @@ struct rtroutine rtroutines[] = {
// We don't have to do this for styles because that's handled within BEGIN_ and END_ for the boxes and spans, but the Dialog assembler can't pass more than three arguments to a routine (it doesn't support Z_CALLVN2), so we just assemble a separate routine call instead
0,
(struct zinstr []) {
{Z_JNZ, {VALUE(REG_FORWORDS)}, 0, RFALSE},
// Pull FGCOLOR, then BGCOLOR
{Z_DEC, {SMALL(REG_COLL)}},
{Z_LOADW, {VALUE(REG_AUXBASE), VALUE(REG_COLL)}, REG_FGCOLOR},
Expand Down
Loading