From 87d89cab907d556c2a78fae758555090e9088bed Mon Sep 17 00:00:00 2001 From: "Andrey Halyavin (halyavin)" Date: Wed, 16 Nov 2005 09:35:22 +0000 Subject: [PATCH] Fixed displaying of second font. New fonts are required. You can download them at http://shade.msu.ru/~msu-se/temp/char.7z git-svn-id: svn://kolibrios.org@24 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/gui/font.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/kernel/trunk/gui/font.inc b/kernel/trunk/gui/font.inc index dcf7f03bc6..1bccb1ea30 100644 --- a/kernel/trunk/gui/font.inc +++ b/kernel/trunk/gui/font.inc @@ -122,9 +122,9 @@ drawletter2: ;result - eax=eax+sym_size pushad call [disable_mouse] + shl edx,1 mov esi,9 - lea ebp,[0x3EC00+8*edx+edx] - push dword -1 ;size + lea ebp,[0x3EC00+4*edx+edx+1] .symloop: push esi mov dl,byte [ebp] @@ -132,10 +132,6 @@ drawletter2: .pixloop: test dl,1 jz .nopix - cmp [esp+4],esi - jge .no_inc - mov [esp+4],esi -.no_inc: call [putpixel] .nopix: shr dl,1 @@ -149,12 +145,7 @@ drawletter2: inc ebp dec esi jnz .symloop - pop edx - test edx,edx - jge .nospace - mov edx,4 -.nospace: - add edx,2 + movzx edx,byte [ebp-10] add [esp+32-4],edx popad ret \ No newline at end of file