Mercurial > mm7
changeset 2446:063d194e0881
Слияние
author | Ritor1 |
---|---|
date | Thu, 24 Jul 2014 12:44:32 +0600 |
parents | b10125a9c772 (current diff) c59a8fddb5e8 (diff) |
children | 45dcf81c5b1c |
files | |
diffstat | 5 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.user Thu Jul 24 12:44:14 2014 +0600 +++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.user Thu Jul 24 12:44:32 2014 +0600 @@ -3,7 +3,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LocalDebuggerWorkingDirectory>..\..\..\MM_VII</LocalDebuggerWorkingDirectory> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - <LocalDebuggerCommandArguments>-nomarg, -novideo</LocalDebuggerCommandArguments> + <LocalDebuggerCommandArguments>-nomarg,</LocalDebuggerCommandArguments> <LocalDebuggerCommand>$(OutDir)$(TargetName)$(TargetExt)</LocalDebuggerCommand> </PropertyGroup> </Project> \ No newline at end of file
--- a/Keyboard.cpp Thu Jul 24 12:44:14 2014 +0600 +++ b/Keyboard.cpp Thu Jul 24 12:44:32 2014 +0600 @@ -134,6 +134,8 @@ ResetKeys(); + uNumKeysPressed = 0; + uGameMenuUI_CurentlySelectedKeyIdx = -1; } // 506E68: using guessed type int uGameMenuUI_CurentlySelectedKeyIdx;
--- a/OSWindow.cpp Thu Jul 24 12:44:14 2014 +0600 +++ b/OSWindow.cpp Thu Jul 24 12:44:32 2014 +0600 @@ -394,7 +394,7 @@ return *result = 0, true; } - return false; + return *result = 0, false; } @@ -479,7 +479,7 @@ if (window && window->api_handle == hwnd) //Uninitialized memory access { LPARAM result; - if (window->WinApiMessageProc(msg, wparam, lparam, &result)) + if (window->WinApiMessageProc(msg, wparam, lparam, &result))//Unhandled application exception return result; } // DefWindowProc ,
--- a/Timer.cpp Thu Jul 24 12:44:14 2014 +0600 +++ b/Timer.cpp Thu Jul 24 12:44:32 2014 +0600 @@ -43,7 +43,6 @@ } } - //----- (00426363) -------------------------------------------------------- void Timer::Resume() {
--- a/mm7_2.cpp Thu Jul 24 12:44:14 2014 +0600 +++ b/mm7_2.cpp Thu Jul 24 12:44:32 2014 +0600 @@ -1459,7 +1459,7 @@ MM6_Initialize(pMM6IniFile); - pKeyActionMap = new KeyboardActionMapping; + //pKeyActionMap = new KeyboardActionMapping; // _CrtDumpMemoryLeaks(); OnTimer(1); @@ -1757,13 +1757,6 @@ //----- (00465D0B) -------------------------------------------------------- void SecondaryInitialization() { - //__int16 v4; // ax@4 - //signed int v5; // esi@5 - //int v6; // ecx@6 - //int v7; // edx@7 - //ObjectDesc *v8; // eax@7 - //char pContainer[32]; // [sp+10h] [bp-Ch]@9 - pMouse->Initialize(window); pItemsTable = new ItemsTable; @@ -2041,7 +2034,7 @@ uCPUSpeed = 2048; // about 2GHz //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF );//Ritor1: for memory test( ) - + pKeyActionMap = new KeyboardActionMapping; if (!MM7_Initialize(640, 480))// { Log::Warning(L"MM init: failed");