# HG changeset patch # User Gloval # Date 1386132624 -14400 # Node ID 38bf1c70fc7015571829eea453c3c715b453576d # Parent 2737276390fff39b3ded7ff86f233dd0a93839af some text rendering fix diff -r 2737276390ff -r 38bf1c70fc70 GUIFont.cpp --- a/GUIFont.cpp Tue Dec 03 21:30:40 2013 +0200 +++ b/GUIFont.cpp Wed Dec 04 08:50:24 2013 +0400 @@ -192,7 +192,7 @@ if ( char_pxl ) { if ( char_pxl == 1 ) - *draw_buff = pFontPalette[1]; + *draw_buff = pFontPalette[1]; else *draw_buff = draw_color; } diff -r 2737276390ff -r 38bf1c70fc70 NewUI/Core/UIControlModule_wrap.cxx --- a/NewUI/Core/UIControlModule_wrap.cxx Tue Dec 03 21:30:40 2013 +0200 +++ b/NewUI/Core/UIControlModule_wrap.cxx Wed Dec 04 08:50:24 2013 +0400 @@ -726,7 +726,7 @@ * type checking. * ----------------------------------------------------------------------------- */ -#include "lib/lua/lua.h" +#include "../../lib/lua/lua.h" #ifdef __cplusplus extern "C" { #endif diff -r 2737276390ff -r 38bf1c70fc70 Render.cpp --- a/Render.cpp Tue Dec 03 21:30:40 2013 +0200 +++ b/Render.cpp Wed Dec 04 08:50:24 2013 +0400 @@ -7114,7 +7114,9 @@ } //----- (004A6C4F) -------------------------------------------------------- -void Render::DrawText(signed int uOutX, signed int uOutY, unsigned __int8 *pFontPixels, unsigned int uCharWidth, unsigned int uCharHeight, unsigned __int16 *pFontPalette, unsigned __int16 uFaceColor, unsigned __int16 uShadowColor) +void Render::DrawText(signed int uOutX, signed int uOutY, unsigned __int8 *pFontPixels, unsigned int uCharWidth, + unsigned int uCharHeight, unsigned __int16 *pFontPalette, + unsigned __int16 uFaceColor, unsigned __int16 uShadowColor) { unsigned int v9; // edi@2 unsigned int v10; // esi@2 @@ -7195,10 +7197,11 @@ v22 = uShadowColor; if ( *v24 != 1 ) v22 = uFaceColor; - WritePixel16(clipped_out_x + x, clipped_out_y + y, v22); + WritePixel16(clipped_out_x + x, clipped_out_y + y, v22); } - } - v24 += uCharWidth - v9; + ++v24; + } + v24 += uCharWidth - v9; //v23 = uOutXa-- == 1; //v11 += this->uTargetSurfacePitch - v9; } diff -r 2737276390ff -r 38bf1c70fc70 UI/UiGame.cpp --- a/UI/UiGame.cpp Tue Dec 03 21:30:40 2013 +0200 +++ b/UI/UiGame.cpp Wed Dec 04 08:50:24 2013 +0400 @@ -31,7 +31,7 @@ #include "..\texts.h" #include "UIHouses.h" #include "..\BSPModel.h" -#include "OurMath.h" +#include "..\OurMath.h" #include "..\Level/Decoration.h"