Mercurial > mm7

comparison mm7_5.cpp @ 997:1c13fbaad0c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 14 May 2013 10:07:33 +0600
parents bdbbdfa77ea6 3a3ab572eff5
children e4383e6dfbef
comparison
equal deleted inserted replaced
996:bdbbdfa77ea6 997:1c13fbaad0c5
1397 continue; 1397 continue;
1398 case SCREEN_VIDEO: 1398 case SCREEN_VIDEO:
1399 pVideoPlayer->Unload(); 1399 pVideoPlayer->Unload();
1400 continue; 1400 continue;
1401 case SCREEN_CHARACTERS: 1401 case SCREEN_CHARACTERS:
1402 sub_4196A0(); 1402 CharacterUI_ReleaseButtons();
1403 sub_419379(); 1403 sub_419379();
1404 pIcons_LOD->_4114F2(); 1404 pIcons_LOD->_4114F2();
1405 if ( pGUIWindow_Settings ) 1405 if ( pGUIWindow_Settings )
1406 { 1406 {
1407 if ( pCurrentScreen == SCREEN_CHARACTERS ) 1407 if ( pCurrentScreen == SCREEN_CHARACTERS )
1484 pCurrentScreen = SCREEN_GAME; 1484 pCurrentScreen = SCREEN_GAME;
1485 viewparams->bRedrawGameUI = 1; 1485 viewparams->bRedrawGameUI = 1;
1486 pIcons_LOD->_4355F7(); 1486 pIcons_LOD->_4355F7();
1487 continue; 1487 continue;
1488 } 1488 }
1489 sub_4196A0(); 1489 LABEL_319:
1490 CharacterUI_ReleaseButtons();
1490 sub_419379(); 1491 sub_419379();
1491 pIcons_LOD->_4114F2(); 1492 pIcons_LOD->_4114F2();
1492 } 1493 }
1493 if ( pGUIWindow_Settings ) 1494 if ( pGUIWindow_Settings )
1494 { 1495 {
2956 case UIMSG_ClickPaperdoll: 2957 case UIMSG_ClickPaperdoll:
2957 OnPaperdollLeftClick(); 2958 OnPaperdollLeftClick();
2958 continue; 2959 continue;
2959 case UIMSG_ClickStatsBtn: 2960 case UIMSG_ClickStatsBtn:
2960 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100; 2961 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100;
2961 sub_4196A0(); 2962 CharacterUI_ReleaseButtons();
2962 sub_419379(); 2963 sub_419379();
2963 GUIWindow::Create(pCharacterScreen_StatsBtn->uX, pCharacterScreen_StatsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_StatsBtn, 0); 2964 GUIWindow::Create(pCharacterScreen_StatsBtn->uX, pCharacterScreen_StatsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_StatsBtn, 0);
2964 continue; 2965 continue;
2965 case UIMSG_ClickSkillsBtn: 2966 case UIMSG_ClickSkillsBtn:
2966 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 101; 2967 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 101;
2967 sub_4196A0(); 2968 CharacterUI_ReleaseButtons();
2968 sub_419379(); 2969 sub_419379();
2969 CharacterUI_SkillScreen_Draw(); 2970 CharacterUI_SkillsTab_CreateButtons();
2970 GUIWindow::Create(pCharacterScreen_SkillsBtn->uX, pCharacterScreen_SkillsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_SkillsBtn, 0); 2971 GUIWindow::Create(pCharacterScreen_SkillsBtn->uX, pCharacterScreen_SkillsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_SkillsBtn, 0);
2971 continue; 2972 continue;
2972 case UIMSG_SkillUp: 2973 case UIMSG_SkillUp:
2973 pPlayer4 = pPlayers[uActiveCharacter]; 2974 pPlayer4 = pPlayers[uActiveCharacter];
2974 v105 = (int)&pPlayer4->pActiveSkills[uMessageParam]; 2975 v105 = (int)&pPlayer4->pActiveSkills[uMessageParam];
2993 ShowStatusBarString(v87, 2); 2994 ShowStatusBarString(v87, 2);
2994 continue; 2995 continue;
2995 case UIMSG_ClickInventoryBtn: 2996 case UIMSG_ClickInventoryBtn:
2996 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 2997 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
2997 sub_419379(); 2998 sub_419379();
2998 sub_4196A0(); 2999 CharacterUI_ReleaseButtons();
2999 GUIWindow::Create(pCharacterScreen_InventoryBtn->uX, pCharacterScreen_InventoryBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_InventoryBtn, 0); 3000 GUIWindow::Create(pCharacterScreen_InventoryBtn->uX, pCharacterScreen_InventoryBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_InventoryBtn, 0);
3000 continue; 3001 continue;
3001 case UIMSG_ClickExitCharacterWindowBtn: 3002 case UIMSG_ClickExitCharacterWindowBtn:
3002 GUIWindow::Create(pCharacterScreen_ExitBtn->uX, pCharacterScreen_ExitBtn->uY, 0, 0, WINDOW_ExitCharacterWindow, (int)pCharacterScreen_ExitBtn, 0); 3003 GUIWindow::Create(pCharacterScreen_ExitBtn->uX, pCharacterScreen_ExitBtn->uY, 0, 0, WINDOW_ExitCharacterWindow, (int)pCharacterScreen_ExitBtn, 0);
3003 continue; 3004 continue;
3004 case UIMSG_ClickAwardsBtn: 3005 case UIMSG_ClickAwardsBtn:
3005 sub_419379(); 3006 sub_419379();
3006 sub_4196A0(); 3007 CharacterUI_ReleaseButtons();
3007 sub_419220(); 3008 sub_419220();
3008 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102; 3009 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102;
3009 GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0); 3010 GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0);
3010 FillAwardsData(); 3011 FillAwardsData();
3011 continue; 3012 continue;
10252 viewparams->bRedrawGameUI = 1; 10253 viewparams->bRedrawGameUI = 1;
10253 continue; 10254 continue;
10254 } 10255 }
10255 case WINDOW_CharacterRecord: 10256 case WINDOW_CharacterRecord:
10256 { 10257 {
10257 CharacterUI_CharacterScreen_Draw(uActiveCharacter); 10258 CharacterUI_CharacterScreen_Draw(pPlayers[uActiveCharacter]);
10258 continue; 10259 continue;
10259 } 10260 }
10260 case WINDOW_Options: 10261 case WINDOW_Options:
10261 { 10262 {
10262 DrawGameOptions(); 10263 DrawGameOptions();
10272 DrawDialogueUI(); 10273 DrawDialogueUI();
10273 continue; 10274 continue;
10274 } 10275 }
10275 case WINDOW_QuickReference: 10276 case WINDOW_QuickReference:
10276 { 10277 {
10277 QuickRefDraw(); 10278 GameUI_QuickRef_Draw();
10278 continue; 10279 continue;
10279 } 10280 }
10280 case WINDOW_Rest: 10281 case WINDOW_Rest:
10281 { 10282 {
10282 RestUI_Draw(); 10283 RestUI_Draw();
10354 case WINDOW_CastSpell_InInventory: 10355 case WINDOW_CastSpell_InInventory:
10355 { 10356 {
10356 pRenderer->ClearZBuffer(0, 479); 10357 pRenderer->ClearZBuffer(0, 479);
10357 draw_leather(); 10358 draw_leather();
10358 CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true); 10359 CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true);
10359 CharacterUI_DrawPaperdoll(uActiveCharacter); 10360 CharacterUI_DrawPaperdoll(pPlayers[uActiveCharacter]);
10360 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u)); 10361 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u));
10361 continue; 10362 continue;
10362 } 10363 }
10363 case WINDOW_FinalWindow: 10364 case WINDOW_FinalWindow:
10364 { 10365 {