Mercurial > mm7

changeset 1543:888157f45502

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge2
author Nomad
date Sat, 07 Sep 2013 13:26:15 +0200
parents 7d986a396092
children 499761153844
files mm7_2.cpp
diffstat 1 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_2.cpp	Sat Sep 07 13:03:18 2013 +0200
+++ b/mm7_2.cpp	Sat Sep 07 13:26:15 2013 +0200
@@ -3757,21 +3757,6 @@
       }
       return 0;
 
-    case WM_CREATE:
-      {
-        auto hDC = GetDC(hWnd);
-        {
-          if (GetDeviceCaps(hDC, BITSPIXEL) < 8)
-          {
-            ReleaseDC(hWnd, hDC);
-            Log::Warning(L"You must be running in 256 color mode or higher.");
-            Abortf("You must be running in 256 color mode or higher. You can change the screen depth with the control panel display icon.");
-          }
-        }
-        ReleaseDC(hWnd, hDC);
-      }
-      return 0;
-
     case WM_SETFOCUS:
       dword_4E98BC_bApplicationActive = 0;
       if ( pRenderer->bUserDirect3D && pRenderer->uAcquiredDirect3DDevice == 1 )
@@ -4402,6 +4387,7 @@
                          uWindowX, uWindowY,
                          640, 480,
                          nullptr,
+                         nullptr,
                          wcxw.hInstance,
                          nullptr);
 
@@ -4664,7 +4650,7 @@
   }
 
 
-
+#if 0
   if (_access("../MM_VI/data/icons.lod", 0) == 0)
   {
     pIcons_LOD_mm6 = new LODFile_IconsBitmaps;
@@ -4747,7 +4733,7 @@
   }
   else
     Log::Warning(L"Unable to find mm8:sprites.lod");
-
+#endif
 
   {
     void *sft_mm6 = pIcons_LOD_mm6 ? pIcons_LOD_mm6->LoadRaw("dsft.bin", 1) : nullptr,