Mercurial > mm7

changeset 2073:38bf1c70fc70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some text rendering fix
author Gloval
date Wed, 04 Dec 2013 08:50:24 +0400
parents 2737276390ff
children 121316212c1c
files GUIFont.cpp NewUI/Core/UIControlModule_wrap.cxx Render.cpp UI/UiGame.cpp
diffstat 4 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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;         
                 }
--- 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
--- 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;
     }
--- 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"