Skip to content
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

Jump to bottom

GeoFrotz: Fixed output of german umlauts #481

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+10 −14
Open

GeoFrotz: Fixed output of german umlauts #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c56aa78
Disabled reading of the extension header, because of a bug in LOW_WOR…
Feb 29, 2024
adb908c
Enabled conversion for non-latin1-chars. So german umlauts now be pri…
Feb 29, 2024
33339b1
Accent character handling was enabled (Latin1 To ASCII conversion) be…
Mar 1, 2024
8230473
get_header_extension internally disabled because reading fails and le…
Mar 1, 2024
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
17 changes: 4 additions & 13 deletions Appl/Breadbox/frotz/Geos/gtext.goc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-------- -------- -----------
98-06-06 GerdB Initial Version.
2024-01-02 RainerB Fix a lot of compiler warnings.
2024-02-29 Bariossimo Enabled Latin1 To ASCII-Conversion

***********************************************************************/

Expand Down Expand Up @@ -447,10 +448,8 @@ void os_display_char (zchar c)
int width = os_char_width (c);

/* Handle accented characters */
#if 0

if (c >= ZC_LATIN1_MIN && (story_id != BEYOND_ZORK || (h_flags & GRAPHICS_FLAG)))
if (display == _CGA_ || display == _MCGA_) {
if (c >= ZC_LATIN1_MIN && (story_id != BEYOND_ZORK || (h_flags & GRAPHICS_FLAG))) {


char *ptr = latin1_to_ascii + 3 * (c - ZC_LATIN1_MIN);

Expand All @@ -467,15 +466,7 @@ void os_display_char (zchar c)

return;

} else if (display == _AMIGA_ && current_font == TEXT_FONT && !(current_style & FIXED_WIDTH_STYLE) && user_font != 0) {

if (c >= ZC_LATIN1_MIN)
c -= 32;

} else
c = latin1_to_ibm[c - ZC_LATIN1_MIN];

#endif
}

/* Handle special indentations */
if (c == ZC_INDENT) {
Expand Down
7 changes: 6 additions & 1 deletion Appl/Breadbox/frotz/Lowlev/fastmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ zword get_header_extension (int entry)
zword addr;
zword val;

if (h_extension_table == 0 || entry > hx_table_size)
/* if (h_extension_table == 0 || entry > hx_table_size) */

/* 29.02.24 Bariossimo:
Reading of h_extension_table-Entries fails in GEOS.
LOW_WORD (addr, val) reads random values to val
Because of that, use of extension_table was disabled */
return 0;

addr = h_extension_table + 2 * entry;
Expand Down