Mercurial > mm7

diff mm7_2.cpp @ 978:9334a8c59c8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uGameState
author Ritor1
date Thu, 09 May 2013 02:26:04 +0600
parents c8a0f6d89c70
children 08fd1436ef35
line wrap: on
line diff
--- a/mm7_2.cpp	Thu May 09 01:33:54 2013 +0600
+++ b/mm7_2.cpp	Thu May 09 02:26:04 2013 +0600
@@ -9464,7 +9464,7 @@
     while ( 1 )
     {
       MainMenu_Loop();
-      uGameState = 0;
+      uGameState = GAME_STATE_0;
 //LABEL_21:
       while ( 1 )
       {
@@ -9502,7 +9502,7 @@
           if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU )
           {
             SetCurrentMenuID(MENU_NEWGAME);
-            uGameState = 0;
+            uGameState = GAME_STATE_0;
             continue;
           }
           break;
@@ -9517,7 +9517,7 @@
         }
         if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
         {
-          uGameState = 0;
+          uGameState = GAME_STATE_0;
         }
         else
         {
@@ -9552,24 +9552,24 @@
 //LABEL_48:
         pGame->Loop();
 LABEL_49:
-        if ( uGameState == 3 )
+        if ( uGameState == GAME_STATE_3 )
         {
           v12 = 5;
           SetCurrentMenuID((MENU_STATE)v12);
           //goto LABEL_21;
-          uGameState = 0;
+          uGameState = GAME_STATE_0;
           continue;
         }
         if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU )
         {
           SetCurrentMenuID(MENU_NEWGAME);
-          uGameState = 0;
+          uGameState = GAME_STATE_0;
           continue;
         }
         if ( uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU)// from the loaded game
         {
           pAudioPlayer->StopChannels(-1, -1);
-          uGameState = 0;
+          uGameState = GAME_STATE_0;
           break;
         }
       }