From 9f5ebedbfc33f6b5e02c0857790e99819ba751b8fa05f111d265a039607cac30 Mon Sep 17 00:00:00 2001 From: Gabriel Lorenzo Date: Tue, 25 Jan 2005 13:39:14 +0000 Subject: [PATCH] =?UTF-8?q?a=C3=B1adidas=20las=20fuentes=20de=20sistema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dlls/src/dinmem/win32/dinmem.vcproj | 18 +++++- dlls/src/file/win32/file.vcproj | 18 +++++- dlls/src/graphics/graphics.c | 25 +++----- dlls/src/graphics/misc.c | 4 -- dlls/src/graphics/win32/graphics.vcproj | 30 ++++++--- dlls/src/include/export.h | 6 +- dlls/src/input/win32/input.vcproj | 18 +++++- dlls/src/math/win32/math.vcproj | 18 +++++- dlls/src/strings/win32/strings.vcproj | 18 +++++- dlls/src/text/SYS06X08.PCX | Bin 0 -> 11373 bytes dlls/src/text/edivfont.h | 5 +- dlls/src/text/sys06x08_latin1.bmp | Bin 0 -> 18068 bytes dlls/src/text/sys06x08_latin1.h | 81 ++++++++++++++++++++++++ dlls/src/text/sys06x08_msdos.bmp | Bin 0 -> 18068 bytes dlls/src/text/sys06x08_msdos.h | 81 ++++++++++++++++++++++++ dlls/src/text/text.c | 10 +++ dlls/src/text/win32/text.vcproj | 24 ++++++- dlls/src/win32/dlls.sln | 24 +++++-- 18 files changed, 329 insertions(+), 51 deletions(-) create mode 100644 dlls/src/text/SYS06X08.PCX create mode 100644 dlls/src/text/sys06x08_latin1.bmp create mode 100644 dlls/src/text/sys06x08_latin1.h create mode 100644 dlls/src/text/sys06x08_msdos.bmp create mode 100644 dlls/src/text/sys06x08_msdos.h diff --git a/dlls/src/dinmem/win32/dinmem.vcproj b/dlls/src/dinmem/win32/dinmem.vcproj index e60b04c..9b9e793 100644 --- a/dlls/src/dinmem/win32/dinmem.vcproj +++ b/dlls/src/dinmem/win32/dinmem.vcproj @@ -1,7 +1,7 @@ - + @@ -55,8 +55,14 @@ Name="VCResourceCompilerTool"/> + + + + + + + + + @@ -54,8 +54,14 @@ Name="VCResourceCompilerTool"/> + + + + + + + + '9') { - capturef[c]='0'; - c--; - if(cgraphics->ancho,fp->graphics->alto,fp->graphics->bpp,SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_HWACCEL|((fp->graphics->flags&GR_FULLSCREEN)?SDL_FULLSCREEN:0)|((fp->graphics->bpp==8)?SDL_HWPALETTE:0)); if(fp->graphics->bpp==8) - PaletteCopy(temp,screen); + //PaletteCopy(temp,screen); + SDL_SetPalette(screen,SDL_LOGPAL|SDL_PHYSPAL,(SDL_Color*)default_palette,0,256); if(fp->graphics->resflags&GR_CHANGED) { SDL_FreeSurface(screen); diff --git a/dlls/src/graphics/misc.c b/dlls/src/graphics/misc.c index 46c3ee2..235ec06 100644 --- a/dlls/src/graphics/misc.c +++ b/dlls/src/graphics/misc.c @@ -6,7 +6,6 @@ #include "export.h" #include "graphics.h" -#include "default_palette.h" /*! \brief Cambia el modo de la pantalla * \todo ¿más flags? @@ -60,9 +59,6 @@ int eDIV_SET_MODE(FUNCTION_PARAMS) screen=SDL_SetVideoMode(fp->graphics->ancho,fp->graphics->alto,fp->graphics->bpp,SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_HWACCEL|((fp->graphics->flags&GR_FULLSCREEN)?SDL_FULLSCREEN:0)|((fp->graphics->bpp==8)?SDL_HWPALETTE:0)); fp->graphics->buffer=screen->pixels; - if(fp->graphics->bpp==8) - SDL_SetPalette(screen,SDL_LOGPAL|SDL_PHYSPAL,(SDL_Color*)default_palette,0,256); - if ( screen == NULL ) { fp->Critical_Error(7); /* No se pudo inicializar SDL */ return 0; diff --git a/dlls/src/graphics/win32/graphics.vcproj b/dlls/src/graphics/win32/graphics.vcproj index 6950d35..9f8a027 100644 --- a/dlls/src/graphics/win32/graphics.vcproj +++ b/dlls/src/graphics/win32/graphics.vcproj @@ -1,7 +1,7 @@ - + @@ -61,8 +61,14 @@ Name="VCResourceCompilerTool"/> + + + + + + + + - - @@ -150,19 +161,22 @@ + + - - + + + @@ -55,8 +55,14 @@ Name="VCResourceCompilerTool"/> + + + + + + + + + @@ -54,8 +54,14 @@ Name="VCResourceCompilerTool"/> + + + + + + + + + @@ -54,8 +54,14 @@ Name="VCResourceCompilerTool"/> + + + + + + + + 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 NTID6{h(okP`VYO(4)6c~ literal 0 HcmV?d00001 diff --git a/dlls/src/text/edivfont.h b/dlls/src/text/edivfont.h index eca8ad0..1535ef9 100644 --- a/dlls/src/text/edivfont.h +++ b/dlls/src/text/edivfont.h @@ -1,7 +1,8 @@ /* * eDiv Compiler - * Copyleft (C) 2000-2002 Sion Entertainment - * http://www.sion-e.com + * Copyleft (C) 2000-2003 Sion Ltd. + * Copyleft (C) 2005 eDIV Team + * http://ediv.divsite.net * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/dlls/src/text/sys06x08_latin1.bmp b/dlls/src/text/sys06x08_latin1.bmp new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..53b9c1260ca9eb10334c36710e904452e0dce0532252014494946d4596cb64c1 GIT binary patch literal 18068 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 RuMNC5@Y=wiaRc~e{2weaKv)0( literal 0 HcmV?d00001 diff --git a/dlls/src/text/sys06x08_latin1.h b/dlls/src/text/sys06x08_latin1.h new file mode 100644 index 0000000..39333f0 --- /dev/null +++ b/dlls/src/text/sys06x08_latin1.h @@ -0,0 +1,81 @@ +/** + * @file sys06x08_latin1.h + * Definición de la fuente sys06x08_latin1 (generado por builtinfont) + */ + +#ifndef __EDIV__sys06x08_latin1_h__ +#define __EDIV__sys06x08_latin1_h__ + +static unsigned char sys06x08_latin1[256*8] = { +0,0,0,0,0,0,0,0,14,17,27,17,31,17,14,0,14,31,21,31,17,31,14,0,10,31,31,31,14,14, +4,0,4,14,31,31,31,14,4,0,14,14,31,31,31,4,14,0,4,14,31,31,4,4,31,0,0,0,14,14, +14,0,0,0,31,31,17,17,17,31,31,0,31,17,17,17,17,17,31,0,31,31,17,21,17,31,31,0,28,16, +20,2,7,5,7,0,14,10,14,4,4,14,4,0,30,18,30,2,2,3,3,0,31,17,31,18,18,27,27,0, +4,21,14,27,14,21,4,0,3,7,15,31,15,7,3,0,24,28,30,31,30,28,24,0,4,14,31,4,31,14, +4,0,10,10,10,10,10,0,10,0,30,21,22,20,20,20,20,0,24,4,14,10,14,4,3,0,0,0,0,0, +31,17,31,0,4,14,31,4,31,14,31,0,4,14,31,4,4,4,4,0,4,4,4,4,31,14,4,0,0,4, +12,31,12,4,0,0,0,4,6,31,6,4,0,0,0,0,1,1,31,0,0,0,0,10,27,31,27,10,0,0, +0,4,4,14,14,31,31,0,31,31,14,14,4,4,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0, +4,0,10,10,10,0,0,0,0,0,10,10,31,10,31,10,10,0,4,30,5,14,20,15,4,0,3,19,8,4, +2,25,24,0,2,5,5,18,21,9,22,0,6,4,2,0,0,0,0,0,8,4,2,2,2,4,8,0,2,4, +8,8,8,4,2,0,0,4,21,14,21,4,0,0,0,4,4,31,4,4,0,0,0,0,0,0,6,4,2,0, +0,0,0,31,0,0,0,0,0,0,0,0,0,6,6,0,0,16,8,4,2,1,0,0,14,17,25,21,19,17, +14,0,4,6,4,4,4,4,14,0,14,17,16,8,4,2,31,0,31,8,4,8,16,17,14,0,8,12,10,9, +31,8,8,0,31,1,15,16,16,17,14,0,12,2,1,15,17,17,14,0,31,16,8,4,2,2,2,0,14,17, +17,14,17,17,14,0,14,17,17,30,16,8,6,0,0,6,6,0,6,6,0,0,0,6,6,0,6,4,2,0, +8,4,2,1,2,4,8,0,0,0,31,0,31,0,0,0,2,4,8,16,8,4,2,0,14,17,16,8,4,0, +4,0,14,17,16,22,21,21,14,0,14,17,17,31,17,17,17,0,15,17,17,15,17,17,15,0,14,17,1,1, +1,17,14,0,7,9,17,17,17,9,7,0,31,1,1,15,1,1,31,0,31,1,1,15,1,1,1,0,14,17, +1,29,17,17,30,0,17,17,17,31,17,17,17,0,14,4,4,4,4,4,14,0,28,8,8,8,8,9,6,0, +17,9,5,3,5,9,17,0,1,1,1,1,1,1,31,0,17,27,21,17,17,17,17,0,17,19,21,25,17,17, +17,0,14,17,17,17,17,17,14,0,15,17,17,15,1,1,1,0,14,17,17,17,21,9,22,0,15,17,17,15, +5,9,17,0,14,17,1,14,16,17,14,0,31,4,4,4,4,4,4,0,17,17,17,17,17,17,14,0,17,17, +17,17,17,10,4,0,17,17,17,17,21,21,10,0,17,17,10,4,10,17,17,0,17,17,17,10,4,4,4,0, +31,16,8,4,2,1,31,0,14,2,2,2,2,2,14,0,0,1,2,4,8,16,0,0,14,8,8,8,8,8, +14,0,4,10,17,0,0,0,0,0,0,0,0,0,0,0,31,0,4,4,4,0,0,0,0,0,0,0,14,16, +30,17,30,0,1,1,13,19,17,17,15,0,0,0,14,1,1,17,14,0,16,16,22,25,17,17,30,0,0,0, +14,17,31,1,14,0,24,4,14,4,4,4,4,0,0,0,30,17,17,30,16,14,1,1,13,19,17,17,17,0, +4,0,6,4,4,4,14,0,8,0,12,8,8,9,6,0,2,2,18,10,6,10,18,0,6,4,4,4,4,4, +14,0,0,0,11,21,21,17,17,0,0,0,13,19,17,17,17,0,0,0,14,17,17,17,14,0,0,0,15,17, +17,15,1,1,0,0,30,17,17,30,16,16,0,0,13,19,1,1,1,0,0,0,30,1,14,16,15,0,0,2, +7,2,2,18,12,0,0,0,17,17,17,25,22,0,0,0,17,17,17,10,4,0,0,0,17,17,21,21,10,0, +0,0,19,12,4,6,25,0,0,0,17,17,17,30,16,14,0,0,31,8,4,2,31,0,24,4,4,3,4,4, +24,0,4,4,4,4,4,4,4,0,3,4,4,24,4,4,3,0,0,0,0,22,13,0,0,0,31,17,17,17, +17,17,31,0,12,18,2,15,2,18,12,0,31,17,17,17,17,17,31,0,0,0,0,0,6,4,2,0,8,20, +4,14,4,5,2,0,0,0,0,0,27,18,9,0,0,0,0,0,0,21,21,0,4,4,31,4,4,4,4,0, +4,31,4,4,4,31,4,0,4,10,0,0,0,0,0,0,3,19,8,4,58,57,0,0,10,4,30,1,14,16, +15,0,0,8,4,2,4,8,0,0,30,5,5,29,5,5,30,0,31,17,17,17,17,17,31,0,10,4,31,8, +4,2,31,0,31,17,17,17,17,17,31,0,31,17,17,17,17,17,31,0,4,2,6,0,0,0,0,0,6,4, +2,0,0,0,0,0,18,9,27,0,0,0,0,0,27,18,9,0,0,0,0,0,0,0,6,15,15,6,0,0, +0,0,0,14,0,0,0,0,0,0,0,31,0,0,0,0,22,13,0,0,0,0,0,0,31,26,26,0,0,0, +0,0,10,4,30,1,14,16,15,0,0,2,4,8,4,2,0,0,0,0,14,21,29,5,30,0,31,17,17,17, +17,17,31,0,10,4,31,8,4,2,31,0,17,0,17,17,10,4,4,0,0,0,0,0,0,0,0,0,4,0, +4,4,4,4,4,0,4,4,30,1,30,4,4,0,12,18,2,15,2,2,31,0,0,17,14,10,14,17,0,0, +17,10,31,4,31,4,4,0,4,4,4,0,4,4,4,0,24,4,14,10,14,4,3,0,17,0,0,0,0,0, +0,0,12,18,45,37,45,18,12,0,12,10,28,0,31,0,0,0,0,20,10,5,10,20,0,0,0,0,0,31, +16,16,0,0,0,0,0,14,0,0,0,0,12,18,45,37,37,18,12,0,31,0,0,0,0,0,0,0,12,18, +18,12,0,0,0,0,4,14,4,0,14,0,0,0,12,8,4,12,0,0,0,0,12,8,8,12,0,0,0,0, +8,4,0,0,0,0,0,0,0,0,17,17,19,13,1,1,30,21,22,20,20,20,20,0,0,0,0,4,0,0, +0,0,0,0,0,0,0,0,8,6,4,6,4,4,0,0,0,0,14,10,14,0,31,0,0,0,0,5,10,20, +10,5,0,0,17,9,5,18,21,28,16,0,17,9,5,26,17,8,24,0,3,18,11,36,42,57,32,0,4,0, +4,2,1,17,14,0,2,4,14,17,31,17,17,0,8,4,14,17,31,17,17,0,14,17,14,17,31,17,17,0, +14,0,14,17,31,17,17,0,17,14,17,31,17,17,17,0,14,10,14,17,31,17,17,0,28,6,5,31,5,5, +29,0,0,14,1,17,14,8,6,0,6,31,1,15,1,1,31,0,12,31,1,15,1,1,31,0,4,10,31,1, +15,1,31,0,17,0,31,1,15,1,31,0,6,14,4,4,4,4,14,0,12,14,4,4,4,4,14,0,14,17, +14,4,4,4,14,0,10,0,14,4,4,4,14,0,14,18,18,23,18,18,14,0,31,0,19,21,25,17,17,0, +6,14,17,17,17,17,14,0,12,14,17,17,17,17,14,0,14,17,14,17,17,17,14,0,14,0,14,17,17,17, +14,0,17,0,14,17,17,17,14,0,0,0,10,4,10,0,0,0,16,14,25,21,19,14,1,0,2,4,17,17, +17,17,14,0,8,4,17,17,17,17,14,0,4,10,0,17,17,17,14,0,17,0,17,17,17,17,14,0,8,4, +17,17,10,4,4,0,0,2,14,18,18,14,2,0,6,9,5,9,17,17,13,0,2,4,14,16,30,17,30,0, +8,4,14,16,30,17,30,0,14,17,14,16,30,17,30,0,14,0,14,16,30,17,30,0,17,0,14,16,30,17, +30,0,14,10,14,16,30,17,30,0,0,0,15,20,30,5,30,0,0,0,30,1,30,8,6,0,2,4,14,17, +31,1,14,0,8,4,14,17,31,1,14,0,14,17,14,17,31,1,14,0,17,0,14,17,31,1,14,0,2,4, +6,4,4,4,14,0,8,4,6,4,4,4,14,0,14,17,6,4,4,4,14,0,17,0,6,4,4,4,14,0, +10,6,8,14,17,17,14,0,31,0,13,19,17,17,17,0,2,4,14,17,17,17,14,0,8,4,14,17,17,17, +14,0,14,17,14,17,17,17,14,0,14,0,14,17,17,17,14,0,17,0,14,17,17,17,14,0,6,6,0,15, +0,6,6,0,16,8,14,21,21,14,3,0,2,4,17,17,17,25,22,0,8,4,17,17,17,25,22,0,14,17, +0,17,17,25,22,0,17,0,17,17,17,25,22,0,8,4,17,18,12,4,3,0,0,2,2,14,18,14,2,2, +17,0,17,18,12,4,3,0 +}; + +#endif /*__EDIV__sys06x08_latin1_h__*/ diff --git a/dlls/src/text/sys06x08_msdos.bmp b/dlls/src/text/sys06x08_msdos.bmp new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..82d72d7a97576665577d85d9637fdb3322b89f53b8b00267eac4abe126ebd11a GIT binary patch literal 18068 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 literal 0 HcmV?d00001 diff --git a/dlls/src/text/sys06x08_msdos.h b/dlls/src/text/sys06x08_msdos.h new file mode 100644 index 0000000..c74e0f2 --- /dev/null +++ b/dlls/src/text/sys06x08_msdos.h @@ -0,0 +1,81 @@ +/** + * @file sys06x08_msdos.h + * Definición de la fuente sys06x08_msdos (generado por builtinfont) + */ + +#ifndef __EDIV__sys06x08_msdos_h__ +#define __EDIV__sys06x08_msdos_h__ + +static unsigned char sys06x08_msdos[256*8] = { +0,0,0,0,0,0,0,0,14,17,27,17,31,17,14,0,14,31,21,31,17,31,14,0,10,31,31,31,14,14, +4,0,4,14,31,31,31,14,4,0,14,14,31,31,31,4,14,0,4,14,31,31,4,4,31,0,0,0,14,14, +14,0,0,0,31,31,17,17,17,31,31,0,31,17,17,17,17,17,31,0,31,31,17,21,17,31,31,0,28,16, +20,2,7,5,7,0,14,10,14,4,4,14,4,0,30,18,30,2,2,3,3,0,31,17,31,18,18,27,27,0, +4,21,14,27,14,21,4,0,3,7,15,31,15,7,3,0,24,28,30,31,30,28,24,0,4,14,31,4,31,14, +4,0,10,10,10,10,10,0,10,0,30,21,22,20,20,20,20,0,24,4,14,10,14,4,3,0,0,0,0,0, +31,17,31,0,4,14,31,4,31,14,31,0,4,14,31,4,4,4,4,0,4,4,4,4,31,14,4,0,0,4, +12,31,12,4,0,0,0,4,6,31,6,4,0,0,0,0,1,1,31,0,0,0,0,10,27,31,27,10,0,0, +0,4,4,14,14,31,31,0,31,31,14,14,4,4,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0, +4,0,10,10,10,0,0,0,0,0,10,10,31,10,31,10,10,0,4,30,5,14,20,15,4,0,3,19,8,4, +2,25,24,0,2,5,5,18,21,9,22,0,6,4,2,0,0,0,0,0,8,4,2,2,2,4,8,0,2,4, +8,8,8,4,2,0,0,4,21,14,21,4,0,0,0,4,4,31,4,4,0,0,0,0,0,0,6,4,2,0, +0,0,0,31,0,0,0,0,0,0,0,0,0,6,6,0,0,16,8,4,2,1,0,0,14,17,25,21,19,17, +14,0,4,6,4,4,4,4,14,0,14,17,16,8,4,2,31,0,31,8,4,8,16,17,14,0,8,12,10,9, +31,8,8,0,31,1,15,16,16,17,14,0,12,2,1,15,17,17,14,0,31,16,8,4,2,2,2,0,14,17, +17,14,17,17,14,0,14,17,17,30,16,8,6,0,0,6,6,0,6,6,0,0,0,6,6,0,6,4,2,0, +8,4,2,1,2,4,8,0,0,0,31,0,31,0,0,0,2,4,8,16,8,4,2,0,14,17,16,8,4,0, +4,0,14,17,16,22,21,21,14,0,14,17,17,31,17,17,17,0,15,17,17,15,17,17,15,0,14,17,1,1, +1,17,14,0,7,9,17,17,17,9,7,0,31,1,1,15,1,1,31,0,31,1,1,15,1,1,1,0,14,17, +1,29,17,17,30,0,17,17,17,31,17,17,17,0,14,4,4,4,4,4,14,0,28,8,8,8,8,9,6,0, +17,9,5,3,5,9,17,0,1,1,1,1,1,1,31,0,17,27,21,17,17,17,17,0,17,19,21,25,17,17, +17,0,14,17,17,17,17,17,14,0,15,17,17,15,1,1,1,0,14,17,17,17,21,9,22,0,15,17,17,15, +5,9,17,0,14,17,1,14,16,17,14,0,31,4,4,4,4,4,4,0,17,17,17,17,17,17,14,0,17,17, +17,17,17,10,4,0,17,17,17,17,21,21,10,0,17,17,10,4,10,17,17,0,17,17,17,10,4,4,4,0, +31,16,8,4,2,1,31,0,14,2,2,2,2,2,14,0,0,1,2,4,8,16,0,0,14,8,8,8,8,8, +14,0,4,10,17,0,0,0,0,0,0,0,0,0,0,0,31,0,4,4,4,0,0,0,0,0,0,0,14,16, +30,17,30,0,1,1,13,19,17,17,15,0,0,0,14,1,1,17,14,0,16,16,22,25,17,17,30,0,0,0, +14,17,31,1,14,0,24,4,14,4,4,4,4,0,0,0,30,17,17,30,16,14,1,1,13,19,17,17,17,0, +4,0,6,4,4,4,14,0,8,0,12,8,8,9,6,0,2,2,18,10,6,10,18,0,6,4,4,4,4,4, +14,0,0,0,11,21,21,17,17,0,0,0,13,19,17,17,17,0,0,0,14,17,17,17,14,0,0,0,15,17, +17,15,1,1,0,0,30,17,17,30,16,16,0,0,13,19,1,1,1,0,0,0,30,1,14,16,15,0,0,2, +7,2,2,18,12,0,0,0,17,17,17,25,22,0,0,0,17,17,17,10,4,0,0,0,17,17,21,21,10,0, +0,0,19,12,4,6,25,0,0,0,17,17,17,30,16,14,0,0,31,8,4,2,31,0,24,4,4,3,4,4, +24,0,4,4,4,0,4,4,4,0,3,4,4,24,4,4,3,0,22,13,0,0,0,0,0,0,0,4,10,17, +17,17,31,0,0,0,30,1,30,8,6,0,17,0,17,17,17,25,22,0,8,4,14,17,31,1,14,0,14,17, +14,16,30,17,30,0,17,0,14,16,30,17,30,0,2,4,14,16,30,17,30,0,4,4,14,16,30,17,30,0, +0,14,1,17,14,8,6,0,14,17,14,17,31,1,14,0,17,0,14,17,31,1,14,0,2,4,14,17,31,1, +14,0,17,0,6,4,4,4,14,0,14,17,6,4,4,4,14,0,2,4,6,4,4,4,14,0,17,14,17,31, +17,17,17,0,4,14,17,31,17,17,17,0,12,31,1,15,1,1,31,0,31,4,4,14,5,5,30,0,28,6, +5,31,5,5,29,0,14,17,14,17,17,17,14,0,17,0,14,17,17,17,14,0,2,4,14,17,17,17,14,0, +14,17,0,17,17,25,22,0,2,4,17,17,17,25,22,0,17,0,17,18,12,4,3,0,17,4,10,17,17,10, +4,0,17,0,17,17,17,17,14,0,4,4,30,1,30,4,4,0,12,18,2,15,2,2,31,0,17,10,31,4, +31,4,4,0,3,5,5,11,29,9,25,0,8,20,4,14,4,5,2,0,8,4,14,16,30,17,30,0,8,4, +6,4,4,4,14,0,8,4,14,17,17,17,14,0,8,4,17,17,17,25,22,0,31,0,13,19,17,17,17,0, +31,0,19,21,25,17,17,0,12,10,28,0,31,0,0,0,14,10,14,0,31,0,0,0,4,0,4,2,1,17, +14,0,0,0,0,31,1,1,0,0,0,0,0,31,16,16,0,0,17,9,5,26,17,8,24,0,17,9,5,18, +21,28,16,0,4,0,4,4,4,4,4,0,0,20,10,5,10,20,0,0,0,5,10,20,10,5,0,0,21,0, +42,0,21,0,42,0,21,42,21,42,21,42,21,42,63,21,63,42,63,21,63,42,4,4,4,4,4,4,4,4, +4,4,4,7,4,4,4,4,4,4,7,4,7,4,4,4,10,10,10,11,10,10,10,10,0,0,0,15,10,10, +10,10,0,0,7,4,7,4,4,4,10,10,11,8,11,10,10,10,10,10,10,10,10,10,10,10,0,0,15,8, +11,10,10,10,10,10,11,8,15,0,0,0,10,10,10,15,0,0,0,0,4,4,7,4,7,0,0,0,0,0, +0,7,4,4,4,4,4,4,4,60,0,0,0,0,4,4,4,63,0,0,0,0,0,0,0,63,4,4,4,4, +4,4,4,60,4,4,4,4,0,0,0,63,0,0,0,0,4,4,4,63,4,4,4,4,4,4,60,4,60,4, +4,4,10,10,10,58,10,10,10,10,10,10,58,2,62,0,0,0,0,0,62,2,58,10,10,10,10,10,59,0, +63,0,0,0,0,0,63,0,59,10,10,10,10,10,58,2,58,10,10,10,0,0,63,0,63,0,0,0,10,10, +59,0,59,10,10,10,4,4,63,0,63,0,0,0,10,10,10,63,0,0,0,0,0,0,63,0,63,4,4,4, +0,0,0,63,10,10,10,10,10,10,10,62,0,0,0,0,4,4,60,4,60,0,0,0,0,0,60,4,60,4, +4,4,0,0,0,62,10,10,10,10,10,10,10,63,10,10,10,10,4,4,63,4,63,4,4,4,4,4,4,7, +0,0,0,0,0,0,0,60,4,4,4,4,63,63,63,63,63,63,63,63,0,0,0,0,63,63,63,63,7,7, +7,7,7,7,7,7,56,56,56,56,56,56,56,56,63,63,63,63,0,0,0,0,0,0,22,9,9,9,22,0, +6,9,5,9,17,17,13,0,31,17,17,1,1,1,1,0,0,0,0,31,10,10,10,0,31,17,2,4,2,17, +31,0,0,0,0,30,9,9,6,0,17,17,17,19,13,1,1,0,0,6,29,4,4,4,4,0,14,4,10,17, +10,4,14,0,0,14,17,31,17,17,14,0,0,14,17,17,17,10,27,0,12,2,4,14,17,17,14,0,0,0, +14,21,21,14,0,0,16,8,14,21,21,14,3,0,4,4,28,4,4,8,16,0,14,17,17,17,17,17,17,0, +0,31,0,31,0,31,0,0,4,14,4,0,14,0,0,0,2,4,8,4,2,0,31,0,8,4,2,4,8,0, +31,0,8,20,20,4,4,4,4,4,4,4,4,4,5,5,2,0,6,6,0,15,0,6,6,0,0,22,9,0, +22,9,0,0,12,18,18,12,0,0,0,0,12,12,0,0,0,0,0,0,0,0,0,4,0,0,0,0,24,8, +8,9,10,12,8,0,6,10,10,0,0,0,0,0,12,8,4,12,0,0,0,0,0,14,14,14,14,14,0,0, +0,0,0,0,0,0,0,0 +}; + +#endif /*__EDIV__sys06x08_msdos_h__*/ diff --git a/dlls/src/text/text.c b/dlls/src/text/text.c index 7518d23..98d3375 100644 --- a/dlls/src/text/text.c +++ b/dlls/src/text/text.c @@ -4,7 +4,9 @@ #include "edivfont.h" #include "text.h" +#include "sys06x08_latin1.h" +#define sys06x08 sys06x08_latin1 #define MAX_FONTS 0xFF #define MAX_WRITES 0xFFF @@ -49,6 +51,7 @@ int eDiv_LoadFnt(FUNCTION_PARAMS) int i ; fpos_t pos ; const char *filename=getstrparm(); /* Fichero a cargar */ + SDL_Surface* temp; for ( i = 1 ; i <= MAX_FONTS ; i++ ) { @@ -77,6 +80,13 @@ int eDiv_LoadFnt(FUNCTION_PARAMS) fprintf(fichero , "Leidos %d bytes\n" , (int)fread( pool , 1 , fuente_control_s[i].size_imagen , fuente ) ) ; fuente_control_s[i].imagen = SDL_CreateRGBSurfaceFrom( pool , fuente_control_s[i].w , fuente_control_s[i].h , fuente_control_s[i].bytespp * 8 , fuente_control_s[i].w * fuente_control_s[i].bytespp , 0 , 0 , 0, 0 ) ; + /* Convierte la fuente al formato actual de la pantalla */ + temp=SDL_DisplayFormat(fuente_control_s[i].imagen); + if(temp) { + SDL_FreeSurface(fuente_control_s[i].imagen); + fuente_control_s[i].imagen=temp; + } + fclose(fuente) ; fclose(fichero) ; diff --git a/dlls/src/text/win32/text.vcproj b/dlls/src/text/win32/text.vcproj index fbdf673..a3c0302 100644 --- a/dlls/src/text/win32/text.vcproj +++ b/dlls/src/text/win32/text.vcproj @@ -1,7 +1,7 @@ - + @@ -47,15 +47,25 @@ + Name="VCPreBuildEventTool" + CommandLine="cd .. +..\..\..\util\bin\builtinfont.exe sys06x08_msdos.bmp +..\..\..\util\bin\builtinfont.exe sys06x08_latin1.bmp +"/> + + + + + + + +