Mercurial > mm7
diff UI/UIMainMenu.cpp @ 2061:b2a434d65344
GAME_SETTINGS_* defines introduced
DEBUG_SETTINGS_* defines introduced
author | Nomad |
---|---|
date | Mon, 02 Dec 2013 15:13:49 +0200 |
parents | 03d9336e862f |
children | 259df09dfb50 |
line wrap: on
line diff
--- a/UI/UIMainMenu.cpp Mon Dec 02 17:00:58 2013 +0600 +++ b/UI/UIMainMenu.cpp Mon Dec 02 15:13:49 2013 +0200 @@ -270,7 +270,7 @@ TranslateMessage(&Msg); DispatchMessageA(&Msg); } - if ( BYTE1(dword_6BE364_game_settings_1) & 1 ) + if (dword_6BE364_game_settings_1 & GAME_SETTINGS_APP_INACTIVE) { WaitMessage(); } @@ -302,50 +302,3 @@ cred_texture.Release(); return MENU_MAIN; // return MENU_Main } -/*MENU_STATE MainMenuUI_Credits_Loop()//NewTitle -{ - MSG Msg; - GUIWindow credit_window; - RGBTexture mm6title_texture; - - if ( pMessageQueue_50CBD0->uNumMessages ) - pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; - ++pIcons_LOD->uTexturePacksCount; - if ( !pIcons_LOD->uNumPrevLoadedFiles ) - pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; - - //pAudioPlayer->PlayMusicTrack(MUSIC_Credits); - - mm6title_texture.Load("newtitle.pcx", 0); - pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_Escape, 0, 27, "", 0); - pCurrentScreen = SCREEN_CREATORS; - SetCurrentMenuID(MENU_CREDITSPROC); - - do - { - while ( PeekMessageA(&Msg, 0, 0, 0, 1) ) - { - if ( Msg.message == 18 ) - Game_DeinitializeAndTerminate(0); - TranslateMessage(&Msg); - DispatchMessageA(&Msg); - } - if ( BYTE1(dword_6BE364_game_settings_1) & 1 ) - { - WaitMessage(); - } - else - { - pRenderer->BeginScene(); - pRenderer->DrawTextureRGB(0, 0, &mm6title_texture); - pRenderer->EndScene(); - pRenderer->Present(); - pCurrentScreen = SCREEN_GAME; - GUI_MainMenuMessageProc(); - } - } - while ( GetCurrentMenuID() == MENU_CREDITSPROC ); - //pAudioPlayer->_4AA258(1); - mm6title_texture.Release(); - return MENU_MAIN; // return MENU_Main -}*/ \ No newline at end of file