Mercurial > mm7

comparison UI/UICharacter.cpp @ 1458:934074e7fcc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ModalWindow __thiscall and __cdecl removed Some random renames & refactors
author Nomad
date Wed, 21 Aug 2013 14:26:36 +0200
parents bfe342ae0c1f
children 845907a747d3
comparison
equal deleted inserted replaced
1457:9dc33590f93e 1458:934074e7fcc1
41 unsigned int ui_character_stat_buffed_color; 41 unsigned int ui_character_stat_buffed_color;
42 unsigned int ui_character_stat_debuffed_color; 42 unsigned int ui_character_stat_debuffed_color;
43 unsigned int ui_character_skillinfo_can_learn; 43 unsigned int ui_character_skillinfo_can_learn;
44 unsigned int ui_character_skillinfo_can_learn_gm; 44 unsigned int ui_character_skillinfo_can_learn_gm;
45 unsigned int ui_character_skillinfo_cant_learn; 45 unsigned int ui_character_skillinfo_cant_learn;
46 unsigned int ui_character_condition_normal_color;
47 unsigned int ui_character_condition_light_color;
48 unsigned int ui_character_condition_moderate_color;
49 unsigned int ui_character_condition_severe_color;
46 std::array<unsigned int, 6> ui_character_award_color; 50 std::array<unsigned int, 6> ui_character_award_color;
47 51
48 unsigned int ui_game_minimap_outline_color; 52 unsigned int ui_game_minimap_outline_color;
49 unsigned int ui_game_minimap_actor_friendly_color; 53 unsigned int ui_game_minimap_actor_friendly_color;
50 unsigned int ui_game_minimap_actor_hostile_color; 54 unsigned int ui_game_minimap_actor_hostile_color;
105 ui_character_stat_debuffed_color = TargetColor(255, 35, 0); 109 ui_character_stat_debuffed_color = TargetColor(255, 35, 0);
106 110
107 ui_character_skillinfo_can_learn = TargetColor(255, 255, 255); 111 ui_character_skillinfo_can_learn = TargetColor(255, 255, 255);
108 ui_character_skillinfo_can_learn_gm = TargetColor(255, 255, 0); 112 ui_character_skillinfo_can_learn_gm = TargetColor(255, 255, 0);
109 ui_character_skillinfo_cant_learn = TargetColor(255, 0, 0); 113 ui_character_skillinfo_cant_learn = TargetColor(255, 0, 0);
114
115 ui_character_condition_normal_color = TargetColor(255, 255, 255);
116 ui_character_condition_light_color = TargetColor(0, 255, 0);
117 ui_character_condition_moderate_color = TargetColor(225, 205, 35);
118 ui_character_condition_severe_color = TargetColor(255, 35, 0);
110 119
111 ui_character_award_color[0] = TargetColor(248, 108, 160); 120 ui_character_award_color[0] = TargetColor(248, 108, 160);
112 ui_character_award_color[1] = TargetColor(112, 220, 248); 121 ui_character_award_color[1] = TargetColor(112, 220, 248);
113 ui_character_award_color[2] = TargetColor(192, 192, 240); 122 ui_character_award_color[2] = TargetColor(192, 192, 240);
114 ui_character_award_color[3] = TargetColor( 64, 244, 96); 123 ui_character_award_color[3] = TargetColor( 64, 244, 96);
665 pRenderer->ClearZBuffer(0, 479); 674 pRenderer->ClearZBuffer(0, 479);
666 switch (pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0]) 675 switch (pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0])
667 { 676 {
668 case WINDOW_CharacterWindow_Stats: // stats 677 case WINDOW_CharacterWindow_Stats: // stats
669 CharacterUI_ReleaseButtons(); 678 CharacterUI_ReleaseButtons();
670 sub_419379(); 679 ReleaseAwardsScrollBar();
671 CharacterUI_StatsTab_Draw(player); 680 CharacterUI_StatsTab_Draw(player);
672 pRenderer->DrawTextureIndexed(pCharacterScreen_StatsBtn->uX, 681 pRenderer->DrawTextureIndexed(pCharacterScreen_StatsBtn->uX,
673 pCharacterScreen_StatsBtn->uY, 682 pCharacterScreen_StatsBtn->uY,
674 pIcons_LOD->LoadTexturePtr("ib-cd1-d", TEXTURE_16BIT_PALETTE)); 683 pIcons_LOD->LoadTexturePtr("ib-cd1-d", TEXTURE_16BIT_PALETTE));
675 break; 684 break;
678 if (dword_507CC0_activ_ch != uActiveCharacter) 687 if (dword_507CC0_activ_ch != uActiveCharacter)
679 { 688 {
680 CharacterUI_ReleaseButtons(); 689 CharacterUI_ReleaseButtons();
681 CharacterUI_SkillsTab_CreateButtons(); 690 CharacterUI_SkillsTab_CreateButtons();
682 } 691 }
683 sub_419379(); 692 ReleaseAwardsScrollBar();
684 CharacterUI_SkillsTab_Draw(player); 693 CharacterUI_SkillsTab_Draw(player);
685 pRenderer->DrawTextureIndexed(pCharacterScreen_SkillsBtn->uX, 694 pRenderer->DrawTextureIndexed(pCharacterScreen_SkillsBtn->uX,
686 pCharacterScreen_SkillsBtn->uY, 695 pCharacterScreen_SkillsBtn->uY,
687 pIcons_LOD->LoadTexturePtr("ib-cd2-d", TEXTURE_16BIT_PALETTE)); 696 pIcons_LOD->LoadTexturePtr("ib-cd2-d", TEXTURE_16BIT_PALETTE));
688 break; 697 break;
689 698
690 case WINDOW_CharacterWindow_Awards: // awards 699 case WINDOW_CharacterWindow_Awards: // awards
691 CharacterUI_ReleaseButtons(); 700 CharacterUI_ReleaseButtons();
692 sub_419379(); 701 ReleaseAwardsScrollBar();
693 CreateAwardsScrollBar(); 702 CreateAwardsScrollBar();
694 CharacterUI_AwardsTab_Draw(player); 703 CharacterUI_AwardsTab_Draw(player);
695 pRenderer->DrawTextureIndexed(pCharacterScreen_AwardsBtn->uX, 704 pRenderer->DrawTextureIndexed(pCharacterScreen_AwardsBtn->uX,
696 pCharacterScreen_AwardsBtn->uY, 705 pCharacterScreen_AwardsBtn->uY,
697 pIcons_LOD->LoadTexturePtr("ib-cd4-d", TEXTURE_16BIT_PALETTE)); 706 pIcons_LOD->LoadTexturePtr("ib-cd4-d", TEXTURE_16BIT_PALETTE));
698 break; 707 break;
699 708
700 case WINDOW_CharacterWindow_Inventory: // inventory and other 709 case WINDOW_CharacterWindow_Inventory: // inventory and other
701 CharacterUI_ReleaseButtons(); 710 CharacterUI_ReleaseButtons();
702 sub_419379(); 711 ReleaseAwardsScrollBar();
703 CharacterUI_InventoryTab_Draw(player, false); 712 CharacterUI_InventoryTab_Draw(player, false);
704 pRenderer->DrawTextureIndexed(pCharacterScreen_InventoryBtn->uX, 713 pRenderer->DrawTextureIndexed(pCharacterScreen_InventoryBtn->uX,
705 pCharacterScreen_InventoryBtn->uY, 714 pCharacterScreen_InventoryBtn->uY,
706 pIcons_LOD->LoadTexturePtr("ib-cd3-d", TEXTURE_16BIT_PALETTE)); 715 pIcons_LOD->LoadTexturePtr("ib-cd3-d", TEXTURE_16BIT_PALETTE));
707 break; 716 break;
2433 papredoll_flying_feet[pPlayers[uPlayerID]->uCurrentFace] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 2442 papredoll_flying_feet[pPlayers[uPlayerID]->uCurrentFace] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
2434 IsPlayerWearingWatersuit[uPlayerID] = 0; 2443 IsPlayerWearingWatersuit[uPlayerID] = 0;
2435 } 2444 }
2436 } 2445 }
2437 //----- (00468F8A) -------------------------------------------------------- 2446 //----- (00468F8A) --------------------------------------------------------
2438 void __cdecl OnPaperdollLeftClick() 2447 void OnPaperdollLeftClick()
2439 { 2448 {
2440 int v1; // ecx@1 2449 int v1; // ecx@1
2441 unsigned int v2; // edi@1 2450 unsigned int v2; // edi@1
2442 unsigned int v3; // edx@4 2451 unsigned int v3; // edx@4
2443 unsigned int pSkillType; // esi@5 2452 unsigned int pSkillType; // esi@5