Maintenance: [forced, user-approved] Remove fabricated UIButtonContext (follow-up to #10125). Original button code reads globals dire
Batch #10169 by ragnarok-clanker: forced by an admin (137 lower score(s), 472 changed function(s)); checked with 394 compiled unit(s), including every includer of Source/Contents/SignBoard/SignBoard.h, Source/UI/Buttons/UIBasicButton.h, Source/UI/Buttons/UIBitmapButton.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIBmpTextButton.h, Source/UI/Buttons/UIBmpTextButton2.h, Source/UI/Buttons/UIButton.h, Source/UI/Buttons/UICashEmotionSprBtn.h, Source/UI/Buttons/UICheckBox.h, Source/UI/Buttons/UIItemMoveInfo.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UIJobSlotButton.h, Source/UI/Buttons/UINaviLinkButton.h, Source/UI/Buttons/UINoneVisibleButton.h, Source/UI/Buttons/UIRadioBtn.h, Source/UI/Buttons/UIReplayButton.h, Source/UI/Buttons/UISlotBmpButton.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITVBitmapButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITagButton.h, Source/UI/Buttons/UITextButton.h, Source/UI/CashEmotion/UICashEmotionPiece.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIChooseWnd.h, Source/UI/Dialogs/UIEditctrlWnd.h, Source/UI/Dialogs/UIEmailAddressWnd.h, Source/UI/Dialogs/UIGraffiStrboxWnd.h, Source/UI/Dialogs/UIMemorialDunWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINotifyLevelUpWnd.h, Source/UI/Dialogs/UINotifyQuestWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIProhibitListWnd.h, Source/UI/Dialogs/UIQuitWnd.h, Source/UI/Dialogs/UIRestartWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipOfTheDayWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Dialogs/UIWaitDBSaveWnd.h, Source/UI/Edit/UICandidateWnd.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Guild/UIAgitWnd.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Items/MergeItemWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIIllustWnd.h, Source/UI/Items/UIItemParamChangeDisplayWnd.h, Source/UI/Items/UIItemRepairWnd.h, Source/UI/Items/UIMakeTargetListWnd.h, Source/UI/Items/UIMakeTargetProcessWnd.h, Source/UI/Items/UIMakeTargetResultWnd.h, Source/UI/Items/UISpellListWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Items/UIWeaponRefineWnd.h, Source/UI/Lists/UIComboBoxDefWnd.h, Source/UI/Lists/UIListBox.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UITreeView.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/Navigation/UIPrivateAirplaneWnd.h, Source/UI/Party/UIAdvenPartyBoardWnd.h, Source/UI/Party/UIApplyForPartyWnd.h, Source/UI/Party/UIPartyInfoWnd.h, Source/UI/Party/UIPartySettingWnd.h, Source/UI/Party/UIRegisterPartyWnd.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantShopMakeWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Shop/UINoticeMessageBox_LockSellItem.h, Source/UI/Shortcuts/ShortcutControls.h, Source/UI/Shortcuts/UIShortCutWnd.h, Source/UI/Skill/UISkillNameChangeWnd.h, Source/UI/Status/UIStatusWnd.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIStaticText.h, Source/UI/Text/UITextViewer.h, Source/UI/UIBarGraph.h, Source/UI/UIBasicCtrl.h, Source/UI/UIBroadcastBalloon.h, Source/UI/UICaptchaPreviewWnd.h, Source/UI/UICaptchaRegisterWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UICheckAttendanceWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UIHotkeyGuideWnd.h, Source/UI/UIIngredientInfoWnd.h, Source/UI/UIItemReformWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UILapineUpgradeBoxWnd.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIReputeWnd.h, Source/UI/UISlotBitmap.h, Source/UI/UIStaticBitmap.h, Source/UI/UIStaticItem.h, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIBalloonOpenBtn.h, Source/UI/Window/UIBank_NewWnd.h, Source/UI/Window/UIBasicInfoWnd.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChangeNameWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICntWnd.h, Source/UI/Window/UIDebuffRemoveWnd.h, Source/UI/Window/UIEscOptionWnd.h, Source/UI/Window/UIFrameWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMerInfoWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMileageWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINewSkillListWnd.h, Source/UI/Window/UINoteWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIOpenMailBoxWnd.h, Source/UI/Window/UIOpenRoulletteWnd.h, Source/UI/Window/UIPartyBookingHelpWnd.h, Source/UI/Window/UIPayConfirmWnd.h, Source/UI/Window/UIPetEvolutionWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRebirthWnd.h, Source/UI/Window/UIReplayControlWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyListWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelectReplayDataWnd.h, Source/UI/Window/UISelectServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UIShowWarpWnd.h, Source/UI/Window/UITalkboxTrapInputWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIVideoWnd.h, Source/UI/Window/UIViewCameraInfoWnd.h, Source/UI/Window/UIWindow.h.
This commit is contained in:
ragnarok-clanker
parent
6e18250b08
commit
cb26c24e68
298 changed files with 1499 additions and 1731 deletions
|
|
@ -2338,7 +2338,7 @@ void UIListBox_NaviSearch::Paint() {
|
|||
// OFFSET: 0x005C4EA0
|
||||
// FUNCTION: fn_03581
|
||||
void UINavigationV4Wnd::Slot15(int, int) {
|
||||
UIBitmapButton* closeButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* closeButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00B8 = closeButton;
|
||||
closeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_close_normal.bmp", 0, 0);
|
||||
closeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_close_over.bmp", 1, 0);
|
||||
|
|
@ -2348,7 +2348,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
closeButton->SetTooltip(LookupMessage(0x0BE5));
|
||||
this->AddChild(closeButton);
|
||||
|
||||
UIBitmapButton* maximizeButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* maximizeButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00C4 = maximizeButton;
|
||||
maximizeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_maximize_normal.bmp", 0, 0);
|
||||
maximizeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_maximize_over.bmp", 1, 0);
|
||||
|
|
@ -2358,7 +2358,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
maximizeButton->SetTooltip(LookupMessage(0x089B));
|
||||
this->AddChild(maximizeButton);
|
||||
|
||||
UICheckBox* minimizeCheck = new UICheckBox(*this->m_context, *this->m_controls);
|
||||
UICheckBox* minimizeCheck = new UICheckBox(*this->m_context);
|
||||
this->unknown_00D4 = minimizeCheck;
|
||||
minimizeCheck->SetSize(110, 12);
|
||||
minimizeCheck->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", "Minimize");
|
||||
|
|
@ -2366,7 +2366,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
minimizeCheck->SetTooltip(LookupMessage(0x089C));
|
||||
this->AddChild(minimizeCheck);
|
||||
|
||||
UIBitmapButton* roadIconButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* roadIconButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00C8 = roadIconButton;
|
||||
this->SetRoadIcon(g_navigationRoadIcon);
|
||||
roadIconButton->SetSize(roadIconButton->geometry.width, roadIconButton->geometry.height);
|
||||
|
|
@ -2374,7 +2374,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
roadIconButton->SetTooltip(LookupMessage(0x0C8B));
|
||||
this->AddChild(roadIconButton);
|
||||
|
||||
UIBitmapButton* roadListButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* roadListButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00D8 = roadListButton;
|
||||
roadListButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_roadlistwnd_normal.bmp", 0, 0);
|
||||
roadListButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_roadlistwnd_over.bmp", 1, 0);
|
||||
|
|
@ -2402,7 +2402,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
searchList->SetId(441);
|
||||
this->AddChild(searchList);
|
||||
|
||||
UICheckBox* filterCheck = new UICheckBox(*this->m_context, *this->m_controls);
|
||||
UICheckBox* filterCheck = new UICheckBox(*this->m_context);
|
||||
this->unknown_00F4 = filterCheck;
|
||||
filterCheck->SetSize(110, 12);
|
||||
filterCheck->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", "service");
|
||||
|
|
@ -2411,7 +2411,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
filterCheck->SetTooltip(LookupMessage(0x0C8C));
|
||||
this->AddChild(filterCheck);
|
||||
|
||||
UIBitmapButton* shareButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* shareButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00F8 = shareButton;
|
||||
shareButton->SetBitmap("유저인터페이스\\private_airplane\\btn_share_normal.bmp", 0, 0);
|
||||
shareButton->SetBitmap("유저인터페이스\\private_airplane\\btn_share_over.bmp", 1, 0);
|
||||
|
|
@ -2421,7 +2421,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
shareButton->SetTooltip(LookupMessage(0x0C86));
|
||||
this->AddChild(shareButton);
|
||||
|
||||
UIBitmapButton* findButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* findButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00FC = findButton;
|
||||
findButton->SetBitmap("유저인터페이스\\private_airplane\\btn_find_normal.bmp", 0, 0);
|
||||
findButton->SetBitmap("유저인터페이스\\private_airplane\\btn_find_over.bmp", 1, 0);
|
||||
|
|
@ -2431,7 +2431,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
findButton->SetTooltip(LookupMessage(0x0895));
|
||||
this->AddChild(findButton);
|
||||
|
||||
UIBitmapButton* moveButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* moveButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_0100 = moveButton;
|
||||
moveButton->SetBitmap("유저인터페이스\\private_airplane\\btn_move_normal.bmp", 0, 0);
|
||||
moveButton->SetBitmap("유저인터페이스\\private_airplane\\btn_move_over.bmp", 1, 0);
|
||||
|
|
@ -2440,17 +2440,17 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
moveButton->SetId(499);
|
||||
this->AddChild(moveButton);
|
||||
|
||||
UIStaticText* label = new UIStaticText(*this->m_context, *this->m_controls);
|
||||
UIStaticText* label = new UIStaticText(*this->m_context);
|
||||
this->unknown_00E8 = label;
|
||||
label->SetSize(100, 20);
|
||||
this->AddChild(label);
|
||||
label->SetText(LookupMessage(0x0C87), 0);
|
||||
label->SetColor(0, 0, 0);
|
||||
|
||||
this->unknown_00B4 = this->AddCloseButton(*this->m_controls, LookupMessage(0x0BE5), 0);
|
||||
this->unknown_00BC = this->AddMinimizeButton(*this->m_controls, LookupMessage(0x089C), 0);
|
||||
this->unknown_00B4 = this->AddCloseButton(LookupMessage(0x0BE5), 0);
|
||||
this->unknown_00BC = this->AddMinimizeButton(LookupMessage(0x089C), 0);
|
||||
|
||||
UIBitmapButton* helpButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* helpButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00C0 = helpButton;
|
||||
helpButton->SetBitmap("유저인터페이스\\navigation_interface\\NaviHelp_off.bmp", 0, 0);
|
||||
helpButton->SetBitmap("유저인터페이스\\navigation_interface\\NaviHelp_on.bmp", 1, 0);
|
||||
|
|
@ -2460,7 +2460,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
helpButton->SetTooltip(LookupMessage(0x089D));
|
||||
this->AddChild(helpButton);
|
||||
|
||||
UIBitmapButton* dataButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* dataButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00CC = dataButton;
|
||||
dataButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_Navidata_Open_normal.bmp", 0, 0);
|
||||
dataButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_Navidata_Open_over.bmp", 1, 0);
|
||||
|
|
@ -2478,7 +2478,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
searchEdit->SetId(516);
|
||||
this->AddChild(searchEdit);
|
||||
|
||||
UIBitmapButton* searchButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* searchButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00E4 = searchButton;
|
||||
searchButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_searchbar_normal.bmp", 3, 0);
|
||||
searchButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_searchbar_normal.bmp", 0, 0);
|
||||
|
|
@ -2489,7 +2489,7 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
searchButton->SetTooltip(LookupMessage(0x0894));
|
||||
this->AddChild(searchButton);
|
||||
|
||||
UIBitmapButton* backButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
UIBitmapButton* backButton = new UIBitmapButton(*this->m_context);
|
||||
this->unknown_00D0 = backButton;
|
||||
backButton->SetBitmap("유저인터페이스\\navigation_interface3\\bt_back.bmp", 3, 0);
|
||||
backButton->SetBitmap("유저인터페이스\\navigation_interface3\\bt_back.bmp", 0, 0);
|
||||
|
|
@ -2522,9 +2522,9 @@ void UINavigationV4Wnd::Slot15(int, int) {
|
|||
// OFFSET: 0x005C5D40
|
||||
// FUNCTION: fn_03582
|
||||
void UINavigationroadiconWnd::Slot15(int, int) {
|
||||
this->AddCloseButton(*this->m_controls, LookupMessage(3045), 0);
|
||||
this->AddCloseButton(LookupMessage(3045), 0);
|
||||
|
||||
this->icon = new UIStaticBitmap(*this->m_context, *this->m_controls);
|
||||
this->icon = new UIStaticBitmap(*this->m_context);
|
||||
this->icon->SetBitmap("유저인터페이스\\navigation_interface3\\img_roadIocn_bg_select.bmp");
|
||||
this->icon->SetSize(this->icon->geometry.width, this->icon->geometry.height);
|
||||
|
||||
|
|
@ -3020,7 +3020,7 @@ int UINavigationroadiconWnd::SendMsg(UIWindow*, int message, std::intptr_t a, st
|
|||
// OFFSET: 0x005C4D70
|
||||
// FUNCTION: fn_03580
|
||||
void UINavigationRuideWnd::Slot15(int width, int) {
|
||||
this->AddCloseButton(*this->m_controls, LookupMessage(3045), 0);
|
||||
this->AddCloseButton(LookupMessage(3045), 0);
|
||||
this->routeList = new UIListBox_NaviSearch(*this->m_context, *this->m_listContext);
|
||||
this->routeList->SetSize(width - 4, 293);
|
||||
this->routeList->backgroundRed = 255;
|
||||
|
|
@ -3674,8 +3674,8 @@ void UINavigationV4Wnd::SetRoadIcon(int slot) {
|
|||
// OFFSET: 0x005C5E50
|
||||
// FUNCTION: fn_03583
|
||||
void UIPrivateAirplaneWnd::Slot15(int, int) {
|
||||
this->AddBaseButton(*this->m_controls);
|
||||
this->AddCloseButton(*this->m_controls, "", 0);
|
||||
this->AddBaseButton();
|
||||
this->AddCloseButton("", 0);
|
||||
|
||||
const int count = static_cast<int>(g_privateAirplaneItems->m_needItems.size());
|
||||
for (int index = 0, y = 26; index < count; ++index, y += 26) {
|
||||
|
|
@ -3692,7 +3692,7 @@ void UIPrivateAirplaneWnd::Slot15(int, int) {
|
|||
continue;
|
||||
}
|
||||
|
||||
UIBasicButton* button = new UIBasicButton(*this->m_context, *this->m_controls);
|
||||
UIBasicButton* button = new UIBasicButton(*this->m_context);
|
||||
const std::string text = FormatOwnedString(LookupMessage(0xd01), name);
|
||||
button->Configure(0xc0, text.c_str());
|
||||
button->Move(8, y);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue