# HG changeset patch
# User Ritor1
# Date 1406184272 -21600
# Node ID 063d194e08816a5d2a219f39781ab6784616e4fb
# Parent  b10125a9c772a48fda8e8f126745363915f66ef4# Parent  c59a8fddb5e8a2d6a52b289d424a74804ee04ab7
Слияние

diff -r b10125a9c772 -r 063d194e0881 Build/Visual Studio 2010/World of Might and Magic.vcxproj.user
--- 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
diff -r b10125a9c772 -r 063d194e0881 Keyboard.cpp
--- 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;
diff -r b10125a9c772 -r 063d194e0881 OSWindow.cpp
--- 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 ���������� ������� ���������� �� ���������, ����� ���������� ��������� �� ��������� ������ 
diff -r b10125a9c772 -r 063d194e0881 Timer.cpp
--- 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()
 {
diff -r b10125a9c772 -r 063d194e0881 mm7_2.cpp
--- 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");