comparison Render.cpp @ 2061:b2a434d65344

GAME_SETTINGS_* defines introduced DEBUG_SETTINGS_* defines introduced
author Nomad
date Mon, 02 Dec 2013 15:13:49 +0200
parents 28cb79ae2f6f
children 259df09dfb50
comparison
equal deleted inserted replaced
2060:72177f3603da 2061:b2a434d65344
8271 ObjectDesc *v5; // eax@26 8271 ObjectDesc *v5; // eax@26
8272 RGBTexture *v6; // esi@33 8272 RGBTexture *v6; // esi@33
8273 const char *v8; // [sp-4h] [bp-28h]@33 8273 const char *v8; // [sp-4h] [bp-28h]@33
8274 struct tagRECT Rect; // [sp+14h] [bp-10h]@15 8274 struct tagRECT Rect; // [sp+14h] [bp-10h]@15
8275 8275
8276 if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) ) 8276 /*if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) )
8277 { 8277 {
8278 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." 8278 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."
8279 return; 8279 return;
8280 } 8280 }*/
8281 if ( pRenderer->bWindowMode || !pRenderer->pRenderD3D || pRenderer->pRenderD3D->pAvailableDevices->bIsDeviceCompatible ) 8281 if ( pRenderer->bWindowMode || !pRenderer->pRenderD3D || pRenderer->pRenderD3D->pAvailableDevices->bIsDeviceCompatible )
8282 { 8282 {
8283 if ( pEventTimer->bPaused ) 8283 if ( pEventTimer->bPaused )
8284 BYTE1(dword_6BE364_game_settings_1) |= 8u; 8284 dword_6BE364_game_settings_1 |= GAME_SETTINGS_0800;
8285 else 8285 else
8286 pEventTimer->Pause(); 8286 pEventTimer->Pause();
8287 if ( pMiscTimer->bPaused ) 8287 if ( pMiscTimer->bPaused )
8288 BYTE1(dword_6BE364_game_settings_1) |= 0x10u; 8288 dword_6BE364_game_settings_1 |= GAME_SETTINGS_1000;
8289 else 8289 else
8290 pMiscTimer->Pause(); 8290 pMiscTimer->Pause();
8291 pMouse->bActive = 0; 8291 pMouse->bActive = 0;
8292 if ( pRenderer->pRenderD3D ) 8292 if ( pRenderer->pRenderD3D )
8293 { 8293 {
8368 ShowWindow(hWnd, SW_SHOWNORMAL); 8368 ShowWindow(hWnd, SW_SHOWNORMAL);
8369 }*/ 8369 }*/
8370 pMouse->bActive = true; 8370 pMouse->bActive = true;
8371 if ( pVideoPlayer->AnyMovieLoaded() ) 8371 if ( pVideoPlayer->AnyMovieLoaded() )
8372 pVideoPlayer->SelectMovieType(); 8372 pVideoPlayer->SelectMovieType();
8373 if (dword_6BE364_game_settings_1 & 0x0800 ) 8373 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0800)
8374 BYTE1(dword_6BE364_game_settings_1) &= 0xF7u; 8374 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0800;
8375 else 8375 else
8376 pEventTimer->Resume(); 8376 pEventTimer->Resume();
8377 if ( BYTE1(dword_6BE364_game_settings_1) & 0x10 ) 8377 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_1000)
8378 BYTE1(dword_6BE364_game_settings_1) &= 0xEFu; 8378 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_1000;
8379 else 8379 else
8380 pMiscTimer->Resume(); 8380 pMiscTimer->Resume();
8381 } 8381 }
8382 } 8382 }
8383 // 6BE364: using guessed type int dword_6BE364_game_settings_1;
8384 // A74C88: using guessed type int dword_A74C88;
8385 8383
8386 8384
8387 //----- (004524D8) -------------------------------------------------------- 8385 //----- (004524D8) --------------------------------------------------------
8388 HWLTexture *RenderHWLContainer::LoadTexture(const char *pName, int bMipMaps) 8386 HWLTexture *RenderHWLContainer::LoadTexture(const char *pName, int bMipMaps)
8389 { 8387 {