Mercurial > mm7
diff GUIButton.cpp @ 1458:934074e7fcc1
ModalWindow
__thiscall and __cdecl removed
Some random renames & refactors
author | Nomad |
---|---|
date | Wed, 21 Aug 2013 14:26:36 +0200 |
parents | bfe342ae0c1f |
children | e9625ad08541 |
line wrap: on
line diff
--- a/GUIButton.cpp Wed Aug 14 00:40:51 2013 +0400 +++ b/GUIButton.cpp Wed Aug 21 14:26:36 2013 +0200 @@ -77,7 +77,7 @@ struct GUIWindow *pGUIWindow_CurrentMenu; struct GUIWindow *ptr_507BD0; struct GUIWindow *pGUIWindow_Settings; -struct GUIWindow *ptr_507BDC; +struct GUIWindow *pModalWindow; struct GUIWindow *pGUIWindow_EscMessageWindow; struct GUIWindow *pBooksWindow; struct GUIWindow *pGUIWindow2; @@ -182,13 +182,13 @@ pDialogueWindow->CreateButton( 480, 30 * column_pos + 146, 140, 30, 1, 0, UIMSG_SelectShopDialogueOption, control_id, 0, "", 0); } //----- (00419379) -------------------------------------------------------- -void __cdecl sub_419379() +void ReleaseAwardsScrollBar() { GUIButton *pButton; // esi@2 - if ( dword_507CBC ) + if ( awards_scroll_bar_created ) { - dword_507CBC = 0; + awards_scroll_bar_created = false; ptr_507BA4->Release(); pBtn_Up->Release(); pBtn_Down->Release(); @@ -208,13 +208,13 @@ } } //----- (00419220) -------------------------------------------------------- -void __cdecl CreateAwardsScrollBar() +void CreateAwardsScrollBar() { GUIButton *pButton; // eax@2 - if ( !dword_507CBC ) + if ( !awards_scroll_bar_created ) { - dword_507CBC = 1; + awards_scroll_bar_created = 1; for ( pButton = pGUIWindow_CurrentMenu->pControlsHead; pButton; pButton = pButton->pNext ) { if ( pButton->msg == UIMSG_InventoryLeftClick )