Mercurial > mm7

diff mm7_5.cpp @ 982:08fd1436ef35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
enums & lod
author Nomad
date Sat, 11 May 2013 13:19:55 +0200
parents a079c489118d
children 1462a5f12b65
line wrap: on
line diff
--- a/mm7_5.cpp	Sat May 11 01:28:06 2013 +0200
+++ b/mm7_5.cpp	Sat May 11 13:19:55 2013 +0200
@@ -2231,7 +2231,7 @@
           continue;
         case UIMSG_C4:
 			__debugbreak;
-          uGameState = GAME_STATE_0;
+          uGameState = GAME_STATE_PLAYING;
           strcpy((char *)pKeyActionMap->pPressedKeysBuffer, "2");
           goto LABEL_524;
         case UIMSG_DD:
@@ -3341,7 +3341,7 @@
           break;
         case UIMSG_ExitToWindows:
           GUIWindow::Create(495, 337, 0, 0, WINDOW_PressedButton2, (int)pMainMenu_BtnExit, 0);
-          SetCurrentMenuID(MENU_FINISHED);
+          SetCurrentMenuID(MENU_EXIT_GAME);
           break;
         case UIMSG_PlayerCreation_SelectAttribute:
           pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem)
@@ -3435,7 +3435,7 @@
           if ( PlayerCreation_ComputeAttributeBonus() || !PlayerCreation_Chose4Skills() )
             GameUI_Footer_TimeLeft = GetTickCount() + 4000;
           else
-            uGameState = GAME_STATE_6;
+            uGameState = GAME_STATE_STARTING_NEW_GAME;
           break;
         case UIMSG_PlayerCreationClickReset:
           GUIWindow::Create(527, 431, 0, 0, WINDOW_PressedButton2, (int)pPlayerCreationUI_BtnReset, 0);