Mercurial > mm7

changeset 977:ac85898f5903

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 09 May 2013 01:33:54 +0600
parents 15c6b80caa3a (diff) ec7568e13b24 (current diff)
children 9334a8c59c8d
files UIPartyCreation.cpp mm7_5.cpp
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;
       }
     }