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
|
|
@ -1,3 +1,5 @@
|
|||
#include "Script/LuaScript.h"
|
||||
#include "UI/Window/UIWindowMgr.h"
|
||||
#include "UI/UIHotkeyGuideWnd.h"
|
||||
|
||||
#include "Contents/Hotkeys/HotkeyInfo.h"
|
||||
|
|
@ -15,8 +17,8 @@
|
|||
|
||||
// OFFSET: 0x009663D0
|
||||
// FUNCTION: fn_13154
|
||||
UIHotkeyGuideWnd::UIHotkeyGuideWnd(UIWindowContext& windows, UIButtonContext& controls)
|
||||
: UIFrameWnd(windows, 0), m_controls(&controls) {
|
||||
UIHotkeyGuideWnd::UIHotkeyGuideWnd(UIWindowContext& windows)
|
||||
: UIFrameWnd(windows, 0) {
|
||||
this->m_current = 4698;
|
||||
}
|
||||
|
||||
|
|
@ -53,15 +55,14 @@ HotkeyGuideLabel::~HotkeyGuideLabel() {
|
|||
// OFFSET: 0x00966C70
|
||||
// FUNCTION: fn_13164
|
||||
void UIHotkeyGuideWnd::Slot15(int, int) {
|
||||
UIButtonContext& controls = *this->m_controls;
|
||||
UIBitmapButton* base = new UIBitmapButton(*this->m_context, controls);
|
||||
UIBitmapButton* base = new UIBitmapButton(*this->m_context);
|
||||
base->SetBitmap("유저인터페이스\\basic_interface\\sys_base_off.bmp", 0, 0);
|
||||
base->SetBitmap("유저인터페이스\\basic_interface\\sys_base_on.bmp", 1, 0);
|
||||
base->SetBitmap("유저인터페이스\\basic_interface\\sys_base_on.bmp", 2, 0);
|
||||
base->SetSize(base->BitmapWidth(), base->BitmapHeight());
|
||||
base->Move(3, 3);
|
||||
this->AddChild(base);
|
||||
this->AddCloseButton(controls, "", 0);
|
||||
this->AddCloseButton("", 0);
|
||||
|
||||
this->m_labels[8] = HotkeyGuideLabel("←", HotkeyGuideKey(528, 93, 0, 75, 15, 36), HotkeyGuideKey());
|
||||
this->m_labels[9] = HotkeyGuideLabel("Tab", HotkeyGuideKey(21, 132, 0, 55, 15, 36), HotkeyGuideKey());
|
||||
|
|
@ -166,7 +167,7 @@ void UIHotkeyGuideWnd::Slot15(int, int) {
|
|||
int messages[18] = {105, 104, 283, 106, 103, 3134, 1317, 2859, 2353, 265, 3135, 2350, 3136, 2646, 3225, 3137, 574, 3138};
|
||||
int hotkeys[18] = {47, 1, 2, 9, 5, 10, 3, 8, 42, -1, 46, 38, 51, 49, 6, 37, 17, 12};
|
||||
for (int i = 0; i < 18; ++i) {
|
||||
HotkeyInfo hotkey = GetHotkeyInfo(controls.behavior, 1, hotkeys[i]);
|
||||
HotkeyInfo hotkey = GetHotkeyInfo(*g_luaScript, 1, hotkeys[i]);
|
||||
if (messages[i] == 265) {
|
||||
this->m_entries.push_back(HotkeyGuideEntry(messages[i], 27, 0));
|
||||
} else {
|
||||
|
|
@ -176,7 +177,7 @@ void UIHotkeyGuideWnd::Slot15(int, int) {
|
|||
|
||||
int index = 0;
|
||||
for (auto entry = this->m_entries.begin(); entry != this->m_entries.end(); ++entry) {
|
||||
UIBasicButton* tab = new UIBasicButton(*this->m_context, controls);
|
||||
UIBasicButton* tab = new UIBasicButton(*this->m_context);
|
||||
tab->Configure(118, LookupMessage(entry->id));
|
||||
tab->Move(index / 6 * 246 + 26, index % 6 * 30 + 310);
|
||||
tab->SetId(entry->id);
|
||||
|
|
@ -185,7 +186,7 @@ void UIHotkeyGuideWnd::Slot15(int, int) {
|
|||
++index;
|
||||
}
|
||||
|
||||
UIBmpTextButton* settings = new UIBmpTextButton(*this->m_context, controls);
|
||||
UIBmpTextButton* settings = new UIBmpTextButton(*this->m_context);
|
||||
settings->SetBitmap("유저인터페이스\\hotkey_guide\\bt_keysettings_normal.bmp", 0, 0);
|
||||
settings->SetBitmap("유저인터페이스\\hotkey_guide\\bt_keysettings_over.bmp", 1, 0);
|
||||
settings->SetBitmap("유저인터페이스\\hotkey_guide\\bt_keysettings_press.bmp", 2, 0);
|
||||
|
|
@ -199,7 +200,6 @@ void UIHotkeyGuideWnd::Slot15(int, int) {
|
|||
// OFFSET: 0x0096B730
|
||||
// FUNCTION: fn_13165
|
||||
void UIHotkeyGuideWnd::Paint() {
|
||||
UIButtonContext& controls = *this->m_controls;
|
||||
auto* background = static_cast<CBitmapRes*>(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\hotkey_guide\\bg_shortcuts.bmp")));
|
||||
this->DrawBitmap(0, 0, &background->image, false);
|
||||
this->DrawTitleBar(false, LookupMessage(3128), 0);
|
||||
|
|
@ -332,7 +332,6 @@ void UIHotkeyGuideWnd::DrawKey(const HotkeyGuideKey* key) {
|
|||
// OFFSET: 0x0096C730
|
||||
// FUNCTION: fn_13174
|
||||
void UIHotkeyGuideWnd::DrawKeyLabel(std::string text, const HotkeyGuideKey* key) {
|
||||
UIButtonContext& controls = *this->m_controls;
|
||||
int x = key->x;
|
||||
if (key->align == 6) {
|
||||
int textWidth = this->TextWidth(text.c_str(), 0, 0, 12, 0, 0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue