Mercurial > mm7

comparison mm7_4.cpp @ 151:9abdd40a107b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pCurrentScreen
author Ritor1
date Tue, 12 Feb 2013 15:28:08 +0600
parents d92c78ab54fe
children 796b79187c27
comparison
equal deleted inserted replaced
150:d92c78ab54fe 151:9abdd40a107b
4176 } 4176 }
4177 4177
4178 v51 = v65; 4178 v51 = v65;
4179 if ( v65 ) 4179 if ( v65 )
4180 goto LABEL_135; 4180 goto LABEL_135;
4181 if ( pCurrentScreen != 5 ) 4181 if ( pCurrentScreen != SCREEN_REST )
4182 { 4182 {
4183 v52 = (signed int)&pPlayers[1]; 4183 v52 = (signed int)&pPlayers[1];
4184 while ( 1 ) 4184 while ( 1 )
4185 { 4185 {
4186 v53 = *(int *)v52; 4186 v53 = *(int *)v52;
4192 } 4192 }
4193 *(int *)(v53 + 16) = 0; 4193 *(int *)(v53 + 16) = 0;
4194 *(int *)(v53 + 20) = 0; 4194 *(int *)(v53 + 20) = 0;
4195 v51 = 1; 4195 v51 = 1;
4196 LABEL_135: 4196 LABEL_135:
4197 if ( pCurrentScreen != 5 4197 if ( pCurrentScreen != SCREEN_REST
4198 && (!v51 || dword_5C35C0) ) 4198 && (!v51 || dword_5C35C0) )
4199 uGameState = 8; 4199 uGameState = 8;
4200 } 4200 }
4201 if ( uActiveCharacter ) 4201 if ( uActiveCharacter )
4202 { 4202 {
4203 if ( pCurrentScreen != 5 ) 4203 if ( pCurrentScreen != SCREEN_REST )
4204 { 4204 {
4205 v54 = pPlayers[uActiveCharacter]; 4205 v54 = pPlayers[uActiveCharacter];
4206 if ( v54->pConditions[2] 4206 if ( v54->pConditions[2]
4207 || v54->pConditions[12] 4207 || v54->pConditions[12]
4208 || v54->pConditions[13] 4208 || v54->pConditions[13]
5703 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 5703 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
5704 pAudioPlayer->SetMusicVolume((pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0)); 5704 pAudioPlayer->SetMusicVolume((pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0));
5705 ++pIcons_LOD->uTexturePacksCount; 5705 ++pIcons_LOD->uTexturePacksCount;
5706 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 5706 if ( !pIcons_LOD->uNumPrevLoadedFiles )
5707 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 5707 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
5708 pCurrentScreen = 21;//окно Создания группы 5708 pCurrentScreen = SCREEN_PARTY_CREATION;
5709 uPlayerCreationUI_ArrowAnim = 0; 5709 uPlayerCreationUI_ArrowAnim = 0;
5710 uPlayerCreationUI_SkySliderPos = 0; 5710 uPlayerCreationUI_SkySliderPos = 0;
5711 uPlayerCreationUI_SelectedCharacter = 0; 5711 uPlayerCreationUI_SelectedCharacter = 0;
5712 v0 = LOBYTE(pFontCreate->uFontHeight) - 2; 5712 v0 = LOBYTE(pFontCreate->uFontHeight) - 2;
5713 pTexture_IC_KNIGHT[0] = pIcons_LOD->LoadTexturePtr("IC_KNIGHT", TEXTURE_16BIT_PALETTE); 5713 pTexture_IC_KNIGHT[0] = pIcons_LOD->LoadTexturePtr("IC_KNIGHT", TEXTURE_16BIT_PALETTE);
6205 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a4, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, 6205 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a4, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1,
6206 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); 6206 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth);
6207 free(pString); 6207 free(pString);
6208 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr); 6208 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr);
6209 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0); 6209 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0);
6210 pCurrentScreen = 9; // окно Credits 6210 pCurrentScreen = SCREEN_CREATORS;
6211 SetCurrentMenuID(MENU_Credits); 6211 SetCurrentMenuID(MENU_Credits);
6212 do 6212 do
6213 { 6213 {
6214 while ( PeekMessageA(&Msg, 0, 0, 0, 1) ) 6214 while ( PeekMessageA(&Msg, 0, 0, 0, 1) )
6215 { 6215 {
6234 pRenderer->EndScene(); 6234 pRenderer->EndScene();
6235 ++a5; 6235 ++a5;
6236 if ( a5 >= (signed __int16)pTexture2.uHeight ) 6236 if ( a5 >= (signed __int16)pTexture2.uHeight )
6237 SetCurrentMenuID(MENU_MAIN); 6237 SetCurrentMenuID(MENU_MAIN);
6238 pRenderer->Present(); 6238 pRenderer->Present();
6239 pCurrentScreen = 0;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc() 6239 pCurrentScreen = SCREEN_GAME;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
6240 GUI_MainMenuMessageProc(); 6240 GUI_MainMenuMessageProc();
6241 } 6241 }
6242 } 6242 }
6243 while ( GetCurrentMenuID() == MENU_Credits ); 6243 while ( GetCurrentMenuID() == MENU_Credits );
6244 pAudioPlayer->_4AA258(1); 6244 pAudioPlayer->_4AA258(1);