# HG changeset patch
# User Ritor1
# Date 1368041634 -21600
# Node ID ac85898f5903e0ee7d9258ee48b3448bd3db015f
# Parent  15c6b80caa3a45524b7dea93466bda7ce5799604# Parent  ec7568e13b24ea7dab6b739f5404fe60297dc9ab
Слияние

diff -r ec7568e13b24 -r ac85898f5903 UIPartyCreation.cpp
--- a/UIPartyCreation.cpp	Wed May 08 21:37:12 2013 +0200
+++ b/UIPartyCreation.cpp	Thu May 09 01:33:54 2013 +0600
@@ -746,20 +746,20 @@
       GUI_UpdateWindows();
       pRenderer->EndScene();
       pRenderer->Present();
-      if ( uGameState == 1 )
+      if ( uGameState == GAME_FINISHED )//if click Esc in PlayerCreation Window
       {
         v26 = 1;
-        v2 = 0;
+        //v2 = 0;
         //goto LABEL_27;
-        SetCurrentMenuID((MENU_STATE)v2);
+        SetCurrentMenuID((MENU_STATE)MENU_MAIN);
         continue;
       }
-      if ( uGameState == 6 )
+      if ( uGameState == GAME_STATE_6 )//if click OK in PlayerCreation Window
       {
         uGameState = v1;
-        v2 = 1;
+        //v2 = 1;
         //goto LABEL_27;
-        SetCurrentMenuID((MENU_STATE)v2);
+        SetCurrentMenuID((MENU_STATE)MENU_NEWGAME);
         continue;
       }
     }
diff -r ec7568e13b24 -r ac85898f5903 mm7_5.cpp