# HG changeset patch
# User Nomad
# Date 1379970007 -7200
# Node ID be43171d7bc62cefeee5b7b9a9f5484798133ae3
# Parent  7153ee05d088304049e2b8a2ce56b12979f32435# Parent  a395359afc8f6055bf516a988cffd6fe73509c74
Merge

diff -r a395359afc8f -r be43171d7bc6 Player.cpp
--- a/Player.cpp	Mon Sep 23 17:33:12 2013 +0600
+++ b/Player.cpp	Mon Sep 23 23:00:07 2013 +0200
@@ -2068,8 +2068,6 @@
     }
   }
 }
-// 4EDEA0: using guessed type int dword_4EDEA0[];
-// 4EDEB4: using guessed type int dword_4EDEB4[];
 
 //----- (0048D88B) --------------------------------------------------------
 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation)
diff -r a395359afc8f -r be43171d7bc6 mm7_2.cpp
--- a/mm7_2.cpp	Mon Sep 23 17:33:12 2013 +0600
+++ b/mm7_2.cpp	Mon Sep 23 23:00:07 2013 +0200
@@ -4295,6 +4295,10 @@
   int window_total_width = client_width + window_borders_width,
       window_total_height = client_height + window_borders_height;
 
+  
+  if (GetMenu(hwnd))
+    window_total_height += GetSystemMetrics(SM_CYMENU);
+
   MoveWindow(hWnd, (GetSystemMetrics(SM_CXSCREEN) - window_total_width) / 2,
                    (GetSystemMetrics(SM_CYSCREEN) - window_total_height) / 2,
                    window_total_width,
@@ -5111,6 +5115,7 @@
 bool MM_Main(const wchar_t *pCmdLine)
 {
   IntegrityTest();
+
   char test[1024];
   sprintfex(test, "^Pi[%s]: знахар^R[ь;ка;]", "Золтан");