# HG changeset patch
# User Ritor1
# Date 1378900890 -21600
# Node ID 1efbaf1d01c3d3fef1dbf57373c068ab8725b073
# Parent  d687f6e7c610e485aacc86af23eefe4a082ad877# Parent  c24e91e9a10813f6f3afa45c288d99b0c6f11982
Слияние

diff -r d687f6e7c610 -r 1efbaf1d01c3 Render.cpp
--- a/Render.cpp	Wed Sep 11 18:01:16 2013 +0600
+++ b/Render.cpp	Wed Sep 11 18:01:30 2013 +0600
@@ -8470,7 +8470,7 @@
     {
       InvalidateRect(0, 0, 0);
       MoveWindow(hWnd, uWindowX, uWindowY, uWindowWidth, uWindowHeight, 0);
-      ShowWindow(hWnd, 1);
+      ShowWindow(hWnd, SW_SHOWNORMAL);
     }
     pMouse->bActive = 1;
     if ( pVideoPlayer->AnyMovieLoaded() )
diff -r d687f6e7c610 -r 1efbaf1d01c3 mm7_2.cpp
--- a/mm7_2.cpp	Wed Sep 11 18:01:16 2013 +0600
+++ b/mm7_2.cpp	Wed Sep 11 18:01:30 2013 +0600
@@ -3805,7 +3805,7 @@
 //----- (00464761) --------------------------------------------------------
 void Game_DeinitializeAndTerminate(int exitCode)
 {
-  SetPriorityClass(GetCurrentProcess(), 0x20u);
+  SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
   ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows();
   pGame->Deinitialize();
   pRenderer->Release2();