# HG changeset patch
# User Nomad
# Date 1378840086 -7200
# Node ID cff02d7d3460ce172fceba0241433fe8d8155880
# Parent  75fafd8ced59b8d413ec509c5ee479af0a542802# Parent  5a65334a5d58938d11659fe1eef14eb463ed3a32
Merge

diff -r 75fafd8ced59 -r cff02d7d3460 Log.cpp
--- a/Log.cpp	Tue Sep 10 21:07:07 2013 +0200
+++ b/Log.cpp	Tue Sep 10 21:08:06 2013 +0200
@@ -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 75fafd8ced59 -r cff02d7d3460 Render.cpp
--- a/Render.cpp	Tue Sep 10 21:07:07 2013 +0200
+++ b/Render.cpp	Tue Sep 10 21:08:06 2013 +0200
@@ -6451,7 +6451,7 @@
       Error("HiScreen16::LoadTexture - D3Drend->CreateTexture() failed: %x", 0);
     //v10 = *pOutSurface;
     //v11 = 0;
-    if ( bMipMaps )
+    if (bMipMaps)
     {
       Dst._450DDE();
       //v20 = 0;
@@ -6470,7 +6470,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,
@@ -6480,7 +6480,7 @@
             desc.dwHeight,
             desc.lPitch >> 1,
             0,
-            0);
+            0);*/
           ErrD3D(pNextSurf->Unlock(0));
           //bMipMaps = 0x4D86ACu;
         }