# HG changeset patch
# User Beri Levi berilevi@gmail.com
# Date 1378830840 -10800
# Node ID 5a65334a5d58938d11659fe1eef14eb463ed3a32
# Parent  56cc81b1ed49a9d706ac30c2de90979a80494109# Parent  1b6217e07b26008d541ca1cf7f9a1bef21d9a7c9
merge

diff -r 1b6217e07b26 -r 5a65334a5d58 Log.cpp
--- 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)
diff -r 1b6217e07b26 -r 5a65334a5d58 Render.cpp
--- 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;
         }