comparison mm7_2.cpp @ 591:a463d7784d33

missed Merge
author zipi
date Wed, 06 Mar 2013 13:42:24 +0000
parents 9e80b6e1b155
children deb559e4fe47 7bae884b7cd0
comparison
equal deleted inserted replaced
590:c697d17c5179 591:a463d7784d33
11699 } 11699 }
11700 pWindow_MainMenu->Release(); 11700 pWindow_MainMenu->Release();
11701 pIcons_LOD->_4114F2(); 11701 pIcons_LOD->_4114F2();
11702 } 11702 }
11703 11703
11704 int __stdcall pWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
11705 {
11706 return DefWindowProcA(hWnd, Msg, wParam, lParam);
11707 }
11708
11709
11710 //----- (004637EB) -------------------------------------------------------- 11704 //----- (004637EB) --------------------------------------------------------
11711 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam) 11705 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
11712 { 11706 {
11713 unsigned int v4; // esi@1 11707 unsigned int v4; // esi@1
11714 Render *v5; // ecx@14 11708 Render *v5; // ecx@14
13251 if (uGammaPos < 0 || uGammaPos > 9) 13245 if (uGammaPos < 0 || uGammaPos > 9)
13252 uGammaPos = 4; 13246 uGammaPos = 4;
13253 pGame->pGammaController->Initialize(uGammaPos * 0.1 + 0.6); 13247 pGame->pGammaController->Initialize(uGammaPos * 0.1 + 0.6);
13254 13248
13255 if ( ReadWindowsRegistryInt("Bloodsplats", 1) ) 13249 if ( ReadWindowsRegistryInt("Bloodsplats", 1) )
13256 pGame->uFlags2 |= 0x20u; 13250 pGame->uFlags2 |= GAME_FLAGS_2_DRAW_BLOODSPLATS;
13257 else 13251 else
13258 pGame->uFlags2 &= 0xFFFFFFDFu; 13252 pGame->uFlags2 &= GAME_FLAGS_2_DRAW_BLOODSPLATS;
13259 13253
13260 uTurnSpeed = ReadWindowsRegistryInt("TurnDelta", 0); 13254 uTurnSpeed = ReadWindowsRegistryInt("TurnDelta", 0);
13261 dword_6BE384_2dacceloff = ReadWindowsRegistryInt("2dacceloff", 0); 13255 dword_6BE384_2dacceloff = ReadWindowsRegistryInt("2dacceloff", 0);
13262 13256
13263 if (!bNoSound) 13257 if (!bNoSound)