Mercurial > mm7

diff Render.cpp @ 2061:b2a434d65344

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GAME_SETTINGS_* defines introduced DEBUG_SETTINGS_* defines introduced
author Nomad
date Mon, 02 Dec 2013 15:13:49 +0200
parents 28cb79ae2f6f
children 259df09dfb50
line wrap: on
line diff
--- a/Render.cpp	Mon Dec 02 17:00:58 2013 +0600
+++ b/Render.cpp	Mon Dec 02 15:13:49 2013 +0200
@@ -8273,19 +8273,19 @@
   const char *v8; // [sp-4h] [bp-28h]@33
   struct tagRECT Rect; // [sp+14h] [bp-10h]@15
 
-  if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) )
+  /*if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) )
   {
     ModalWindow(pGlobalTXT_LocalizationStrings[62], UIMSG_0);// "Might and Magic VII requires your desktop to be in 16bit (32k or 65k) Color mode in order to operate in a window."
     return;
-  }
+  }*/
   if ( pRenderer->bWindowMode || !pRenderer->pRenderD3D || pRenderer->pRenderD3D->pAvailableDevices->bIsDeviceCompatible )
   {
     if ( pEventTimer->bPaused )
-      BYTE1(dword_6BE364_game_settings_1) |= 8u;
+      dword_6BE364_game_settings_1 |= GAME_SETTINGS_0800;
     else
       pEventTimer->Pause();
     if ( pMiscTimer->bPaused )
-      BYTE1(dword_6BE364_game_settings_1) |= 0x10u;
+      dword_6BE364_game_settings_1 |= GAME_SETTINGS_1000;
     else
       pMiscTimer->Pause();
     pMouse->bActive = 0;
@@ -8370,18 +8370,16 @@
     pMouse->bActive = true;
     if ( pVideoPlayer->AnyMovieLoaded() )
       pVideoPlayer->SelectMovieType();
-    if (dword_6BE364_game_settings_1 & 0x0800 )
-      BYTE1(dword_6BE364_game_settings_1) &= 0xF7u;
+    if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0800)
+      dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0800;
     else
       pEventTimer->Resume();
-    if ( BYTE1(dword_6BE364_game_settings_1) & 0x10 )
-      BYTE1(dword_6BE364_game_settings_1) &= 0xEFu;
+    if (dword_6BE364_game_settings_1 & GAME_SETTINGS_1000)
+      dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_1000;
     else
       pMiscTimer->Resume();
   }
 }
-// 6BE364: using guessed type int dword_6BE364_game_settings_1;
-// A74C88: using guessed type int dword_A74C88;
 
 
 //----- (004524D8) --------------------------------------------------------