diff Game.cpp @ 978:9334a8c59c8d

uGameState
author Ritor1
date Thu, 09 May 2013 02:26:04 +0600
parents 5a12082c803d
children a6ef7125f6e4
line wrap: on
line diff
--- a/Game.cpp	Thu May 09 01:33:54 2013 +0600
+++ b/Game.cpp	Thu May 09 02:26:04 2013 +0600
@@ -276,7 +276,7 @@
   {
     pParty->Reset();
     dword_6BE340 = 0;
-    uGameState = 0;
+    uGameState = GAME_STATE_0;
     LoadGame(uLoadGameUI_SelectedSlot);
   }
 
@@ -393,34 +393,34 @@
         viewparams->bRedrawGameUI = true;
       }
       pAudioPlayer->UpdateSounds();
-      if (uGameState == 1)
+      if (uGameState == GAME_FINISHED)
         //goto LABEL_96;
       {
         bLoadinga = 1;
         continue;
       }
-      if (uGameState == 2)
+      if (uGameState == GAME_STATE_2)
       {
         pAudioPlayer->StopChannels(-1, -1);
         PrepareWorld(0);
-        uGameState = 0;
+        uGameState = GAME_STATE_0;
         continue;
       }
-      if ( (signed int)uGameState <= 2 )
+      if ( (signed int)uGameState <= GAME_STATE_2 )
         //goto LABEL_85;
       {
         pGame->Draw();
         continue;
       }
-      if ( (signed int)uGameState <= 5 || uGameState == 7 )
+      if ( (signed int)uGameState <= GAME_STATE_5 || uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU )
       {
 //LABEL_96:
         bLoadinga = 1;
         continue;
       }
-      if ( uGameState != 8 )
+      if ( uGameState != GAME_STATE_8 )
       {
-        if ( uGameState != 9 )
+        if ( uGameState != GAME_STATE_FINAL_WINDOW )
         {
 //LABEL_85:
           pGame->Draw();
@@ -541,17 +541,17 @@
         pPlayers[v17[v12 % v11]]->PlaySound(SPEECH_99, 0);
       }
       ShowStatusBarString(pGlobalTXT_LocalizationStrings[524], 2u);// "Once again you've cheated death!.." "Вы снова обхитрили смерть! …"
-      uGameState = 0;
+      uGameState = GAME_STATE_0;
     }
     while ( !bLoadinga );
     dword_6BE340 = 0;
     pEventTimer->Pause();
     ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows();
-    if ( uGameState == 3 )
+    if ( uGameState == GAME_STATE_3 )
     {
       sub_491E3A();
       LoadPlayerPortraintsAndVoices();
-      uGameState = 0;
+      uGameState = GAME_STATE_0;
       pIcons_LOD->dword_11B84 = pIcons_LOD->uNumLoadedFiles;
       bLoading = true;
       continue;