Mercurial > mm7

changeset 1985:ef4dcee1b4a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Multi-monitor support part1
author zipi
date Sat, 02 Nov 2013 12:16:48 +0000
parents b00f5bb7d930
children 3ff1a608324a
files OSWindow.cpp Render.cpp mm7_2.cpp
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/OSWindow.cpp	Sat Nov 02 10:14:14 2013 +0000
+++ b/OSWindow.cpp	Sat Nov 02 12:16:48 2013 +0000
@@ -687,6 +687,7 @@
     case 103:  pRenderer->SavePCXScreenshot(); break;
     case 101:  // Quit game
     case 40001:
+		pGame->Deinitialize();
       SendMessageW(api_handle, WM_DESTROY, 0, 0);
     break;
 
--- a/Render.cpp	Sat Nov 02 10:14:14 2013 +0000
+++ b/Render.cpp	Sat Nov 02 12:16:48 2013 +0000
@@ -1201,7 +1201,7 @@
   v2 = new RenderD3D__DevInfo[4];// 4 items
   *pOutDevices = v2;
   memset(v2, 0, 0xA0u);
-  DirectDrawEnumerateA((LPDDENUMCALLBACKA)RenderD3D__DeviceEnumerator, *pOutDevices);
+  DirectDrawEnumerateExA((LPDDENUMCALLBACKEXA)RenderD3D__DeviceEnumerator, *pOutDevices, DDENUM_ATTACHEDSECONDARYDEVICES);
 }
 
 //----- (0049DC58) --------------------------------------------------------
@@ -2106,7 +2106,7 @@
   //windowed_mode_width = windowed_width;
   //windowed_mode_height = windowed_height;
 
-  uDesiredDirect3DDevice = 0;//ReadWindowsRegistryInt("D3D Device", 1);
+  uDesiredDirect3DDevice = ReadWindowsRegistryInt("D3D Device", 0);
 
   bUseColoredLights = bColoredLights;//ReadWindowsRegistryInt("Colored Lights", 0);
   uLevelOfDetail = uDetailLevel;//ReadWindowsRegistryInt("Detail Level", 1);
@@ -3184,7 +3184,7 @@
           Error("There aren't any D3D devices to create.");
 
         v8 = pRenderD3D->CreateDevice(0, 0, window->GetApiHandle());
-        uAcquiredDirect3DDevice = 0;
+        uAcquiredDirect3DDevice = 1;
       }
     }
     if ( !v8 )
--- a/mm7_2.cpp	Sat Nov 02 10:14:14 2013 +0000
+++ b/mm7_2.cpp	Sat Nov 02 12:16:48 2013 +0000
@@ -3994,7 +3994,7 @@
   }
   else
   {
-    window->SetWindowedMode(game_width, game_height);
+    //window->SetWindowedMode(game_width, game_height);
     pRenderer->SwitchToWindow();
   }