Mercurial > mm7

diff mm7_2.cpp @ 2446:063d194e0881

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 24 Jul 2014 12:44:32 +0600
parents c59a8fddb5e8
children 45dcf81c5b1c
line wrap: on
line diff
--- 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");