Mercurial > mm7

comparison mm7_2.cpp @ 1033:3a5c8df8381d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* UI cleans and moves * Deleted many junk global variables.
author Nomad
date Tue, 21 May 2013 23:44:51 +0200
parents f93d17337113
children 39f42990698f
comparison
equal deleted inserted replaced
1031:f93d17337113 1033:3a5c8df8381d
6671 { 6671 {
6672 pTexture_PCX.Release(); 6672 pTexture_PCX.Release();
6673 pTexture_PCX.Load("lsave640.pcx", 0); 6673 pTexture_PCX.Load("lsave640.pcx", 0);
6674 pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); 6674 pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
6675 pCurrentScreen = SCREEN_LOADGAME; 6675 pCurrentScreen = SCREEN_LOADGAME;
6676 GameUI_DrawLoadMenu(0); 6676 LoadUI_Load(0);
6677 } 6677 }
6678 pWindow = pGUIWindow_CurrentMenu; 6678 pWindow = pGUIWindow_CurrentMenu;
6679 } 6679 }
6680 6680
6681 MSG msg; 6681 MSG msg;
9509 } 9509 }
9510 if (GetCurrentMenuID() == MENU_CREDITS) 9510 if (GetCurrentMenuID() == MENU_CREDITS)
9511 { 9511 {
9512 if ( pAudioPlayer->hAILRedbook ) 9512 if ( pAudioPlayer->hAILRedbook )
9513 AIL_redbook_stop(pAudioPlayer->hAILRedbook); 9513 AIL_redbook_stop(pAudioPlayer->hAILRedbook);
9514 extern MENU_STATE __cdecl CreditsMenu__Loop(); 9514 MainMenuUI_Credits_Loop();
9515 CreditsMenu__Loop();
9516 break; 9515 break;
9517 } 9516 }
9518 if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LoadingProcInMainMenu) 9517 if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
9519 { 9518 {
9520 uGameState = GAME_STATE_PLAYING; 9519 uGameState = GAME_STATE_PLAYING;
11333 pParty->vPosition.y = 22528; 11332 pParty->vPosition.y = 22528;
11334 } 11333 }
11335 else 11334 else
11336 { 11335 {
11337 pAudioPlayer->StopChannels(-1, -1); 11336 pAudioPlayer->StopChannels(-1, -1);
11338 UI_CreateTravelDialogue(); 11337 TravelUI_Load();
11339 } 11338 }
11340 } 11339 }
11341 UpdateActors_ODM(); 11340 UpdateActors_ODM();
11342 check_event_triggers(); 11341 check_event_triggers();
11343 } 11342 }