Skip to content

Commit 8fb38f5

Browse files
committed
Have fontlib_SetFont ignore line spacing with a 100% chance instead of a 99.6% chance.
1 parent e3c6850 commit 8fb38f5

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

src/fontlibc/fontlibc.asm

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ fontlib_SetFont:
408408
; Sets the current font to the data at the pointer given
409409
; Arguments:
410410
; arg0: Pointer to font
411-
; arg1: Load flags
411+
; arg1: Load flags (Ignored, and treated as FONTLIB_IGNORE_LINE_SPACING)
412412
; Returns:
413413
; bool:
414414
; - true if font loaded successfully
@@ -458,18 +458,20 @@ fontlib_SetFont:
458458
add hl,de
459459
add hl,bc
460460
ld (iy + strucFont.bitmapsTablePtr),hl
461-
; Check for the ignore ling spacing flag
462-
ld hl,arg0
463-
add hl,sp
464-
ld a,(hl)
465-
or a,a
466-
jr z,.true
461+
; Check for the ignore line spacing flag
462+
; Due to a bug, flags must be ignored, and treated as FONTLIB_IGNORE_LINE_SPACING
463+
; ld hl,arg1
464+
; add hl,sp
465+
; ld a,(hl)
466+
; or a,a
467+
; jr z,.true
467468
lea hl,iy + strucFont.spaceAbove
468-
xor a
469+
xor a,a
469470
ld (hl),a
470471
inc hl
471472
ld (hl),a
472-
.true: ld a,1
473+
.true:
474+
ld a,1
473475
ret
474476
.false:
475477
xor a,a

src/fontlibc/fontlibc.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ typedef enum {
4949
} fontlib_newline_options_t;
5050

5151
/**
52+
* @warning Flags are currently ignored due to a bug, and treated as FONTLIB_IGNORE_LINE_SPACING
5253
* Options for controlling how SetFont functions.
5354
* @see fontlib_SetFont
5455
*/
@@ -384,9 +385,10 @@ void fontlib_Home();
384385
/**
385386
* Sets the current font
386387
* @param[in] font_data Pointer to font data
387-
* @param[in] flags Information about how to process the font (unused)
388+
* @param[in] Unused and treated as FONTLIB_IGNORE_LINE_SPACING
388389
* @return Returns false if the font seems invalid for any reason
389390
* @warning If false is returned, no valid font is currently loaded and trying
391+
* @note Flags are currently ignored due to a bug, and treated as FONTLIB_IGNORE_LINE_SPACING
390392
* to print will print garbage!
391393
*/
392394
bool fontlib_SetFont(const fontlib_font_t *font_data, fontlib_load_options_t flags);

0 commit comments

Comments
 (0)