Mercurial > mm7

comparison mm7_5.cpp @ 991:c5d8ea1e6ccb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CharacterUI cleanings.
author Nomad
date Mon, 13 May 2013 17:01:20 +0200
parents d982fffb8b96
children 3a3ab572eff5
comparison
equal deleted inserted replaced
984:d982fffb8b96 991:c5d8ea1e6ccb
1429 viewparams->bRedrawGameUI = 1; 1429 viewparams->bRedrawGameUI = 1;
1430 pIcons_LOD->_4355F7(); 1430 pIcons_LOD->_4355F7();
1431 continue; 1431 continue;
1432 } 1432 }
1433 LABEL_319: 1433 LABEL_319:
1434 sub_4196A0(); 1434 CharacterUI_ReleaseButtons();
1435 sub_419379(); 1435 sub_419379();
1436 LABEL_321: 1436 LABEL_321:
1437 pIcons_LOD->_4114F2(); 1437 pIcons_LOD->_4114F2();
1438 } 1438 }
1439 if ( pGUIWindow_Settings ) 1439 if ( pGUIWindow_Settings )
2930 case UIMSG_ClickPaperdoll: 2930 case UIMSG_ClickPaperdoll:
2931 OnPaperdollLeftClick(); 2931 OnPaperdollLeftClick();
2932 continue; 2932 continue;
2933 case UIMSG_ClickStatsBtn: 2933 case UIMSG_ClickStatsBtn:
2934 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100; 2934 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100;
2935 sub_4196A0(); 2935 CharacterUI_ReleaseButtons();
2936 sub_419379(); 2936 sub_419379();
2937 GUIWindow::Create(pCharacterScreen_StatsBtn->uX, pCharacterScreen_StatsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_StatsBtn, 0); 2937 GUIWindow::Create(pCharacterScreen_StatsBtn->uX, pCharacterScreen_StatsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_StatsBtn, 0);
2938 continue; 2938 continue;
2939 case UIMSG_ClickSkillsBtn: 2939 case UIMSG_ClickSkillsBtn:
2940 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 101; 2940 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 101;
2941 sub_4196A0(); 2941 CharacterUI_ReleaseButtons();
2942 sub_419379(); 2942 sub_419379();
2943 CharacterUI_SkillScreen_Draw(); 2943 CharacterUI_SkillsTab_CreateButtons();
2944 GUIWindow::Create(pCharacterScreen_SkillsBtn->uX, pCharacterScreen_SkillsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_SkillsBtn, 0); 2944 GUIWindow::Create(pCharacterScreen_SkillsBtn->uX, pCharacterScreen_SkillsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_SkillsBtn, 0);
2945 continue; 2945 continue;
2946 case UIMSG_SkillUp: 2946 case UIMSG_SkillUp:
2947 pPlayer4 = pPlayers[uActiveCharacter]; 2947 pPlayer4 = pPlayers[uActiveCharacter];
2948 v105 = (int)&pPlayer4->pActiveSkills[uMessageParam]; 2948 v105 = (int)&pPlayer4->pActiveSkills[uMessageParam];
2967 ShowStatusBarString(v87, 2); 2967 ShowStatusBarString(v87, 2);
2968 continue; 2968 continue;
2969 case UIMSG_ClickInventoryBtn: 2969 case UIMSG_ClickInventoryBtn:
2970 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 2970 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
2971 sub_419379(); 2971 sub_419379();
2972 sub_4196A0(); 2972 CharacterUI_ReleaseButtons();
2973 GUIWindow::Create(pCharacterScreen_InventoryBtn->uX, pCharacterScreen_InventoryBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_InventoryBtn, 0); 2973 GUIWindow::Create(pCharacterScreen_InventoryBtn->uX, pCharacterScreen_InventoryBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_InventoryBtn, 0);
2974 continue; 2974 continue;
2975 case UIMSG_ClickExitCharacterWindowBtn: 2975 case UIMSG_ClickExitCharacterWindowBtn:
2976 GUIWindow::Create(pCharacterScreen_ExitBtn->uX, pCharacterScreen_ExitBtn->uY, 0, 0, WINDOW_ExitCharacterWindow, (int)pCharacterScreen_ExitBtn, 0); 2976 GUIWindow::Create(pCharacterScreen_ExitBtn->uX, pCharacterScreen_ExitBtn->uY, 0, 0, WINDOW_ExitCharacterWindow, (int)pCharacterScreen_ExitBtn, 0);
2977 continue; 2977 continue;
2978 case UIMSG_ClickAwardsBtn: 2978 case UIMSG_ClickAwardsBtn:
2979 sub_419379(); 2979 sub_419379();
2980 sub_4196A0(); 2980 CharacterUI_ReleaseButtons();
2981 sub_419220(); 2981 sub_419220();
2982 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102; 2982 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102;
2983 GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0); 2983 GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0);
2984 FillAwardsData(); 2984 FillAwardsData();
2985 continue; 2985 continue;
10227 viewparams->bRedrawGameUI = 1; 10227 viewparams->bRedrawGameUI = 1;
10228 continue; 10228 continue;
10229 } 10229 }
10230 case WINDOW_CharacterRecord: 10230 case WINDOW_CharacterRecord:
10231 { 10231 {
10232 CharacterUI_CharacterScreen_Draw(uActiveCharacter); 10232 CharacterUI_CharacterScreen_Draw(pPlayers[uActiveCharacter]);
10233 continue; 10233 continue;
10234 } 10234 }
10235 case WINDOW_Options: 10235 case WINDOW_Options:
10236 { 10236 {
10237 DrawGameOptions(); 10237 DrawGameOptions();
10247 DrawDialogueUI(); 10247 DrawDialogueUI();
10248 continue; 10248 continue;
10249 } 10249 }
10250 case WINDOW_QuickReference: 10250 case WINDOW_QuickReference:
10251 { 10251 {
10252 QuickRefDraw(); 10252 GameUI_QuickRef_Draw();
10253 continue; 10253 continue;
10254 } 10254 }
10255 case WINDOW_Rest: 10255 case WINDOW_Rest:
10256 { 10256 {
10257 RestUI_Draw(); 10257 RestUI_Draw();
10329 case WINDOW_CastSpell_InInventory: 10329 case WINDOW_CastSpell_InInventory:
10330 { 10330 {
10331 pRenderer->ClearZBuffer(0, 479); 10331 pRenderer->ClearZBuffer(0, 479);
10332 draw_leather(); 10332 draw_leather();
10333 CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true); 10333 CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true);
10334 CharacterUI_DrawPaperdoll(uActiveCharacter); 10334 CharacterUI_DrawPaperdoll(pPlayers[uActiveCharacter]);
10335 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u)); 10335 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u));
10336 continue; 10336 continue;
10337 } 10337 }
10338 case WINDOW_FinalWindow: 10338 case WINDOW_FinalWindow:
10339 { 10339 {