# HG changeset patch # User Gloval # Date 1386185744 -14400 # Node ID 66cbc97b31fad51988f3fc22154b0b3880b804e6 # Parent d8b40e0fa21d2a9e464d98adf4450ae4a0b2e259 fix transparent fonts diff -r d8b40e0fa21d -r 66cbc97b31fa NewUI/Core/UIControlModule_wrap.cxx --- a/NewUI/Core/UIControlModule_wrap.cxx Wed Dec 04 16:10:54 2013 +0600 +++ b/NewUI/Core/UIControlModule_wrap.cxx Wed Dec 04 23:35:44 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 d8b40e0fa21d -r 66cbc97b31fa Render.cpp --- a/Render.cpp Wed Dec 04 16:10:54 2013 +0600 +++ b/Render.cpp Wed Dec 04 23:35:44 2013 +0400 @@ -1215,7 +1215,7 @@ { v2 = 1; LABEL_6: - memcpy(Dst, Src, 0x20u); + memcpy(Dst, Src, sizeof(DDPIXELFORMAT)); return v2; } } @@ -6745,7 +6745,7 @@ unsigned int g = ((c >> 5) & 63) * 4; unsigned int r = ((c >> 11) & 31) * 8; - return 0xFF000000 | (r << 16) | (g << 8) | b; + return (r << 16) | (g << 8) | b;// } //----- (0040DEF3) -------------------------------------------------------- @@ -7105,7 +7105,7 @@ void *pDst = (char *)pTargetSurface + (FORCE_16_BITS ? 2 : 4) * (uX + (y + uY) * uTargetSurfacePitch); memset32(pDst, - FORCE_16_BITS ? twoColors : Color32(uColor16), // two colors per int (16bit) or 1 (32bit) + FORCE_16_BITS ? twoColors : 0xFF000000 |Color32(uColor16), // two colors per int (16bit) or 1 (32bit) uWidth / (FORCE_16_BITS ? 2 : 1)); // two pixels per int (16bit) or 1 (32bit) if (FORCE_16_BITS && uWidth & 1) // we may miss one pixel for 16bit