Mercurial > mm7
diff mm7_5.cpp @ 991:c5d8ea1e6ccb
CharacterUI cleanings.
author | Nomad |
---|---|
date | Mon, 13 May 2013 17:01:20 +0200 |
parents | d982fffb8b96 |
children | 3a3ab572eff5 |
line wrap: on
line diff
--- a/mm7_5.cpp Sat May 11 17:56:12 2013 +0200 +++ b/mm7_5.cpp Mon May 13 17:01:20 2013 +0200 @@ -1431,7 +1431,7 @@ continue; } LABEL_319: - sub_4196A0(); + CharacterUI_ReleaseButtons(); sub_419379(); LABEL_321: pIcons_LOD->_4114F2(); @@ -2932,15 +2932,15 @@ continue; case UIMSG_ClickStatsBtn: pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100; - sub_4196A0(); + CharacterUI_ReleaseButtons(); sub_419379(); GUIWindow::Create(pCharacterScreen_StatsBtn->uX, pCharacterScreen_StatsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_StatsBtn, 0); continue; case UIMSG_ClickSkillsBtn: pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 101; - sub_4196A0(); + CharacterUI_ReleaseButtons(); sub_419379(); - CharacterUI_SkillScreen_Draw(); + CharacterUI_SkillsTab_CreateButtons(); GUIWindow::Create(pCharacterScreen_SkillsBtn->uX, pCharacterScreen_SkillsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_SkillsBtn, 0); continue; case UIMSG_SkillUp: @@ -2969,7 +2969,7 @@ case UIMSG_ClickInventoryBtn: pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; sub_419379(); - sub_4196A0(); + CharacterUI_ReleaseButtons(); GUIWindow::Create(pCharacterScreen_InventoryBtn->uX, pCharacterScreen_InventoryBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_InventoryBtn, 0); continue; case UIMSG_ClickExitCharacterWindowBtn: @@ -2977,7 +2977,7 @@ continue; case UIMSG_ClickAwardsBtn: sub_419379(); - sub_4196A0(); + CharacterUI_ReleaseButtons(); sub_419220(); pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102; GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0); @@ -10229,7 +10229,7 @@ } case WINDOW_CharacterRecord: { - CharacterUI_CharacterScreen_Draw(uActiveCharacter); + CharacterUI_CharacterScreen_Draw(pPlayers[uActiveCharacter]); continue; } case WINDOW_Options: @@ -10249,7 +10249,7 @@ } case WINDOW_QuickReference: { - QuickRefDraw(); + GameUI_QuickRef_Draw(); continue; } case WINDOW_Rest: @@ -10331,7 +10331,7 @@ pRenderer->ClearZBuffer(0, 479); draw_leather(); CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true); - CharacterUI_DrawPaperdoll(uActiveCharacter); + CharacterUI_DrawPaperdoll(pPlayers[uActiveCharacter]); pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u)); continue; }