# HG changeset patch
# User Ritor1
# Date 1379994243 -21600
# Node ID 14d84e2a2a92dfd0cd3f72486155749314a3c358
# Parent  5863074ed9ba737521df7f796f6568ffc172a250# Parent  be43171d7bc62cefeee5b7b9a9f5484798133ae3
Слияние

diff -r 5863074ed9ba -r 14d84e2a2a92 Player.cpp
--- a/Player.cpp	Tue Sep 24 09:43:58 2013 +0600
+++ b/Player.cpp	Tue Sep 24 09:44:03 2013 +0600
@@ -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 5863074ed9ba -r 14d84e2a2a92 mm7_2.cpp
--- a/mm7_2.cpp	Tue Sep 24 09:43:58 2013 +0600
+++ b/mm7_2.cpp	Tue Sep 24 09:44:03 2013 +0600
@@ -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[�;��;]", "������");