Mercurial > mm7
diff mm7_2.cpp @ 492:0e27362ac1d9
guild
author | Gloval |
---|---|
date | Thu, 28 Feb 2013 01:38:46 +0400 |
parents | 4bd56919f075 |
children | 59649750a054 |
line wrap: on
line diff
--- a/mm7_2.cpp Wed Feb 27 22:48:10 2013 +0400 +++ b/mm7_2.cpp Thu Feb 28 01:38:46 2013 +0400 @@ -11421,7 +11421,10 @@ pIcons_LOD->_4114F2(); } - +int __stdcall pWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam) + { + return DefWindowProcA(hWnd, Msg, wParam, lParam); + } //----- (004637EB) -------------------------------------------------------- @@ -12692,7 +12695,7 @@ wcxw.hInstance, nullptr); SetWindowTextW(hWnd, L"Might and MagicŪ VII"); - + SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS); pRenderer = Render::Create(); @@ -12715,7 +12718,7 @@ return false; } } - + pAllocator = Allocator::Create(); if (!pAllocator->Initialize(26 * 1024)) { @@ -12724,7 +12727,7 @@ L"More RAM Memory Required", MB_ICONEXCLAMATION); return false; } - + game_starting_year = 1168; pParty = new Party; @@ -12931,7 +12934,7 @@ pSoundList->ToFile(); } - + if (dword_6BE364_game_settings_1 & 2 || !(dword_6BE368_debug_settings_2 & 1))// // color depth != 16 // or @@ -13267,8 +13270,8 @@ } else __debugbreak(); - /*{ - if (GetCurrentMenuID() != MENU_10) + { + /* if (GetCurrentMenuID() != MENU_10) goto LABEL_49; pMouse->Activate(0); if (pAsyncMouse) @@ -13294,8 +13297,8 @@ if (pAsyncMouse) pAsyncMouse->Resume(); if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard ) - pAsyncKeyboard->Resume(); - }*/ + pAsyncKeyboard->Resume();*/ + } //LABEL_48: pGame->Loop(); LABEL_49: @@ -13335,6 +13338,7 @@ else Log::Warning(L"MM init: failed"); pGame->Deinitialize(); +return 1; }