Mercurial > mm7

changeset 1579:5a65334a5d58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Beri Levi berilevi@gmail.com
date Tue, 10 Sep 2013 19:34:00 +0300
parents 56cc81b1ed49 (diff) 1b6217e07b26 (current diff)
children a5fdf6cf8d74 cff02d7d3460
files
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Log.cpp	Tue Sep 10 18:43:52 2013 +0200
+++ b/Log.cpp	Tue Sep 10 19:34:00 2013 +0300
@@ -26,8 +26,8 @@
   va_end(args);
 
   DWORD w;
-  WriteConsole(hStdOut, pMsg, lstrlenW(pMsg), &w, nullptr);
-  WriteConsole(hStdOut, L"\r\n", 2, &w, nullptr);
+  WriteConsoleW(hStdOut, pMsg, lstrlenW(pMsg), &w, nullptr);
+  WriteConsoleW(hStdOut, L"\r\n", 2, &w, nullptr);
 }
 //----- (004BE386) --------------------------------------------------------
 void __fastcall log_error(const char *pMessage)
--- a/Render.cpp	Tue Sep 10 18:43:52 2013 +0200
+++ b/Render.cpp	Tue Sep 10 19:34:00 2013 +0300
@@ -6453,7 +6453,7 @@
       Error("HiScreen16::LoadTexture - D3Drend->CreateTexture() failed: %x", 0);
     //v10 = *pOutSurface;
     //v11 = 0;
-    if ( bMipMaps )
+    if (bMipMaps)
     {
       Dst._450DDE();
       //v20 = 0;
@@ -6472,7 +6472,7 @@
 
         if ( LockSurface_DDraw4(pNextSurf, &desc, DDLOCK_WAIT | DDLOCK_WRITEONLY) )
         {
-          Dst.sub_451007_scale_image_bicubic(
+          /*Dst.sub_451007_scale_image_bicubic(
             pHWLTexture->pPixels,
             pHWLTexture->uWidth,
             pHWLTexture->uHeight,
@@ -6482,7 +6482,7 @@
             desc.dwHeight,
             desc.lPitch >> 1,
             0,
-            0);
+            0);*/
           ErrD3D(pNextSurf->Unlock(0));
           //bMipMaps = 0x4D86ACu;
         }