From 8ba9c6719a5c96b3e58e00d3b5d2f1fdd07cccc1 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Tue, 3 Nov 2026 00:23:34 +0000 Subject: [PATCH] Maintenance: [forced, user-approved] Family F2a (first half of UIWindowContext removal; coordinator-approved bridge split because F2 Batch #10217 by ragnarok-clanker: forced by an admin (236 lower score(s), 885 changed function(s)); checked with 558 compiled unit(s), including every includer of Source/Client/Mode/ModeTooltip.h, Source/Contents/SignBoard/SignBoard.h, Source/UI/Acceptance/UIJoinPartyAcceptWnd.h, Source/UI/AdventureGuide/UIAdventureGuide.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/UIRadioButton.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/UICashEmotionPack.h, Source/UI/CashEmotion/UICashEmotionPiece.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomMakeWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIChooseWnd.h, Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h, Source/UI/Dialogs/UIEmailAddressWnd.h, Source/UI/Dialogs/UIGraffiStrboxWnd.h, Source/UI/Dialogs/UILoadingWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UINoticeConfirmWnd.h, Source/UI/Dialogs/UINotifyLevelUpWnd.h, Source/UI/Dialogs/UINotifyQuestWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIPetTamingDeceiveWnd.h, Source/UI/Dialogs/UIProhibitListWnd.h, Source/UI/Dialogs/UIQuitWnd.h, Source/UI/Dialogs/UIRestartWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipOfTheDayWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Dialogs/UIToolTipWnd.h, Source/UI/Dialogs/UIWaitDBSaveWnd.h, Source/UI/Dialogs/UIWaitWnd.h, Source/UI/Edit/UICandidateWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Enchant/EnchantUI.h, Source/UI/EntryQueue/UIEntryQueueWnd.h, Source/UI/FrameSkin.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Items/MergeItemWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIGameItem.h, Source/UI/Items/UIIllustWnd.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemIdentifyWnd.h, Source/UI/Items/UINotifyItemObtainWnd.h, Source/UI/Items/UISpellListWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Lists/TableBox.h, Source/UI/Lists/UIChatHisBox.h, Source/UI/Lists/UIComboBox.h, Source/UI/Lists/UIComboBoxDefWnd.h, Source/UI/Lists/UIComboBoxEx.h, Source/UI/Lists/UIComboBoxV2Wnd.h, Source/UI/Lists/UIComboBoxWnd.h, Source/UI/Lists/UIDropDownBox.h, Source/UI/Lists/UIItemStoreComboBox.h, Source/UI/Lists/UIListBox.h, Source/UI/Lists/UIListBoxEx.h, Source/UI/Lists/UIListBoxNavi.h, Source/UI/Lists/UIListBoxNaviSearch.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UIPackageBoxNameList.h, Source/UI/Lists/UIReplayListBox.h, Source/UI/Lists/UIScrollBar.h, Source/UI/Lists/UIScrollBarNavi.h, Source/UI/Lists/UIScrollBarVariants.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UIThumb.h, Source/UI/Lists/UITreeView.h, Source/UI/Lists/UIVScrollBar.h, Source/UI/Menu/UIMenuIconWnd.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/Navigation/UIPrivateAirplaneWnd.h, Source/UI/Party/UIAdvenPartyBoardWnd.h, Source/UI/Party/UIApplyForPartyWnd.h, Source/UI/Party/UIMiniPartyWnd.h, Source/UI/Party/UIPartyInfoWnd.h, Source/UI/Party/UIPartySettingWnd.h, Source/UI/Party/UIRegisterPartyWnd.h, Source/UI/Party/UIRequestJoinPartyWnd.h, Source/UI/Quest/UIOngoingQuestInfo.h, Source/UI/Quest/UIQuestDisplay.h, Source/UI/Quest/UIRecommendedQuestInfo.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantItemWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Shop/UINoticeMessageBox_LockSellItem.h, Source/UI/Shop/UInCash_CallWnd.h, Source/UI/Shortcuts/UIQuickSlotWnd.h, Source/UI/Skill/UISkillDescribeWnd.h, Source/UI/Skill/UISkillListWnd.h, Source/UI/Skill/UISkillNameChangeWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/Status/UIStatusWnd.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIBalloonText.h, Source/UI/Text/UICharInfoBalloonText.h, Source/UI/Text/UINameBalloonText.h, Source/UI/Text/UIStaticText.h, Source/UI/Text/UIStaticTextControl.h, Source/UI/Text/UIStaticText_LF.h, Source/UI/Text/UIString.h, Source/UI/Text/UITagTextViewer.h, Source/UI/Text/UITextViewer.h, Source/UI/Text/UITextViewerControl.h, Source/UI/Text/UITransBalloonText.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.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/UIMacroDetectorWnd.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIReputeWnd.h, Source/UI/UIRoundBoxTooltipWnd.h, Source/UI/UIScrollWnd.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/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIDebuffRemoveWnd.h, Source/UI/Window/UIFrameWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMerInfoWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMessageBoxAutoreturn.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINormalMB.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIPadding.h, Source/UI/Window/UIPayConfirmWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIReplayControlWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIResizer.h, Source/UI/Window/UISelectReplayDataWnd.h, Source/UI/Window/UISelectServerWnd.h, Source/UI/Window/UITab.h, Source/UI/Window/UITalkboxTrapInputWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWordDisplayWnd.h. --- Source/Client/Input/Language.cpp | 16 +- Source/Client/Mode/GameMode.cpp | 8 +- Source/Client/Mode/GameModeHandlers.cpp | 2 +- Source/Client/Mode/GameModePackets.cpp | 2 +- Source/Client/Mode/ModeTooltip.cpp | 2 +- Source/Client/Mode/ModeTooltip.h | 2 - Source/Contents/Actors/Skill.cpp | 2 +- Source/Contents/CashEmotionMgr.cpp | 122 +++---- Source/Contents/Messenger/MessengerMember.cpp | 46 +-- Source/Contents/NavigationRoute.cpp | 2 +- Source/Contents/SignBoard/SignBoard.cpp | 16 +- Source/Contents/SignBoard/SignBoard.h | 6 +- Source/UI/Acceptance/UIChooseSellBuyWnd.cpp | 326 +++++++++--------- Source/UI/Acceptance/UIExchangeAcceptWnd.cpp | 4 +- Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp | 4 +- Source/UI/Acceptance/UIJoinPartyAcceptWnd.h | 24 +- Source/UI/AdventureGuide/UIAdventureGuide.cpp | 88 ++--- Source/UI/AdventureGuide/UIAdventureGuide.h | 14 +- Source/UI/Buttons/UIBasicButton.cpp | 2 +- Source/UI/Buttons/UIBasicButton.h | 3 +- Source/UI/Buttons/UIBitmapButton.cpp | 4 +- Source/UI/Buttons/UIBitmapButton.h | 3 +- Source/UI/Buttons/UIBmpRadioBtn.cpp | 6 +- Source/UI/Buttons/UIBmpRadioBtn.h | 6 +- Source/UI/Buttons/UIBmpTextButton.cpp | 2 +- Source/UI/Buttons/UIBmpTextButton.h | 1 - Source/UI/Buttons/UIBmpTextButton2.cpp | 2 +- Source/UI/Buttons/UIBmpTextButton2.h | 2 +- Source/UI/Buttons/UIButton.cpp | 4 +- Source/UI/Buttons/UIButton.h | 3 +- Source/UI/Buttons/UICashEmotionSprBtn.h | 2 +- Source/UI/Buttons/UICheckBox.cpp | 4 +- Source/UI/Buttons/UICheckBox.h | 3 +- Source/UI/Buttons/UIItemMoveInfo.cpp | 4 +- Source/UI/Buttons/UIItemMoveInfo.h | 2 +- Source/UI/Buttons/UIItemTagButton.h | 1 - Source/UI/Buttons/UIJobSlotButton.cpp | 2 +- Source/UI/Buttons/UIJobSlotButton.h | 2 +- Source/UI/Buttons/UINaviLinkButton.cpp | 2 +- Source/UI/Buttons/UINaviLinkButton.h | 2 +- Source/UI/Buttons/UINoneVisibleButton.cpp | 2 +- Source/UI/Buttons/UINoneVisibleButton.h | 2 +- Source/UI/Buttons/UIRadioBtn.cpp | 2 +- Source/UI/Buttons/UIRadioBtn.h | 2 +- Source/UI/Buttons/UIRadioButton.h | 4 +- Source/UI/Buttons/UIReplayButton.h | 2 +- Source/UI/Buttons/UISlotBmpButton.cpp | 4 +- Source/UI/Buttons/UISlotBmpButton.h | 2 +- Source/UI/Buttons/UISpriteButton.h | 5 +- Source/UI/Buttons/UITVBitmapButton.h | 3 - Source/UI/Buttons/UITVTextButton.h | 5 - Source/UI/Buttons/UITagButton.cpp | 2 +- Source/UI/Buttons/UITagButton.h | 2 +- Source/UI/Buttons/UITextButton.cpp | 38 +- Source/UI/Buttons/UITextButton.h | 3 +- Source/UI/CashEmotion/UICashEmotionPack.h | 2 +- Source/UI/CashEmotion/UICashEmotionPiece.h | 3 +- Source/UI/CashShop/UICashShopWnd.cpp | 60 ++-- Source/UI/CashShop/UICashShopWnd.h | 12 +- Source/UI/Chat/UIChatRoomMakeWnd.cpp | 4 +- Source/UI/Chat/UIChatRoomMakeWnd.h | 4 +- Source/UI/Chat/UIChatRoomTitle.cpp | 4 +- Source/UI/Chat/UIChatRoomTitle.h | 2 +- Source/UI/Chat/UISubChatHisWnd.cpp | 16 +- Source/UI/Chat/UISubChatHisWnd.h | 1 - Source/UI/Chat/UIWhisperWnd.cpp | 2 +- Source/UI/Chat/UIWhisperWnd.h | 2 +- Source/UI/Clan/UIClanWnd.cpp | 4 +- Source/UI/Clan/UIClanWnd.h | 4 +- Source/UI/Dialogs/UIBookWnd.h | 2 +- Source/UI/Dialogs/UIChooseWarpWnd.h | 2 +- Source/UI/Dialogs/UIChooseWnd.cpp | 4 +- Source/UI/Dialogs/UIChooseWnd.h | 2 +- .../UI/Dialogs/UIDisconnectedServerMsgWnd.h | 2 +- Source/UI/Dialogs/UIEmailAddressWnd.cpp | 4 +- Source/UI/Dialogs/UIEmailAddressWnd.h | 2 +- Source/UI/Dialogs/UIGraffiStrboxWnd.cpp | 8 +- Source/UI/Dialogs/UIGraffiStrboxWnd.h | 2 +- Source/UI/Dialogs/UILoadingWnd.h | 2 +- Source/UI/Dialogs/UIMenuWnd.h | 2 +- Source/UI/Dialogs/UIMinimapZoomWnd.cpp | 2 +- Source/UI/Dialogs/UINoticeConfirmWnd.h | 2 +- Source/UI/Dialogs/UINotifyLevelUpWnd.h | 2 +- Source/UI/Dialogs/UINotifyQuestWnd.h | 2 +- Source/UI/Dialogs/UINpcEditDialogWnd.h | 4 +- Source/UI/Dialogs/UIPasswordWnd.cpp | 12 +- Source/UI/Dialogs/UIPasswordWnd.h | 8 +- Source/UI/Dialogs/UIPetTamingDeceiveWnd.h | 2 +- Source/UI/Dialogs/UIProhibitListWnd.h | 2 +- Source/UI/Dialogs/UIQuitWnd.h | 2 +- Source/UI/Dialogs/UIRestartWnd.h | 2 +- Source/UI/Dialogs/UISayDialogWnd.h | 2 +- Source/UI/Dialogs/UISelectCartWnd.h | 2 +- Source/UI/Dialogs/UITipOfTheDayWnd.h | 2 +- Source/UI/Dialogs/UITipboxWnd.h | 2 +- Source/UI/Dialogs/UIToolTipWnd.h | 2 +- Source/UI/Dialogs/UIWaitDBSaveWnd.cpp | 6 +- Source/UI/Dialogs/UIWaitDBSaveWnd.h | 2 +- Source/UI/Dialogs/UIWaitWnd.h | 2 +- Source/UI/Edit/ItemTagRetirement.cpp | 2 +- Source/UI/Edit/UICandidateWnd.cpp | 6 +- Source/UI/Edit/UICandidateWnd.h | 6 +- Source/UI/Edit/UIEditBoxEx.cpp | 4 +- Source/UI/Edit/UIEditBoxEx.h | 4 +- Source/UI/Edit/UIEditCtrl.cpp | 176 +++++----- Source/UI/Edit/UIEditCtrl.h | 25 +- Source/UI/Edit/UIEditCtrl_Currency.cpp | 6 +- Source/UI/Edit/UIEditCtrl_Currency.h | 2 - Source/UI/Edit/UIEditCtrl_OldList.cpp | 2 +- Source/UI/Edit/UIEditLinks.cpp | 2 +- Source/UI/Edit/UIEditVariants.cpp | 16 +- Source/UI/Edit/UIWhisperEditCtrl.cpp | 2 +- Source/UI/Emotion/UIEmotionWnd.cpp | 8 +- Source/UI/Enchant/EnchantUI.h | 10 +- Source/UI/Enchant/UIEnchantUI.cpp | 116 +++---- Source/UI/EntryQueue/UIEntryQueueWnd.cpp | 44 +-- Source/UI/EntryQueue/UIEntryQueueWnd.h | 10 +- Source/UI/Exchange/UIExchangeUI.cpp | 50 +-- Source/UI/FrameSkin.h | 2 +- Source/UI/GameSettings/GameSettingsUI.cpp | 258 +++++++------- Source/UI/GameSettings/GameSettingsUI.h | 38 +- Source/UI/Gauges/UIPetInfoBarGraph.cpp | 4 +- Source/UI/Gauges/UIPlayerGage.cpp | 2 +- Source/UI/Guild/UIAgitWnd.cpp | 2 +- Source/UI/Guild/UIGuildHelperWnd.cpp | 10 +- Source/UI/Guild/UIGuild_Storage_Log.cpp | 2 +- Source/UI/Guild/UIGuild_Storage_Log.h | 2 +- Source/UI/Item/UIEquipmentPropertiesWnd.cpp | 46 +-- Source/UI/Item/UIEquipmentPropertiesWnd.h | 4 +- Source/UI/Item/UIItemBaseWnd.h | 1 - Source/UI/Item/UIItemPurchaseWnd.h | 1 - Source/UI/Item/UIItemSellWnd.h | 2 +- Source/UI/Item/UIItemSellWnd2.h | 2 +- Source/UI/Item/UIItemShopWnd.h | 1 - Source/UI/Item/UIItemShopWnd2.h | 2 +- Source/UI/Item/UIItemStoreFindWnd.h | 2 +- Source/UI/Item/UIItemStoreSubWnd.h | 2 +- Source/UI/Item/UIItemStoreWnd.h | 2 +- Source/UI/Item/UIItemWnd.h | 1 - Source/UI/Item/UIMerchantItemLogWnd.cpp | 10 +- Source/UI/Item/UIMerchantItemLogWnd.h | 2 +- Source/UI/Item/UIParaItemShopWnd.cpp | 10 +- Source/UI/Items/MergeItemWnd.cpp | 14 +- Source/UI/Items/MergeItemWnd.h | 2 +- Source/UI/Items/UICardItemIllustWnd.h | 2 +- Source/UI/Items/UIEquipWnd.h | 2 +- Source/UI/Items/UIGameItem.cpp | 4 +- Source/UI/Items/UIGameItem.h | 2 +- Source/UI/Items/UIIllustWnd.cpp | 4 +- Source/UI/Items/UIIllustWnd.h | 4 +- Source/UI/Items/UIItemCollectionWnd.h | 8 +- Source/UI/Items/UIItemIdentifyWnd.h | 8 +- .../UI/Items/UIItemParamChangeDisplayWnd.cpp | 2 +- Source/UI/Items/UINotifyItemObtainWnd.h | 2 +- Source/UI/Items/UISpellListWnd.h | 2 +- Source/UI/Items/UISwapEquipmentWnd.cpp | 8 +- Source/UI/Items/UISwapEquipmentWnd.h | 2 +- Source/UI/Lists/TableBox.cpp | 4 +- Source/UI/Lists/TableBox.h | 4 +- Source/UI/Lists/UIChatHisBox.cpp | 2 +- Source/UI/Lists/UIChatHisBox.h | 2 +- Source/UI/Lists/UIComboBox.cpp | 2 +- Source/UI/Lists/UIComboBox.h | 1 - Source/UI/Lists/UIComboBoxDefWnd.cpp | 35 +- Source/UI/Lists/UIComboBoxDefWnd.h | 4 +- Source/UI/Lists/UIComboBoxEx.cpp | 8 +- Source/UI/Lists/UIComboBoxEx.h | 4 +- Source/UI/Lists/UIComboBoxV2Wnd.cpp | 2 +- Source/UI/Lists/UIComboBoxV2Wnd.h | 2 +- Source/UI/Lists/UIComboBoxWnd.h | 4 +- Source/UI/Lists/UIDropDownBox.cpp | 4 +- Source/UI/Lists/UIDropDownBox.h | 3 +- Source/UI/Lists/UIItemStoreComboBox.cpp | 10 +- Source/UI/Lists/UIItemStoreComboBox.h | 3 +- Source/UI/Lists/UIListBox.cpp | 23 +- Source/UI/Lists/UIListBox.h | 5 +- Source/UI/Lists/UIListBoxEx.cpp | 8 +- Source/UI/Lists/UIListBoxEx.h | 2 +- Source/UI/Lists/UIListBoxID.cpp | 4 +- Source/UI/Lists/UIListBoxNavi.cpp | 2 +- Source/UI/Lists/UIListBoxNavi.h | 4 +- Source/UI/Lists/UIListBoxNaviSearch.h | 2 +- Source/UI/Lists/UIListBoxTemplate.h | 24 +- Source/UI/Lists/UIMemberListBox.h | 5 +- Source/UI/Lists/UINewComboBoxCtrl.cpp | 2 +- Source/UI/Lists/UIPackageBoxNameList.cpp | 2 +- Source/UI/Lists/UIPackageBoxNameList.h | 2 +- Source/UI/Lists/UIReplayListBox.h | 2 +- Source/UI/Lists/UIScrollBar.cpp | 28 +- Source/UI/Lists/UIScrollBar.h | 4 +- Source/UI/Lists/UIScrollBarNavi.cpp | 7 +- Source/UI/Lists/UIScrollBarNavi.h | 1 - Source/UI/Lists/UIScrollBarVariants.h | 12 +- Source/UI/Lists/UITabControl.h | 4 +- Source/UI/Lists/UITagListBox.cpp | 2 +- Source/UI/Lists/UIThumb.h | 6 +- Source/UI/Lists/UITreeView.cpp | 2 +- Source/UI/Lists/UITreeView.h | 2 +- Source/UI/Lists/UIVScrollBar.h | 11 +- Source/UI/Menu/UIMenuIconWnd.cpp | 4 +- Source/UI/Menu/UIMenuIconWnd.h | 2 +- Source/UI/MiniPartyManager.cpp | 2 +- Source/UI/Navigation/UINavigationV4Wnd.cpp | 10 +- Source/UI/Navigation/UINavigationV4Wnd.h | 6 +- Source/UI/Navigation/UIPrivateAirplaneWnd.h | 2 +- Source/UI/Party/UIAdvenPartyBoardWnd.cpp | 36 +- Source/UI/Party/UIAdvenPartyBoardWnd.h | 2 +- Source/UI/Party/UIApplyForPartyWnd.cpp | 10 +- Source/UI/Party/UIApplyForPartyWnd.h | 2 +- Source/UI/Party/UIMiniPartyWnd.cpp | 6 +- Source/UI/Party/UIMiniPartyWnd.h | 4 +- Source/UI/Party/UIPartyInfoWnd.cpp | 4 +- Source/UI/Party/UIPartyInfoWnd.h | 2 +- Source/UI/Party/UIPartySettingWnd.h | 4 +- Source/UI/Party/UIRegisterPartyWnd.cpp | 20 +- Source/UI/Party/UIRegisterPartyWnd.h | 2 +- Source/UI/Party/UIRequestJoinPartyWnd.cpp | 18 +- Source/UI/Party/UIRequestJoinPartyWnd.h | 2 +- .../ProbabilityTable/UIProbabilityTable.cpp | 30 +- Source/UI/Quest/UIOngoingQuestInfo.cpp | 80 ++--- Source/UI/Quest/UIOngoingQuestInfo.h | 8 +- Source/UI/Quest/UIQuestDisplay.cpp | 2 +- Source/UI/Quest/UIQuestDisplay.h | 2 +- Source/UI/Quest/UIRecommendedQuestInfo.cpp | 32 +- Source/UI/Quest/UIRecommendedQuestInfo.h | 4 +- Source/UI/Quest/UIRenewQuestUI.cpp | 76 ++-- Source/UI/Quest/UIRenewQuestUI.h | 4 +- Source/UI/Quest/UIRenewQuestWnd.cpp | 52 +-- Source/UI/Quest/UIRenewQuestWnd.h | 12 +- Source/UI/Rodex/UIRodexComposeWnd.cpp | 10 +- Source/UI/Rodex/UIRodexComposeWnd.h | 9 +- Source/UI/Rodex/UIRodexInboxWnd.cpp | 32 +- Source/UI/RuneSystem/UIRuneSystemWnd.cpp | 98 +++--- Source/UI/RuneSystem/UIRuneSystemWnd.h | 32 +- .../UISelectPackageItemBox.cpp | 20 +- Source/UI/Shop/UIMerchantItemMyShopWnd.h | 2 +- Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h | 2 +- Source/UI/Shop/UIMerchantItemPurchaseWnd.h | 2 +- Source/UI/Shop/UIMerchantItemShopWnd.h | 2 +- Source/UI/Shop/UIMerchantItemWnd.h | 2 +- Source/UI/Shop/UIMerchantMirrorItemWnd.h | 2 +- Source/UI/Shop/UIMerchantShopTitle.cpp | 6 +- Source/UI/Shop/UIMerchantShopTitle.h | 2 +- .../UI/Shop/UINoticeMessageBox_LockSellItem.h | 2 +- Source/UI/Shop/UInCash_CallWnd.h | 4 +- Source/UI/Shortcuts/UIQuickSlotWnd.cpp | 4 +- Source/UI/Shortcuts/UIQuickSlotWnd.h | 2 +- Source/UI/Skill/UISkillDescribeWnd.h | 2 +- Source/UI/Skill/UISkillListWnd.h | 2 +- Source/UI/Skill/UISkillNameChangeWnd.h | 2 +- Source/UI/SkillDelayInfo/SkillDelayInfo.h | 2 +- Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp | 42 +-- Source/UI/Status/UIStatusWnd.h | 2 +- Source/UI/StylingShop/UIStylingShopWnd.cpp | 68 ++-- Source/UI/StylingShop/UIStylingShopWnd.h | 30 +- Source/UI/Text/NavigationLink.cpp | 28 +- Source/UI/Text/UIAchWnd.cpp | 64 ++-- Source/UI/Text/UIAchWnd.h | 22 +- Source/UI/Text/UIBalloonText.cpp | 8 +- Source/UI/Text/UIBalloonText.h | 2 +- Source/UI/Text/UICharInfoBalloonText.h | 2 +- Source/UI/Text/UINameBalloonText.h | 4 +- Source/UI/Text/UIStaticText.cpp | 6 +- Source/UI/Text/UIStaticText.h | 5 +- Source/UI/Text/UIStaticTextControl.h | 2 +- Source/UI/Text/UIStaticText_LF.h | 6 +- Source/UI/Text/UIString.h | 2 +- Source/UI/Text/UITagTextViewer.cpp | 6 +- Source/UI/Text/UITagTextViewer.h | 4 +- Source/UI/Text/UITextViewer.cpp | 7 +- Source/UI/Text/UITextViewer.h | 3 +- Source/UI/Text/UITextViewerControl.h | 2 +- Source/UI/Text/UITextViewerLinks.cpp | 12 +- Source/UI/Text/UITransBalloonText.cpp | 4 +- Source/UI/Text/UITransBalloonText.h | 5 +- Source/UI/UIBarGraph.cpp | 8 +- Source/UI/UIBarGraph.h | 18 +- Source/UI/UIBartermarketWnd.cpp | 24 +- Source/UI/UIBartermarketWnd.h | 4 +- Source/UI/UIBasicCtrl.cpp | 8 +- Source/UI/UIBasicCtrl.h | 4 +- Source/UI/UIBroadcastBalloon.cpp | 2 +- Source/UI/UIBroadcastBalloon.h | 2 +- Source/UI/UICaptchaPreviewWnd.h | 2 +- Source/UI/UICaptchaRegisterWnd.cpp | 4 +- Source/UI/UICaptchaRegisterWnd.h | 2 +- Source/UI/UIChangeMaterialWnd.cpp | 29 +- Source/UI/UIChangeMaterialWnd.h | 8 +- Source/UI/UICheckAttendanceWnd.cpp | 15 +- Source/UI/UICheckAttendanceWnd.h | 4 +- Source/UI/UIGradeEnchantWnd.cpp | 20 +- Source/UI/UIGradeEnchantWnd.h | 6 +- Source/UI/UIHotkeyGuideWnd.cpp | 10 +- Source/UI/UIHotkeyGuideWnd.h | 2 +- Source/UI/UIIngredientInfoWnd.h | 4 +- Source/UI/UIItemReformWnd.cpp | 28 +- Source/UI/UIItemReformWnd.h | 10 +- Source/UI/UILapineBoxWnd.cpp | 2 +- Source/UI/UILapineScrollBar.cpp | 20 +- Source/UI/UILapineScrollBar.h | 8 +- Source/UI/UILapineUpgradeBoxWnd.cpp | 20 +- Source/UI/UILapineUpgradeBoxWnd.h | 4 +- Source/UI/UIMacroBlackListCheckWnd.cpp | 10 +- Source/UI/UIMacroBlackListCheckWnd.h | 2 +- Source/UI/UIMacroDetectorWnd.h | 2 +- Source/UI/UIMacroReport.cpp | 26 +- Source/UI/UIMacroUserInfoWnd.cpp | 20 +- Source/UI/UIMacroUserInfoWnd.h | 4 +- Source/UI/UIPreviewEquipWnd.cpp | 14 +- Source/UI/UIPreviewEquipWnd.h | 2 +- Source/UI/UIRefiningWnd.cpp | 22 +- Source/UI/UIRefiningWnd.h | 12 +- Source/UI/UIReputeWnd.cpp | 16 +- Source/UI/UIReputeWnd.h | 2 +- Source/UI/UIRoundBoxTooltipWnd.cpp | 6 +- Source/UI/UIRoundBoxTooltipWnd.h | 3 +- Source/UI/UIScrollWnd.cpp | 8 +- Source/UI/UIScrollWnd.h | 4 +- Source/UI/UISlotBitmap.cpp | 6 +- Source/UI/UISlotBitmap.h | 4 +- Source/UI/UIStaticBitmap.cpp | 4 +- Source/UI/UIStaticBitmap.h | 1 - Source/UI/UIStaticItem.cpp | 4 +- Source/UI/UIStaticItem.h | 2 +- Source/UI/Window/UIAccountLimitedToolWnd.cpp | 12 +- Source/UI/Window/UIAccountLimitedToolWnd.h | 2 +- Source/UI/Window/UIBalloonOpenBtn.cpp | 6 +- Source/UI/Window/UIBalloonOpenBtn.h | 2 +- Source/UI/Window/UIBank_NewWnd.h | 2 +- Source/UI/Window/UIBasicInfoWnd.cpp | 14 +- Source/UI/Window/UIBasicInfoWnd.h | 2 +- Source/UI/Window/UIBattleMsgOptionWnd.cpp | 4 +- Source/UI/Window/UIBattleMsgOptionWnd.h | 2 +- Source/UI/Window/UIChangeNameWnd.cpp | 4 +- Source/UI/Window/UIChangeNameWnd.h | 2 +- Source/UI/Window/UIChatRoomWnd.h | 2 +- Source/UI/Window/UICntWnd.h | 2 +- Source/UI/Window/UICollectionSystemWnd.cpp | 4 +- Source/UI/Window/UICollectionSystemWnd.h | 2 +- Source/UI/Window/UIControl.cpp | 100 +++--- Source/UI/Window/UIControl.h | 30 +- Source/UI/Window/UIDebuffRemoveWnd.cpp | 4 +- Source/UI/Window/UIDebuffRemoveWnd.h | 2 +- Source/UI/Window/UIFrameWnd.cpp | 46 +-- Source/UI/Window/UIFrameWnd.h | 4 +- Source/UI/Window/UIHomunInfoWnd.h | 2 +- Source/UI/Window/UIHotKeyWnd.cpp | 8 +- Source/UI/Window/UIHotKeyWnd.h | 2 +- Source/UI/Window/UILocaleTextWnd.cpp | 10 +- Source/UI/Window/UILoginOTPWnd.h | 2 +- Source/UI/Window/UILoginWnd.h | 2 +- Source/UI/Window/UIMakeCharWnd.h | 2 +- Source/UI/Window/UIMerInfoWnd.h | 2 +- Source/UI/Window/UIMessageBox.cpp | 174 +++++----- Source/UI/Window/UIMessageBox.h | 4 +- Source/UI/Window/UIMessageBoxAutoreturn.h | 2 +- Source/UI/Window/UIMonsterDisplayWnd.h | 2 +- Source/UI/Window/UIMonsterInfoWnd.h | 2 +- Source/UI/Window/UINavigationWnd.cpp | 20 +- Source/UI/Window/UINewMakeCharWnd.cpp | 28 +- Source/UI/Window/UINewMakeCharWnd.h | 4 - Source/UI/Window/UINewSelectCharWnd.cpp | 14 +- Source/UI/Window/UINormalMB.cpp | 8 +- Source/UI/Window/UINormalMB.h | 2 +- Source/UI/Window/UINoticeWnd.h | 2 +- Source/UI/Window/UIPadding.h | 2 +- Source/UI/Window/UIPayConfirmWnd.h | 2 +- Source/UI/Window/UIPetInfoWnd.h | 2 +- Source/UI/Window/UIReplayControlWnd.h | 2 +- Source/UI/Window/UIReplayRECControlWnd.h | 2 +- Source/UI/Window/UIResizer.cpp | 4 +- Source/UI/Window/UIResizer.h | 4 +- Source/UI/Window/UIRoulletteWnd.cpp | 18 +- Source/UI/Window/UISeekPartyListWnd.cpp | 44 +-- Source/UI/Window/UISeekPartyWnd.cpp | 8 +- Source/UI/Window/UISelCharForUServerWnd.cpp | 4 +- Source/UI/Window/UISelectReplayDataWnd.h | 2 +- Source/UI/Window/UISelectServerWnd.h | 2 +- Source/UI/Window/UISerachStoreInfoWnd.cpp | 20 +- Source/UI/Window/UITab.cpp | 2 +- Source/UI/Window/UITab.h | 2 +- Source/UI/Window/UITalkboxTrapInputWnd.h | 2 +- Source/UI/Window/UIWindow.cpp | 48 +-- Source/UI/Window/UIWindow.h | 4 +- Source/UI/Window/UIWindowFactory.cpp | 9 +- Source/UI/Window/UIWindowMgr.cpp | 4 +- Source/UI/Window/UIWindowMgr.h | 1 - Source/UI/Window/UIWordDisplayWnd.cpp | 2 +- Source/UI/Window/UIWordDisplayWnd.h | 2 +- Source/UI/Window/UIZeroChatWnd.cpp | 16 +- Source/UI/Window/WindowMgrState.cpp | 6 +- 391 files changed, 2203 insertions(+), 2273 deletions(-) diff --git a/Source/Client/Input/Language.cpp b/Source/Client/Input/Language.cpp index fc1a21eb..842e5095 100644 --- a/Source/Client/Input/Language.cpp +++ b/Source/Client/Input/Language.cpp @@ -401,19 +401,19 @@ UIHairBitmap::UIHairBitmap() : UIBitmapButton() { // OFFSET: 0x007ECEC0 // FUNCTION: fn_09804 -UICaptchaPreviewWnd::UICaptchaPreviewWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_image(nullptr), m_captchaKey(), m_imageData(nullptr), m_imageSize(0), m_imageReceived(0) { +UICaptchaPreviewWnd::UICaptchaPreviewWnd() + : UIFrameWnd(0), m_image(nullptr), m_captchaKey(), m_imageData(nullptr), m_imageSize(0), m_imageReceived(0) { } // OFFSET: 0x0086C7B0 // FUNCTION: fn_11030 -UIChatHisBox2::UIChatHisBox2(UIWindowContext& windows) - : UIChatHisBox(windows), backgroundRed(255), backgroundGreen(255), backgroundBlue(255) { +UIChatHisBox2::UIChatHisBox2() + : UIChatHisBox(), backgroundRed(255), backgroundGreen(255), backgroundBlue(255) { } // OFFSET: 0x0086C830 // FUNCTION: fn_11031 -UIChatHisBox3::UIChatHisBox3(UIWindowContext& windows) : UIChatHisBox2(windows), unknown_0130(1), unknown_0134(12) { +UIChatHisBox3::UIChatHisBox3() : UIChatHisBox2(), unknown_0130(1), unknown_0134(12) { } // OFFSET: 0x00999FF0 @@ -425,15 +425,15 @@ UIColoringTextViewer::UIColoringTextViewer() : UIListBox(), color(0), lineLimit( // OFFSET: 0x007ECF50 // FUNCTION: fn_09805 -UIMacroDetectorWnd::UIMacroDetectorWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_button(nullptr), m_imageData(nullptr), m_imageSize(0), m_imageReceived(0), unknown_00D0(0), totalDuration(0), +UIMacroDetectorWnd::UIMacroDetectorWnd() + : UIFrameWnd(0), m_button(nullptr), m_imageData(nullptr), m_imageSize(0), m_imageReceived(0), unknown_00D0(0), totalDuration(0), startTick(0), messageDuration(0), m_lastAnswer(), message(), unknown_0110(0), messageTick(3000), m_image(nullptr), m_editCtrl(nullptr) { std::memset(this->m_captchaKey, 0, sizeof(this->m_captchaKey)); g_windowMgr.CloseWindow(155); g_windowMgr.CloseWindow(39); } // FUNCTION: fn_13537 -UIRoundBoxTooltipWnd::UIRoundBoxTooltipWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), viewer(nullptr) { +UIRoundBoxTooltipWnd::UIRoundBoxTooltipWnd() : UIFrameWnd(0), viewer(nullptr) { } // OFFSET: 0x00ACC7F0 diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index 88fa0f59..06c50147 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -2464,7 +2464,7 @@ std::vector CGameMode::SaveGroundItems() { // FUNCTION: fn_21409 UIBroadcastBalloon* CGameMode::EnsureBroadcastBalloon() { if (!this->broadcastBalloon) { - this->broadcastBalloon = new UIBroadcastBalloon(*reinterpret_cast(nullptr)); + this->broadcastBalloon = new UIBroadcastBalloon(); this->broadcastBalloon->SetSize(g_renderer->viewport.width, 50); this->broadcastBalloon->Move(0, 51); g_windowMgr.AddRenderedFront(this->broadcastBalloon); @@ -2480,7 +2480,7 @@ void CGameMode::EnsureNameBalloon(UINameBalloonText*& balloon) { } g_serviceOptions.Get(0x5C); - balloon = new UINameBalloonText(*reinterpret_cast(nullptr)); + balloon = new UINameBalloonText(); balloon->SetSize(8, 8); g_windowMgr.AddRenderedFront(balloon); } @@ -2498,7 +2498,7 @@ void __stdcall OpenWordDisplay(CGameActor* actor) { } } - UIWordDisplayWnd* window = new UIWordDisplayWnd(*reinterpret_cast(nullptr)); + UIWordDisplayWnd* window = new UIWordDisplayWnd(); window->SendMsg(nullptr, 34, actor->render.accountId, 0, 0, 0); g_windowMgr.AddRendered(window); actor->unknown_018C = reinterpret_cast(window); @@ -2513,7 +2513,7 @@ void CGameMode::ShowNoticeBalloon(const std::vector* lines) { UIBroadcastBalloon* balloon = this->noticeBalloon; if (!balloon) { - this->noticeBalloon = new UIBroadcastBalloon(*reinterpret_cast(nullptr)); + this->noticeBalloon = new UIBroadcastBalloon(); this->noticeBalloon->SetSize(g_renderer->viewport.width, 50); this->noticeBalloon->Move(0, 130 * g_renderer->viewport.height / 480); g_windowMgr.AddRenderedFront(this->noticeBalloon); diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index c04ffe23..834ed841 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -2179,7 +2179,7 @@ void CGameMode::ReceiveAchievementUpdate( this->unknown_0600 = timeGetTime(); if (!this->unknown_05FC) { UIAchBalloonText* balloon = - new UIAchBalloonText(*reinterpret_cast(nullptr)); + new UIAchBalloonText(); this->unknown_05FC = balloon; balloon->SetSize(g_renderer->viewport.width, 50); g_windowMgr.AddRenderedFront(this->unknown_05FC); diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index ac9086d3..d9748b02 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -3759,7 +3759,7 @@ void CGameMode::ShowSpecialPopup(int popupId) { return; } - UIWindow window(*reinterpret_cast(nullptr), 0); + UIWindow window(0); std::string text; switch (popup->m_messageId) { case 0: diff --git a/Source/Client/Mode/ModeTooltip.cpp b/Source/Client/Mode/ModeTooltip.cpp index 7cdb497e..af682579 100644 --- a/Source/Client/Mode/ModeTooltip.cpp +++ b/Source/Client/Mode/ModeTooltip.cpp @@ -30,7 +30,7 @@ void ModeTooltip::Show(const char* value, int x, int y, std::uint32_t color, uns if (this->window) { this->ordering.Promote(this->window); } else { - this->window = new UITransBalloonText(this->windows); + this->window = new UITransBalloonText(); this->window->SetSize(8, 8); this->rendered.push_back(this->window); } diff --git a/Source/Client/Mode/ModeTooltip.h b/Source/Client/Mode/ModeTooltip.h index 81ec97f0..d867a8ca 100644 --- a/Source/Client/Mode/ModeTooltip.h +++ b/Source/Client/Mode/ModeTooltip.h @@ -6,14 +6,12 @@ class UITransBalloonText; class UIWindow; -struct UIWindowContext; struct WindowOrdering; class UIWindowMgr; struct ModeTooltip { UITransBalloonText*& window; std::uint32_t& tick; - UIWindowContext& windows; std::list& rendered; WindowOrdering& ordering; const int& screenWidth; diff --git a/Source/Contents/Actors/Skill.cpp b/Source/Contents/Actors/Skill.cpp index 7bb4d2e3..4537d2d8 100644 --- a/Source/Contents/Actors/Skill.cpp +++ b/Source/Contents/Actors/Skill.cpp @@ -355,7 +355,7 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int this->unknown_0248 = timeGetTime(); if (this->unknown_0264[0] == 0) { UITransBalloonText* balloon = - new UITransBalloonText(*reinterpret_cast(nullptr)); + new UITransBalloonText(); this->unknown_0264[0] = reinterpret_cast(balloon); balloon->SetSize(8, 8); g_windowMgr.AddRenderedFront(reinterpret_cast(this->unknown_0264[0])); diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index 4e8a8137..27196c08 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -107,7 +107,7 @@ public: class UICashEmotionPack_Purchase : public UICashEmotionPack { public: - explicit UICashEmotionPack_Purchase(UIWindowContext& windows); + explicit UICashEmotionPack_Purchase(); ~UICashEmotionPack_Purchase() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -124,7 +124,7 @@ protected: class UICashEmotionPack_Search : public UICashEmotionPack { public: // INLINED - explicit UICashEmotionPack_Search(UIWindowContext& windows) : UICashEmotionPack(windows) { + explicit UICashEmotionPack_Search() : UICashEmotionPack() { } void Paint() override; @@ -142,7 +142,7 @@ protected: class UICashEmotionPack_Search_UnPurchased : public UICashEmotionPack_Search { public: - explicit UICashEmotionPack_Search_UnPurchased(UIWindowContext& windows); + explicit UICashEmotionPack_Search_UnPurchased(); ~UICashEmotionPack_Search_UnPurchased() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -154,7 +154,7 @@ class UICashEmotionPack_Unpurchase : public UICashEmotionPack { friend class UICashEmotionListChildWnd_UnPurchased; public: - explicit UICashEmotionPack_Unpurchase(UIWindowContext& windows); + explicit UICashEmotionPack_Unpurchase(); void Paint() override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; @@ -171,7 +171,7 @@ protected: class UICashEmotionScrollBar : public UIScrollBar { public: - __declspec(noinline) explicit UICashEmotionScrollBar(UIWindowContext& windows); + __declspec(noinline) explicit UICashEmotionScrollBar(); void Paint() override; @@ -183,7 +183,7 @@ protected: class UICashEmotionScrollWnd : public UIScrollWnd { public: - UICashEmotionScrollWnd(UIWindowContext& windows, int width, int height, unsigned char cached); + UICashEmotionScrollWnd(int width, int height, unsigned char cached); void Slot15(int width, int height) override; void Slot53() override; @@ -193,7 +193,7 @@ public: class UICashEmotionListChildWnd_Abstract : public UICashEmotionScrollWnd { public: - UICashEmotionListChildWnd_Abstract(UIWindowContext& windows, int width, int height, unsigned char cached); + UICashEmotionListChildWnd_Abstract(int width, int height, unsigned char cached); void Slot35(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; virtual void Refresh(const char* filter) = 0; @@ -202,7 +202,7 @@ public: class UICashEmotionListChildWnd_Basic : public UICashEmotionListChildWnd_Abstract { public: - UICashEmotionListChildWnd_Basic(UIWindowContext& windows, int width, int height, unsigned char cached); + UICashEmotionListChildWnd_Basic(int width, int height, unsigned char cached); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; @@ -218,7 +218,7 @@ protected: class UICashEmotionListChildWnd_Purchase : public UICashEmotionListChildWnd_Abstract { public: - UICashEmotionListChildWnd_Purchase(UIWindowContext& windows, int width, int height); + UICashEmotionListChildWnd_Purchase(int width, int height); ~UICashEmotionListChildWnd_Purchase() override; void Slot15(int width, int height) override; void Paint() override; @@ -236,7 +236,7 @@ protected: class UICashEmotionListChildWnd_Search : public UICashEmotionListChildWnd_Abstract { public: - UICashEmotionListChildWnd_Search(UIWindowContext& windows, int width, int height); + UICashEmotionListChildWnd_Search(int width, int height); ~UICashEmotionListChildWnd_Search() override; void Slot15(int width, int height) override; void Paint() override; @@ -254,7 +254,7 @@ protected: class UICashEmotionListChildWnd_UnPurchased : public UICashEmotionListChildWnd_Abstract { public: - UICashEmotionListChildWnd_UnPurchased(UIWindowContext& windows, int width, int height); + UICashEmotionListChildWnd_UnPurchased(int width, int height); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -279,7 +279,7 @@ static_assert(sizeof(CashEmotionPurchasePacket) == 7); class UICashEmotionListWnd : public UIFrameWnd { public: - UICashEmotionListWnd(UIWindowContext& windows); + UICashEmotionListWnd(); void Slot11() override; void Slot15(int width, int height) override; void Slot19() override; @@ -1645,15 +1645,15 @@ int CCashEmotionMgr::InsertPackInfo(lua_State* state) { // OFFSET: 0x007C37A0 // FUNCTION: fn_09340 -UICashEmotionListChildWnd_Abstract::UICashEmotionListChildWnd_Abstract(UIWindowContext& windows, int width, int height, unsigned char cached) - : UICashEmotionScrollWnd(windows, width, height, cached) { +UICashEmotionListChildWnd_Abstract::UICashEmotionListChildWnd_Abstract(int width, int height, unsigned char cached) + : UICashEmotionScrollWnd(width, height, cached) { } // OFFSET: 0x007C3990 // FUNCTION: fn_09343 __declspec(noinline) void UICashEmotionScrollWnd::UpdateScrollBars() { if (!this->horizontalBar) { - this->horizontalBar = new (std::nothrow) UICashEmotionScrollBar(*this->m_context); + this->horizontalBar = new (std::nothrow) UICashEmotionScrollBar(); if (this->horizontalBar) { this->horizontalBar->Configure(0, this->geometry.height - this->scrollBarHeight - 2, 0, this->geometry.width); } @@ -1666,7 +1666,7 @@ __declspec(noinline) void UICashEmotionScrollWnd::UpdateScrollBars() { } if (!this->scrollBar) { - this->scrollBar = new (std::nothrow) UICashEmotionScrollBar(*this->m_context); + this->scrollBar = new (std::nothrow) UICashEmotionScrollBar(); if (this->scrollBar) { this->scrollBar->Configure(this->geometry.width - this->scrollBarWidth - 2, 0, 1, this->geometry.height); } @@ -1724,8 +1724,8 @@ int UICashEmotionListChildWnd_Abstract::SendMsg(UIWindow* sender, int message, s // OFFSET: 0x007C3D60 // FUNCTION: fn_09347 -UICashEmotionListChildWnd_Basic::UICashEmotionListChildWnd_Basic(UIWindowContext& windows, int width, int height, unsigned char cached) - : UICashEmotionListChildWnd_Abstract(windows, width, height, cached) { +UICashEmotionListChildWnd_Basic::UICashEmotionListChildWnd_Basic(int width, int height, unsigned char cached) + : UICashEmotionListChildWnd_Abstract(width, height, cached) { this->m_selectAction = new (std::nothrow) CCashEmotionAction_Play(); this->m_playAction = new (std::nothrow) CCashEmotionAction_Register(); this->Slot15(width, height); @@ -1835,8 +1835,8 @@ int UICashEmotionListChildWnd_Basic::SendMsg(UIWindow* sender, int message, std: // OFFSET: 0x007C4810 // FUNCTION: fn_09362 -UICashEmotionListChildWnd_Purchase::UICashEmotionListChildWnd_Purchase(UIWindowContext& windows, int width, int height) - : UICashEmotionListChildWnd_Abstract(windows, width, height, 0) { +UICashEmotionListChildWnd_Purchase::UICashEmotionListChildWnd_Purchase(int width, int height) + : UICashEmotionListChildWnd_Abstract(width, height, 0) { this->unknown_00BC = new (std::nothrow) CCashEmotionAction_Play(); this->Slot15(width, height); } @@ -1884,7 +1884,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_Purchase::Refresh(const char unused.remove(pack); height = pack->geometry.height; } else { - pack = new (std::nothrow) UICashEmotionPack_Purchase(*this->m_context); + pack = new (std::nothrow) UICashEmotionPack_Purchase(); if (!pack) { continue; } @@ -1955,8 +1955,8 @@ void UICashEmotionListChildWnd_Purchase::UpdateExpiry(int packId, Timestamp* exp // OFFSET: 0x007C5590 // FUNCTION: fn_09375 -UICashEmotionListChildWnd_Search::UICashEmotionListChildWnd_Search(UIWindowContext& windows, int width, int height) - : UICashEmotionListChildWnd_Abstract(windows, width, height, 0) { +UICashEmotionListChildWnd_Search::UICashEmotionListChildWnd_Search(int width, int height) + : UICashEmotionListChildWnd_Abstract(width, height, 0) { this->m_action = new (std::nothrow) CCashEmotionAction_Play(); this->Slot15(width, height); } @@ -1980,9 +1980,9 @@ const char* UICashEmotionListChildWnd_Search::Filter() { __declspec(noinline) void UICashEmotionListChildWnd_Search::AddResults(char type, const std::vector>& results, int& y) { UICashEmotionPack_Search* pack; if (type == 3) { - pack = new (std::nothrow) UICashEmotionPack_Search_UnPurchased(*this->m_context); + pack = new (std::nothrow) UICashEmotionPack_Search_UnPurchased(); } else { - pack = new (std::nothrow) UICashEmotionPack_Search(*this->m_context); + pack = new (std::nothrow) UICashEmotionPack_Search(); } if (!pack) { return; @@ -2059,8 +2059,8 @@ int UICashEmotionListChildWnd_Search::SendMsg(UIWindow* sender, int message, std // OFFSET: 0x007C6030 // FUNCTION: fn_09389 -UICashEmotionListChildWnd_UnPurchased::UICashEmotionListChildWnd_UnPurchased(UIWindowContext& windows, int width, int height) - : UICashEmotionListChildWnd_Abstract(windows, width, height, 0) { +UICashEmotionListChildWnd_UnPurchased::UICashEmotionListChildWnd_UnPurchased(int width, int height) + : UICashEmotionListChildWnd_Abstract(width, height, 0) { this->Slot15(width, height); } @@ -2099,7 +2099,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_UnPurchased::Refresh(const c unused.remove(pack); height = pack->geometry.height; } else { - pack = new (std::nothrow) UICashEmotionPack_Unpurchase(*this->m_context); + pack = new (std::nothrow) UICashEmotionPack_Unpurchase(); if (!pack) { continue; } @@ -2159,8 +2159,8 @@ int UICashEmotionListChildWnd_UnPurchased::SendMsg(UIWindow* sender, int message // OFFSET: 0x007C6CB0 // FUNCTION: fn_09401 -UICashEmotionListWnd::UICashEmotionListWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_placement(nullptr), m_basicList(nullptr), m_purchaseList(nullptr), m_unpurchasedList(nullptr), m_searchList(nullptr), +UICashEmotionListWnd::UICashEmotionListWnd() + : UIFrameWnd(0), m_placement(nullptr), m_basicList(nullptr), m_purchaseList(nullptr), m_unpurchasedList(nullptr), m_searchList(nullptr), m_tab(0), unknown_00D4(nullptr), m_searchEdit(nullptr), unknown_00DC(nullptr), unknown_00E0(nullptr), unknown_00E4(nullptr), m_currentList(nullptr), m_period(nullptr) { } @@ -2168,7 +2168,7 @@ UICashEmotionListWnd::UICashEmotionListWnd(UIWindowContext& windows) // OFFSET: 0x007C7240 // FUNCTION: fn_09405 UIBitmapButton* UICashEmotionListWnd::CreateButton(int x, int y, int width, int height, int id, const char* format, bool hasDisabled) { - UIBitmapButton* button = new (std::nothrow) UIBitmapButton(*this->m_context); + UIBitmapButton* button = new (std::nothrow) UIBitmapButton(); if (!button) { return nullptr; } @@ -2204,7 +2204,7 @@ void UICashEmotionListWnd::Slot15(int width, int height) { }; int x = 46; for (int index = 0; index < 4; ++index) { - UIBmpRadioBtn2* tab = new (std::nothrow) UIBmpRadioBtn2(*this->m_context); + UIBmpRadioBtn2* tab = new (std::nothrow) UIBmpRadioBtn2(); if (!tab) { continue; } @@ -2232,7 +2232,7 @@ void UICashEmotionListWnd::Slot15(int width, int height) { this->unknown_00E0 = this->CreateButton(252, 22, 37, 18, 191, "유저인터페이스\\cashemotion\\btn_shortui_%s.bmp", false); this->unknown_00E4 = this->CreateButton(247, 355, 42, 20, 526, "유저인터페이스\\cashemotion\\btn_buy_%s.bmp", true); - this->m_searchEdit = new (std::nothrow) UIEditCtrl2(*this->m_context); + this->m_searchEdit = new (std::nothrow) UIEditCtrl2(); if (this->m_searchEdit) { this->m_searchEdit->SetSize(160, 16); this->m_searchEdit->Move(61, 23); @@ -2240,25 +2240,25 @@ void UICashEmotionListWnd::Slot15(int width, int height) { this->AddChild(this->m_searchEdit); } - this->m_basicList = new (std::nothrow) UICashEmotionListChildWnd_Basic(*this->m_context, 271, 303, 0); + this->m_basicList = new (std::nothrow) UICashEmotionListChildWnd_Basic(271, 303, 0); if (this->m_basicList) { this->m_basicList->Move(28, 47); this->AddChild(this->m_basicList); } - this->m_purchaseList = new (std::nothrow) UICashEmotionListChildWnd_Purchase(*this->m_context, 271, 303); + this->m_purchaseList = new (std::nothrow) UICashEmotionListChildWnd_Purchase(271, 303); if (this->m_purchaseList) { this->m_purchaseList->Move(28, 47); this->AddChild(this->m_purchaseList); } - this->m_unpurchasedList = new (std::nothrow) UICashEmotionListChildWnd_UnPurchased(*this->m_context, 271, 303); + this->m_unpurchasedList = new (std::nothrow) UICashEmotionListChildWnd_UnPurchased(271, 303); if (this->m_unpurchasedList) { this->m_unpurchasedList->Move(28, 47); this->AddChild(this->m_unpurchasedList); } - this->m_searchList = new (std::nothrow) UICashEmotionListChildWnd_Search(*this->m_context, 271, 303); + this->m_searchList = new (std::nothrow) UICashEmotionListChildWnd_Search(271, 303); if (this->m_searchList) { this->m_searchList->Move(28, 47); this->AddChild(this->m_searchList); @@ -2269,7 +2269,7 @@ void UICashEmotionListWnd::Slot15(int width, int height) { this->SendMsg(first->second, 6, 215, 0, 0, 0); } - this->m_period = new UIStaticText(*this->m_context); + this->m_period = new UIStaticText(); this->m_period->SetSize(200, 14); this->m_period->Move(39, 359); this->m_period->SetColor(214, 24, 16); @@ -2513,7 +2513,7 @@ int UICashEmotionListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a std::string text; text = free ? std::vformat(format, std::make_format_args(title)) : std::vformat(format, std::make_format_args(title, price)); - UINormalMB* box = new UINormalMB(*this->m_context); + UINormalMB* box = new UINormalMB(); box->Create(nullptr, text.c_str(), 2, true, nullptr, 280, 128, nullptr); box->m_keepOpen = 1; g_windowMgr.AddRendered(box); @@ -2680,7 +2680,7 @@ void UICashEmotionListWnd::RefreshSelection() { // OFFSET: 0x007C8E70 // FUNCTION: fn_09425 UICashEmotionMiniWnd::UICashEmotionMiniWnd() - : UIWindow(*reinterpret_cast(nullptr), 0), m_selected(nullptr), m_previous(nullptr), m_next(nullptr), m_page(0), m_selectedIndex(0) { + : UIWindow(0), m_selected(nullptr), m_previous(nullptr), m_next(nullptr), m_page(0), m_selectedIndex(0) { this->m_pieces.fill(nullptr); this->m_action = new (std::nothrow) CCashEmotionAction_SelectedUnPurchasedPack; } @@ -2762,7 +2762,7 @@ void UICashEmotionMiniWnd::Refresh(int first) { void UICashEmotionMiniWnd::Slot15(int width, int height) { int x = 24; for (UICashEmotionPiece*& piece : this->m_pieces) { - piece = new (std::nothrow) UICashEmotionPiece(*this->m_context); + piece = new (std::nothrow) UICashEmotionPiece(); if (piece) { piece->SetSize(42, 42); piece->Move(x, 1); @@ -2771,7 +2771,7 @@ void UICashEmotionMiniWnd::Slot15(int width, int height) { } } - this->m_previous = new (std::nothrow) UIBitmapButton(*this->m_context); + this->m_previous = new (std::nothrow) UIBitmapButton(); if (this->m_previous) { this->m_previous->SetBitmap("유저인터페이스\\cashemotion\\btn_arrow_l_normal.bmp", 0, 0); this->m_previous->SetBitmap("유저인터페이스\\cashemotion\\btn_arrow_l_over.bmp", 1, 0); @@ -2782,7 +2782,7 @@ void UICashEmotionMiniWnd::Slot15(int width, int height) { this->AddChild(this->m_previous); } - this->m_next = new (std::nothrow) UIBitmapButton(*this->m_context); + this->m_next = new (std::nothrow) UIBitmapButton(); if (this->m_next) { this->m_next->SetBitmap("유저인터페이스\\cashemotion\\bth_arrow_r_normal.bmp", 0, 0); this->m_next->SetBitmap("유저인터페이스\\cashemotion\\bth_arrow_r_over.bmp", 1, 0); @@ -2928,8 +2928,8 @@ int UICashEmotionMiniWnd::SendMsg( // OFFSET: 0x007C9C40 // FUNCTION: fn_09438 -UICashEmotionPack::UICashEmotionPack(UIWindowContext& windows) - : UIWindow(windows, 0), unknown_0088(nullptr), m_titleText(nullptr), unknown_00A8(-1), m_limited(false) { +UICashEmotionPack::UICashEmotionPack() + : UIWindow(0), unknown_0088(nullptr), m_titleText(nullptr), unknown_00A8(-1), m_limited(false) { } // OFFSET: 0x007C9D60 @@ -3021,7 +3021,7 @@ int UICashEmotionPack::Slot53(int packId, bool showTooltip, bool hoverable) { continue; } - UICashEmotionPiece* piece = new (std::nothrow) UICashEmotionPiece(*this->m_context); + UICashEmotionPiece* piece = new (std::nothrow) UICashEmotionPiece(); if (!piece) { continue; } @@ -3177,7 +3177,7 @@ void UICashEmotionPack::SetTitle(const char* title) { // OFFSET: 0x007CAAC0 // FUNCTION: fn_09457 -UICashEmotionPack_Purchase::UICashEmotionPack_Purchase(UIWindowContext& windows) : UICashEmotionPack(windows) { +UICashEmotionPack_Purchase::UICashEmotionPack_Purchase() : UICashEmotionPack() { this->m_selectAction = new (std::nothrow) CCashEmotionAction_Play; this->m_purchaseAction = new (std::nothrow) CCashEmotionAction_Register; this->m_background = Resolve("유저인터페이스\\cashemotion\\bg_list_bought.bmp"); @@ -3278,7 +3278,7 @@ int UICashEmotionPack_Search::SetResults(const char* title, const std::vector& result : results) { - UICashEmotionPiece* piece = new (std::nothrow) UICashEmotionPiece(*this->m_context); + UICashEmotionPiece* piece = new (std::nothrow) UICashEmotionPiece(); if (!piece) { continue; } @@ -3337,7 +3337,7 @@ int UICashEmotionPack_Search_Normal::SendMsg( // OFFSET: 0x007CB3A0 // FUNCTION: fn_09468 -UICashEmotionPack_Search_UnPurchased::UICashEmotionPack_Search_UnPurchased(UIWindowContext& windows) : UICashEmotionPack_Search(windows) { +UICashEmotionPack_Search_UnPurchased::UICashEmotionPack_Search_UnPurchased() : UICashEmotionPack_Search() { this->m_action = new (std::nothrow) CCashEmotionAction_SelectedUnPurchasedPack; } @@ -3373,7 +3373,7 @@ int UICashEmotionPack_Search_UnPurchased::SendMsg( // OFFSET: 0x007CB5E0 // FUNCTION: fn_09471 -UICashEmotionPack_Unpurchase::UICashEmotionPack_Unpurchase(UIWindowContext& windows) : UICashEmotionPack(windows), m_pressed(false) { +UICashEmotionPack_Unpurchase::UICashEmotionPack_Unpurchase() : UICashEmotionPack(), m_pressed(false) { this->m_background = Resolve("유저인터페이스\\cashemotion\\bg_list_normal.bmp"); this->m_pressed = false; this->Invalidate(); @@ -3445,8 +3445,8 @@ int UICashEmotionPack_Unpurchase::SendMsg( // OFFSET: 0x007CB9F0 // FUNCTION: fn_09479 -UICashEmotionPiece::UICashEmotionPiece(UIWindowContext& windows) - : UIWindow(windows, 0), m_packId(0), m_emotionId(0), m_button(nullptr), m_hoverable(false), m_hovered(false) { +UICashEmotionPiece::UICashEmotionPiece() + : UIWindow(0), m_packId(0), m_emotionId(0), m_button(nullptr), m_hoverable(false), m_hovered(false) { } // OFFSET: 0x007CBB30 @@ -3486,7 +3486,7 @@ void UICashEmotionPiece::Set(int packId, int emotionId, bool showTooltip, bool h // OFFSET: 0x007CBC70 // FUNCTION: fn_09482 void UICashEmotionPiece::Slot15(int width, int height) { - this->m_button = new (std::nothrow) UICashEmotionSprBtn(*this->m_context, this); + this->m_button = new (std::nothrow) UICashEmotionSprBtn(this); if (this->m_button) { this->m_button->SetSize(width, height); this->m_button->Move(0, 0); @@ -3576,7 +3576,7 @@ int UICashEmotionPiece::SendMsg( // OFFSET: 0x007CBF20 // FUNCTION: fn_09490 -UICashEmotionScrollBar::UICashEmotionScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UICashEmotionScrollBar::UICashEmotionScrollBar() : UIScrollBar() { this->m_disabled = false; this->horizontalStep = 135; this->verticalStep = 135; @@ -3664,8 +3664,8 @@ void UICashEmotionScrollBar::SetDisabled(bool disabled) { // OFFSET: 0x007CC2B0 // FUNCTION: fn_09494 -UICashEmotionScrollWnd::UICashEmotionScrollWnd(UIWindowContext& windows, int width, int height, unsigned char cached) - : UIScrollWnd(windows, width, height, cached) { +UICashEmotionScrollWnd::UICashEmotionScrollWnd(int width, int height, unsigned char cached) + : UIScrollWnd(width, height, cached) { this->RemoveChild(this->horizontalBar, 1); this->RemoveChild(this->scrollBar, 1); this->horizontalBar = nullptr; @@ -3710,8 +3710,8 @@ void UICashEmotionScrollWnd::Slot53() { // OFFSET: 0x007CC870 // FUNCTION: fn_09499 -UICashEmotionSprBtn::UICashEmotionSprBtn(UIWindowContext& windowContext, UIWindow* target) - : UISpriteButton2(windowContext, target), m_selected(false) { +UICashEmotionSprBtn::UICashEmotionSprBtn(UIWindow* target) + : UISpriteButton2(target), m_selected(false) { } // OFFSET: 0x007CC990 @@ -3854,13 +3854,13 @@ void UICashEmotionSprBtn::Slot28(int x, int y) { // OFFSET: 0x008502C0 // FUNCTION: fn_10674 -UISpriteButton2::UISpriteButton2(UIWindowContext& windowContext, UIWindow* target) - : UISpriteButton(windowContext), m_target(target) { +UISpriteButton2::UISpriteButton2(UIWindow* target) + : UISpriteButton(), m_target(target) { } // OFFSET: 0x00850320 // FUNCTION: fn_10675 -UISpriteButton::UISpriteButton(UIWindowContext& windowContext) : UIButton(windowContext) { +UISpriteButton::UISpriteButton() : UIButton() { this->unknown_00BC = 0; this->unknown_00C0 = 0; this->unknown_00B4 = 0; diff --git a/Source/Contents/Messenger/MessengerMember.cpp b/Source/Contents/Messenger/MessengerMember.cpp index 2220dcd1..b6a7ead9 100644 --- a/Source/Contents/Messenger/MessengerMember.cpp +++ b/Source/Contents/Messenger/MessengerMember.cpp @@ -66,7 +66,7 @@ namespace { class UIDragMiniPartyWnd : public UIFrameWnd { public: - UIDragMiniPartyWnd(UIWindowContext& windowContext, MessengerMember member); + UIDragMiniPartyWnd(MessengerMember member); ~UIDragMiniPartyWnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -89,7 +89,7 @@ public: class UIFriendOptionWnd : public UIFrameWnd { public: - UIFriendOptionWnd(UIWindowContext& windows); + UIFriendOptionWnd(); ~UIFriendOptionWnd() override; void Slot11() override; void Slot15(int width, int height) override; @@ -105,7 +105,7 @@ public: class UIJobIconButton : public UIBitmapButton { public: - UIJobIconButton(UIWindowContext& windows); + UIJobIconButton(); ~UIJobIconButton() override; void Paint() override; void Slot25(int x, int y) override; @@ -117,7 +117,7 @@ public: class UIMessengerGroupWnd : public UIFrameWnd { public: - UIMessengerGroupWnd(UIWindowContext& windows); + UIMessengerGroupWnd(); ~UIMessengerGroupWnd() override; void Slot11() override; void Slot15(int width, int height) override; @@ -226,8 +226,8 @@ MessengerMember& MessengerMember::operator=(const MessengerMember& other) { // OFFSET: 0x007382E0 // FUNCTION: fn_07664 -UIDragMiniPartyWnd::UIDragMiniPartyWnd(UIWindowContext& windowContext, MessengerMember member) - : UIFrameWnd(windowContext, 0), member(member), gauge(nullptr), iconIndex(0) { +UIDragMiniPartyWnd::UIDragMiniPartyWnd(MessengerMember member) + : UIFrameWnd(0), member(member), gauge(nullptr), iconIndex(0) { this->geometry.unknown_0030 = 0; } @@ -499,7 +499,7 @@ void UIPcGage::SetLimits(int first, int second) { // OFFSET: 0x00738E10 // FUNCTION: fn_07679 -UIFriendOptionWnd::UIFriendOptionWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIFriendOptionWnd::UIFriendOptionWnd() : UIFrameWnd(0) { this->saved = nullptr; } @@ -513,7 +513,7 @@ void UIFriendOptionWnd::Slot15(int, int) { const char* label = LookupMessage(361); int width = std::min(this->TextWidth(label, 0, 0, 12, 0, 0) + 12, this->geometry.width - 15); - this->option0Box = new UICheckBox(*this->m_context); + this->option0Box = new UICheckBox(); this->option0Box->SetSize(width, 12); this->option0Box->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(361)); this->option0Box->Move(6, 21); @@ -522,7 +522,7 @@ void UIFriendOptionWnd::Slot15(int, int) { label = LookupMessage(359); width = std::min(this->TextWidth(label, 0, 0, 12, 0, 0) + 12, this->geometry.width - 15); - this->option2Box = new UICheckBox(*this->m_context); + this->option2Box = new UICheckBox(); this->option2Box->SetSize(width, 12); this->option2Box->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(359)); this->option2Box->Move(6, 37); @@ -531,7 +531,7 @@ void UIFriendOptionWnd::Slot15(int, int) { label = LookupMessage(362); width = std::min(this->TextWidth(label, 0, 0, 12, 0, 0) + 12, this->geometry.width - 15); - this->option1Box = new UICheckBox(*this->m_context); + this->option1Box = new UICheckBox(); this->option1Box->SetSize(width, 12); this->option1Box->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(362)); this->option1Box->Move(6, 53); @@ -601,7 +601,7 @@ void UIFriendOptionWnd::Slot11() { // OFFSET: 0x00739330 // FUNCTION: fn_07685 -UIJobIconButton::UIJobIconButton(UIWindowContext& windows) : UIBitmapButton(windows) { +UIJobIconButton::UIJobIconButton() : UIBitmapButton() { this->unknown_0120 = 0; } @@ -676,7 +676,7 @@ MiniPartyInfoEntry::MiniPartyInfoEntry(const char* text, int value) : text(text) // OFFSET: 0x00739C80 // FUNCTION: fn_07698 -UIMessengerGroupWnd::UIMessengerGroupWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIMessengerGroupWnd::UIMessengerGroupWnd() : UIFrameWnd(0) { this->saved = nullptr; this->scrollBar = nullptr; this->scrollTop = 0; @@ -759,7 +759,7 @@ __declspec(noinline) MessengerMember UIMessengerGroupWnd::MemberAt(int x, int y) // OFFSET: 0x0073A330 // FUNCTION: fn_07703 __declspec(noinline) void UIMessengerGroupWnd::OpenMiniPartyWnd(int cell, const MessengerMember& member) { - UIMiniPartyWnd* window = new UIMiniPartyWnd(*this->m_context); + UIMiniPartyWnd* window = new UIMiniPartyWnd(); window->SetSize(174, 52); window->m_cell = cell; g_windowMgr.AddMiniPartyWindow(window); @@ -791,7 +791,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { this->iconPositions[1].size = 27; this->iconModeButtons[0] = this->AddMinimizeButton("", 0); - this->iconModeButtons[1] = new UIBitmapButton(*this->m_context); + this->iconModeButtons[1] = new UIBitmapButton(); static_cast(this->iconModeButtons[1])->SetBitmap("유저인터페이스\\renewalparty\\btn_titlebar_maximum_out.bmp", 0, 0); static_cast(this->iconModeButtons[1])->SetBitmap("유저인터페이스\\renewalparty\\btn_titlebar_maximum_over.bmp", 1, 0); static_cast(this->iconModeButtons[1])->SetBitmap("유저인터페이스\\renewalparty\\btn_titlebar_maximum_press.bmp", 2, 0); @@ -811,7 +811,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { } for (int index = 0; index < 40; ++index) { - this->jobIcons[index] = new UIJobIconButton(*this->m_context); + this->jobIcons[index] = new UIJobIconButton(); this->jobIcons[index]->SetSize(50, 50); this->jobIcons[index]->SetBitmap("유저인터페이스\\renewalparty\\icon_jobs_4046.bmp", 0, 0); this->jobIcons[index]->SetBitmap("유저인터페이스\\renewalparty\\icon_jobs_4046.bmp", 1, 0); @@ -819,7 +819,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { this->AddChild(this->jobIcons[index]); } - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); this->scrollBar->Configure(this->geometry.width - 15, 17, 1, this->geometry.height - 58); this->AddChild(this->scrollBar); this->mode = 1; @@ -828,7 +828,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { int tabWidths[2] = {48, this->TextWidth(LookupMessage(0x67), 0, 0, 12, 0, 0) + 13}; int tabValues[2] = {0, 1}; for (int index = 0; index < 2; ++index) { - UIRadioBtn* tab = new UIRadioBtn(*this->m_context); + UIRadioBtn* tab = new UIRadioBtn(); this->tabs[index] = tab; tab->SetSize(tabWidths[index], 12); tab->Move(index * 60 + 4, this->geometry.height - 16); @@ -849,7 +849,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { sprintf(title, "%s(%d/%d)", titles[this->mode], this->members.size(), 40); } - this->titleText = new UIStaticText(*this->m_context); + this->titleText = new UIStaticText(); this->titleText->SetSize(this->geometry.width - 57, 15); this->titleText->SetTextFitted(title); this->titleText->Move(16, 2); @@ -886,7 +886,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { for (int index = 0; index < 11; ++index) { char number[8]; _itoa(index + 1, number, 10); - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->buttons[index] = button; bool useDisabledImage = false; @@ -918,7 +918,7 @@ void UIMessengerGroupWnd::Slot15(int, int) { } } - UIResizer* resizer = new UIResizer(*this->m_context); + UIResizer* resizer = new UIResizer(); this->resizeButton = resizer; resizer->SetSize(16, 16); resizer->SetDirection(7); @@ -1187,7 +1187,7 @@ void UIMessengerGroupWnd::Slot33(int x, int y) { if (this->mode == 1 && !g_messengerGroupCollapsed && !g_windowMgr.HasMiniPartyMember(selectedMember.accountId)) { gameMode->SetDragIds(29, this->selected); if (!g_windowMgr.window_4F250) { - UIDragMiniPartyWnd* window = new (std::nothrow) UIDragMiniPartyWnd(*this->m_context, selectedMember); + UIDragMiniPartyWnd* window = new (std::nothrow) UIDragMiniPartyWnd(selectedMember); { window->SetSize(this->geometry.width, this->rowHeight); window->Move(-1000, -1000); @@ -2046,8 +2046,8 @@ void UIMessengerGroupWnd::Slot11() { // OFFSET: 0x0073FFC0 // FUNCTION: fn_07726 -UIMiniPartyInfoWnd::UIMiniPartyInfoWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0), m_gauge(nullptr), m_owner(nullptr) { +UIMiniPartyInfoWnd::UIMiniPartyInfoWnd() + : UIFrameWnd(0), m_gauge(nullptr), m_owner(nullptr) { this->m_entries.clear(); } diff --git a/Source/Contents/NavigationRoute.cpp b/Source/Contents/NavigationRoute.cpp index 864c8682..42744817 100644 --- a/Source/Contents/NavigationRoute.cpp +++ b/Source/Contents/NavigationRoute.cpp @@ -272,7 +272,7 @@ void CNavigationManager::RequestPrivateAirship(std::string mapName, int itemId) if (itemId == 0x1AFD) { WindowDialogs& dialogs = *reinterpret_cast(&g_windowMgr); - UIPayConfirmWnd* window = new UIPayConfirmWnd(dialogs.windows, dialogs.dialog); + UIPayConfirmWnd* window = new UIPayConfirmWnd(dialogs.dialog); window->Configure(LookupMessage(0xFC1), 0x1AFD); window->SendMsg(nullptr, 0x9C, 1, 0, 0, 0); window->SetId(0x16B); diff --git a/Source/Contents/SignBoard/SignBoard.cpp b/Source/Contents/SignBoard/SignBoard.cpp index 8763af4d..17054d0c 100644 --- a/Source/Contents/SignBoard/SignBoard.cpp +++ b/Source/Contents/SignBoard/SignBoard.cpp @@ -81,7 +81,7 @@ void CSignBoardMgr::Initialize() { case 1: { C3DCooRendering* object = new C3DCooRendering(); object->type = it->type; - object->Create(*reinterpret_cast(nullptr)); + object->Create(); std::string image; if (_mbsstr(reinterpret_cast(it->image), reinterpret_cast("유저인터페이스")) == nullptr) { image = "유저인터페이스\\"; @@ -111,7 +111,7 @@ void CSignBoardMgr::Initialize() { case 3: { C3DCooRendering* object = new C3DCooRendering(); object->type = it->type; - object->Create(*reinterpret_cast(nullptr)); + object->Create(); std::string image; if (_mbsstr(reinterpret_cast(it->image), reinterpret_cast("유저인터페이스")) == nullptr) { image = "유저인터페이스\\"; @@ -183,7 +183,7 @@ C3DCooRendering::C3DCooRendering() : window(nullptr) { // OFFSET: 0x008210A0 // FUNCTION: fn_10255 -CBmpObjWnd::CBmpObjWnd(UIWindowContext& windows) : UIWindow(windows, 0) { +CBmpObjWnd::CBmpObjWnd() : UIWindow(0) { } // OFFSET: 0x00821120 @@ -193,7 +193,7 @@ CIcon::CIcon() { // OFFSET: 0x00821180 // FUNCTION: fn_10257 -CSignBoardWnd::CSignBoardWnd(UIWindowContext& windows) : UIWindow(windows, 0) { +CSignBoardWnd::CSignBoardWnd() : UIWindow(0) { } // OFFSET: 0x008213D0 @@ -256,7 +256,7 @@ void CBmpObjWnd::Slot15(int width, int height) { void CSignBoardWnd::Slot15(int width, int height) { CBitmapRes* bitmap = static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\signboard\\bg_signboard.bmp"))); this->Resize(bitmap->image.width, bitmap->image.height); - UIStaticText* text = new (std::nothrow) UIStaticText(*this->m_context); + UIStaticText* text = new (std::nothrow) UIStaticText(); this->text = text; text->SetSize(0x7e, 0xe); text->Move(0x1e, this->geometry.height / 2 - 7); @@ -285,18 +285,18 @@ void CSignBoardWnd::Paint() { // OFFSET: 0x00821D10 // FUNCTION: fn_10267 -void C3DCooRendering::Create(UIWindowContext& windows) { +void C3DCooRendering::Create() { UIWindow* window; int width; int height; switch (this->type) { case 1: - window = new (std::nothrow) CBmpObjWnd(windows); + window = new (std::nothrow) CBmpObjWnd(); width = 0xaa; height = 0xaa; break; case 3: - window = new (std::nothrow) CSignBoardWnd(windows); + window = new (std::nothrow) CSignBoardWnd(); width = 0xa2; height = 0x24; break; diff --git a/Source/Contents/SignBoard/SignBoard.h b/Source/Contents/SignBoard/SignBoard.h index 71eea40d..a775c624 100644 --- a/Source/Contents/SignBoard/SignBoard.h +++ b/Source/Contents/SignBoard/SignBoard.h @@ -12,7 +12,7 @@ class UIStaticText; class CBmpObjWnd : public UIWindow { public: - explicit CBmpObjWnd(UIWindowContext& windows); + CBmpObjWnd(); ~CBmpObjWnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -22,7 +22,7 @@ public: class CSignBoardWnd : public UIWindow { public: - CSignBoardWnd(UIWindowContext& windows); + CSignBoardWnd(); ~CSignBoardWnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -54,7 +54,7 @@ public: ~C3DCooRendering() override; bool OnProcess() override; void Render(int argument) override; - void Create(UIWindowContext& windows); + void Create(); void SetOverrideColor(); void SetBoard(const std::string& text, const std::string& color); void SetWindowImage(const std::string& name); diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 8e29dcc3..8681728d 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -210,14 +210,14 @@ void UIChatHisBox::Configure(int x, int y, int width, int height, unsigned char) // OFFSET: 0x008C73C0 // FUNCTION: fn_11930 -UIChooseSellBuyWnd::UIChooseSellBuyWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIFrameWnd(windows, 0), identity(0), m_acceptance(&acceptance) { +UIChooseSellBuyWnd::UIChooseSellBuyWnd(UIAcceptanceContext& acceptance) + : UIFrameWnd(0), identity(0), m_acceptance(&acceptance) { } // OFFSET: 0x008C6FA0 // FUNCTION: fn_11926 -UIBookWnd::UIBookWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIBookWnd::UIBookWnd() + : UIFrameWnd(0) { this->m_lineCount = 0; this->m_pageCount = 0; this->m_page = 1; @@ -230,7 +230,7 @@ UIBookWnd::UIBookWnd(UIWindowContext& windows) // OFFSET: 0x008C7860 // FUNCTION: fn_11940 -UIEquipWnd::UIEquipWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIEquipWnd::UIEquipWnd() : UIFrameWnd(0) { this->unknown_0124 = nullptr; this->unknown_0128 = 0; this->unknown_012C = 0; @@ -268,7 +268,7 @@ UIChooseSellBuyWnd::~UIChooseSellBuyWnd() = default; // INLINED void UIChooseSellBuyWnd::AddChoice(const char* name, int id, int x, int y) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); const char* suffixes[] = {"", "_a", "_b"}; for (int state = 0; state < 3; ++state) { @@ -284,7 +284,7 @@ void UIChooseSellBuyWnd::AddChoice(const char* name, int id, int x, int y) { // INLINED void UIChooseSellBuyWnd::CreateViewer(int width, int height) { - this->viewer = new UITextViewer(*this->m_context); + this->viewer = new UITextViewer(); this->viewer->Configure(10, 22, width - 20, height - 55, 0); const std::string chip = std::string(prefix) + "colorchip.bmp"; const auto* bitmap = static_cast(ResourceMgr::Instance().Load(chip.c_str())); @@ -297,8 +297,8 @@ void UIChooseSellBuyWnd::CreateViewer(int width, int height) { // OFFSET: 0x008C7420 // FUNCTION: fn_11931 -UIChooseWarpWnd::UIChooseWarpWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_list(nullptr), unknown_00B8(0), m_choices() { +UIChooseWarpWnd::UIChooseWarpWnd() + : UIFrameWnd(0), m_list(nullptr), unknown_00B8(0), m_choices() { this->m_choices.reserve(6); } @@ -316,14 +316,14 @@ void UIChooseSellBuyWnd::Slot15(int width, int height) { // OFFSET: 0x008DD9A0 // FUNCTION: fn_12163 void UIChooseWarpWnd::Slot15(int width, int height) { - auto* title = new UIStaticText(*this->m_context); + auto* title = new UIStaticText(); title->SetSize(this->geometry.width - 30, 15); title->Move(12, 9); title->SetText(LookupMessage(213), 0); title->SetFont(0, 12, 0, 0); this->AddChild(title); - this->m_list = new UIListBox(*this->m_context); + this->m_list = new UIListBox(); int listWidth = width - 24; int listHeight = height - 55; if (listWidth < 20) { @@ -345,7 +345,7 @@ void UIChooseWarpWnd::Slot15(int width, int height) { int ids[2] = {184, 185}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -361,7 +361,7 @@ void UIChooseWarpWnd::Slot15(int width, int height) { // OFFSET: 0x008DE0E0 // FUNCTION: fn_12164 void UIChooseWnd::Slot15(int width, int height) { - this->m_list = new UIListBox(*this->m_context); + this->m_list = new UIListBox(); int listHeight = height - 55; if (listHeight < 30) { listHeight = 30; @@ -378,7 +378,7 @@ void UIChooseWnd::Slot15(int width, int height) { this->AddChild(this->m_list); this->m_message0 = 184; - this->m_okButton = new UIBitmapButton(*this->m_context); + this->m_okButton = new UIBitmapButton(); this->m_okButton->SetBitmap("유저인터페이스\\btn_ok.bmp", 0, 0); this->m_okButton->SetBitmap("유저인터페이스\\btn_ok_a.bmp", 1, 0); this->m_okButton->SetBitmap("유저인터페이스\\btn_ok_b.bmp", 2, 0); @@ -387,7 +387,7 @@ void UIChooseWnd::Slot15(int width, int height) { this->m_okButton->SetId(184); this->AddChild(this->m_okButton); - this->m_cancelButton = new UIBitmapButton(*this->m_context); + this->m_cancelButton = new UIBitmapButton(); this->m_cancelButton->SetBitmap("유저인터페이스\\btn_cancel.bmp", 0, 0); this->m_cancelButton->SetBitmap("유저인터페이스\\btn_cancel_a.bmp", 1, 0); this->m_cancelButton->SetBitmap("유저인터페이스\\btn_cancel_b.bmp", 2, 0); @@ -400,7 +400,7 @@ void UIChooseWnd::Slot15(int width, int height) { // OFFSET: 0x008DE520 // FUNCTION: fn_12169 void UIDisconnectedServerMsgWnd::Slot15(int width, int height) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\btn_ok.bmp", 0, 0); button->SetBitmap("유저인터페이스\\btn_ok_a.bmp", 1, 0); button->SetBitmap("유저인터페이스\\btn_ok_b.bmp", 2, 0); @@ -410,7 +410,7 @@ void UIDisconnectedServerMsgWnd::Slot15(int width, int height) { this->AddChild(button); this->m_message0 = 184; - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(10, 22, width - 20, height - 55, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -424,7 +424,7 @@ void UIDisconnectedServerMsgWnd::Slot15(int width, int height) { // FUNCTION: fn_12170 void UIEmailAddressWnd::Slot15(int, int) { g_modeMgr.gameMode->SendMsg(10013, 0, 0, 0, 0); - this->m_edit = new UIEditCtrl(*this->m_context); + this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(this->geometry.width - 77, 16); this->m_edit->Move(15, 22); this->m_edit->maximum = 49; @@ -438,7 +438,7 @@ void UIEmailAddressWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int x = this->geometry.width - 55; const int y = this->geometry.height - 28; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -808,7 +808,7 @@ int UIMinimapZoomWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argum // OFFSET: 0x0090C020 // FUNCTION: fn_12437 void UIMinimapZoomWnd::AddTownButton(int index, TownInfo town) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap(town.image.c_str(), 0, 0); button->SetBitmap(town.image.c_str(), 1, 0); button->SetBitmap(town.image.c_str(), 2, 0); @@ -1858,7 +1858,7 @@ void UISelectCartWnd::AddCart(int index, int type) { y -= 10; break; } - UISpriteButton* button = new UISpriteButton(*this->m_context); + UISpriteButton* button = new UISpriteButton(); const std::string prefix = "이팩트\\"; button->SetSprite((prefix + name + ".spr").c_str()); button->SetActName((prefix + name + ".act").c_str()); @@ -3201,7 +3201,7 @@ int UIEquipWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::int const int height = this->unknown_00D8 + 167; this->Resize(this->geometry.width, height + 158); if (!this->unknown_0124) { - UISwapEquipmentWnd* created = new (std::nothrow) UISwapEquipmentWnd(*this->m_context); + UISwapEquipmentWnd* created = new (std::nothrow) UISwapEquipmentWnd(); this->unknown_0124 = created; created->SetSize(280, 179); if (this->m_page == 0) { @@ -3675,7 +3675,7 @@ bool UInCashWnd::Slot03() { // OFFSET: 0x008DB750 // FUNCTION: fn_12159 void UIBookWnd::Slot15(int width, int height) { - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(30, 45, width - 60, height - 60, 0); this->AddChild(this->m_viewer); @@ -3689,7 +3689,7 @@ void UIBookWnd::Slot15(int width, int height) { const char* tooltips[4] = {LookupMessage(1296), LookupMessage(1297), LookupMessage(1298), LookupMessage(1299)}; for (int index = 0; index < 4; ++index) { - this->m_buttons[index] = new UISpriteButton(*this->m_context); + this->m_buttons[index] = new UISpriteButton(); this->m_buttons[index]->SetSprite((prefix + names[index] + ".spr").c_str()); this->m_buttons[index]->SetActName((prefix + names[index] + ".act").c_str()); this->m_buttons[index]->SetSize(this->m_buttons[index]->FrameWidth(0, 0), this->m_buttons[index]->FrameHeight(0, 0)); @@ -3704,7 +3704,7 @@ void UIBookWnd::Slot15(int width, int height) { // FUNCTION: fn_12175 void UIItemCollectionWnd::Slot15(int width, int height) { this->m_kind = 12; - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(91, 31, width - 98, height - 40, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -3715,7 +3715,7 @@ void UIItemCollectionWnd::Slot15(int width, int height) { this->m_closeButton = this->AddCloseButton("ESC", 0); std::string path = "유저인터페이스\\"; - this->m_viewButton = new UIBitmapButton(*this->m_context); + this->m_viewButton = new UIBitmapButton(); this->m_viewButton->SetBitmap((path + "btn_view" + ".bmp").c_str(), 0, 0); this->m_viewButton->SetBitmap((path + "btn_view_a" + ".bmp").c_str(), 1, 0); this->m_viewButton->SetBitmap((path + "btn_view_b" + ".bmp").c_str(), 2, 0); @@ -3729,7 +3729,7 @@ void UIItemCollectionWnd::Slot15(int width, int height) { const int ids[2] = {287, 288}; const char* names[2] = {"책읽기", "책읽기"}; for (int index = 0; index < 2; ++index) { - this->m_readButtons[index] = new UISpriteButton(*this->m_context); + this->m_readButtons[index] = new UISpriteButton(); this->m_readButtons[index]->SetSprite((prefix + names[index] + ".spr").c_str()); this->m_readButtons[index]->SetActName((prefix + names[index] + ".act").c_str()); this->m_readButtons[index]->SetSize(this->m_readButtons[index]->FrameWidth(0, 0), this->m_readButtons[index]->FrameHeight(0, 0)); @@ -3739,7 +3739,7 @@ void UIItemCollectionWnd::Slot15(int width, int height) { this->AddChild(this->m_readButtons[index]); } - this->m_resizer = new UIResizer(*this->m_context); + this->m_resizer = new UIResizer(); this->m_resizer->SetSize(16, 16); this->m_resizer->SetDirection(7); this->m_resizer->SetBitmapName(this->m_kind == 234 ? "유저인터페이스\\basic_interface\\btn_comparison_resize.bmp" : "유저인터페이스\\btn_resize.bmp"); @@ -3749,7 +3749,7 @@ void UIItemCollectionWnd::Slot15(int width, int height) { this->m_previewTick = 0; if (!this->m_moveInfo) { - this->m_moveInfo = new UIItemMoveInfo(*this->m_context); + this->m_moveInfo = new UIItemMoveInfo(); this->m_moveInfo->Configure(LookupMessage(2796), 0, 0, 12, 0, 1); this->m_moveInfo->SetId(487); UIItemMoveInfo* moveInfo = this->m_moveInfo; @@ -3758,7 +3758,7 @@ void UIItemCollectionWnd::Slot15(int width, int height) { this->AddChild(this->m_moveInfo); } - this->m_helpButton = new UIBitmapButton(*this->m_context); + this->m_helpButton = new UIBitmapButton(); this->m_helpButton->SetBitmap("유저인터페이스\\basic_interface\\btn_help_normal.bmp", 0, 0); this->m_helpButton->SetBitmap("유저인터페이스\\basic_interface\\btn_help_over.bmp", 1, 0); this->m_helpButton->SetBitmap("유저인터페이스\\basic_interface\\btn_help_pressed.bmp", 2, 0); @@ -3817,7 +3817,7 @@ void UIItemIdentifyWnd::Slot15(int, int) { this->m_columns = 1; this->m_rows = 4; this->m_scrollable = 0; - auto* scrollBar = new UIScrollBar(*this->m_context); + auto* scrollBar = new UIScrollBar(); this->m_scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 34, 1, this->geometry.height - 55); this->AddChild(this->m_scrollBar); @@ -3922,7 +3922,7 @@ void UIStatusWnd::Slot15(int, int) { const int ids[6] = {205, 206, 207, 208, 209, 210}; const std::string arrow = "유저인터페이스\\basic_interface\\arw_right.bmp"; for (int i = 0; i < 6; ++i) { - this->m_statButtons[i] = new UIBitmapButton(*this->m_context); + this->m_statButtons[i] = new UIBitmapButton(); this->m_statButtons[i]->SetBitmap(arrow.c_str(), 0, 0); this->m_statButtons[i]->SetBitmap(arrow.c_str(), 1, 0); this->m_statButtons[i]->SetBitmap(arrow.c_str(), 2, 0); @@ -3937,7 +3937,7 @@ void UIStatusWnd::Slot15(int, int) { const int ids[6] = {551, 552, 553, 554, 555, 556}; const std::string arrow = "유저인터페이스\\basic_interface\\arw_right.bmp"; for (int i = 0; i < 6; ++i) { - this->m_extendedButtons[i] = new UIBitmapButton(*this->m_context); + this->m_extendedButtons[i] = new UIBitmapButton(); this->m_extendedButtons[i]->SetBitmap(arrow.c_str(), 0, 0); this->m_extendedButtons[i]->SetBitmap(arrow.c_str(), 1, 0); this->m_extendedButtons[i]->SetBitmap(arrow.c_str(), 2, 0); @@ -3948,7 +3948,7 @@ void UIStatusWnd::Slot15(int, int) { } } - this->m_expandButton = new UIBmpTextButton(*this->m_context); + this->m_expandButton = new UIBmpTextButton(); this->m_expandButton->SetBitmap("유저인터페이스\\statuswnd\\expand_on_normal.bmp", 0, 0); this->m_expandButton->SetBitmap("유저인터페이스\\statuswnd\\expand_on_normal.bmp", 1, 0); this->m_expandButton->SetBitmap("유저인터페이스\\statuswnd\\expand_on_press.bmp", 2, 0); @@ -3983,7 +3983,7 @@ void UISkillNameChangeWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int x = this->geometry.width - 55; const int y = this->geometry.height - 32; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -4038,14 +4038,14 @@ void UIProhibitListWnd::Slot15(int, int) { this->AddCloseButton("", 0); char tooltip[] = "Command"; - auto* area = new UINoneVisibleButton(*this->m_context); + auto* area = new UINoneVisibleButton(); area->SetSize(120, 18); area->Move(350, 59); area->SetId(268); this->AddChild(area); const std::string prefix("유저인터페이스\\basic_interface\\"); - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "txtbox_btn_a" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "txtbox_btn_b" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "txtbox_btn_c" + ".bmp").c_str(), 2, 0); @@ -5328,7 +5328,7 @@ int UIItemTagCtrl::MeasureText(const std::string& text, const unsigned& bytes) { // OFFSET: 0x008E8390 // FUNCTION: fn_12197 void UISayDialogWnd::Slot15(int width, int height) { - auto* viewer = new UITagTextViewer(*this->m_context); + auto* viewer = new UITagTextViewer(); this->m_viewer = viewer; viewer->SetSize(width - 20, height - 40); viewer->m_backgroundColor = 0xFFF2F2F2; @@ -5651,7 +5651,7 @@ void UIItemCollectionWnd::SetHeight(int height) { class UIAutoMessageWnd : public UIFrameWnd { public: - UIAutoMessageWnd(UIWindowContext& windows); + UIAutoMessageWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -6141,128 +6141,128 @@ void UInCashWnd::Slot32(int x, int y) { // OFFSET: 0x008C6E20 // FUNCTION: fn_11923 -UIAutoMessageWnd::UIAutoMessageWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIAutoMessageWnd::UIAutoMessageWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C6E80 // FUNCTION: fn_11924 -UIBabyAcceptWnd2::UIBabyAcceptWnd2(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIBabyAcceptWnd2::UIBabyAcceptWnd2(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C6F10 // FUNCTION: fn_11925 -UIBabyAcceptWnd::UIBabyAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIBabyAcceptWnd::UIBabyAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C7630 // FUNCTION: fn_11935 -UIComboBoxIDWnd::UIComboBoxIDWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_list(nullptr), m_owner(nullptr) { +UIComboBoxIDWnd::UIComboBoxIDWnd() + : UIFrameWnd(0), m_list(nullptr), m_owner(nullptr) { } // OFFSET: 0x008C76A0 // FUNCTION: fn_11936 -UIComboBoxWnd::UIComboBoxWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_list(nullptr), m_owner(nullptr) { +UIComboBoxWnd::UIComboBoxWnd() + : UIFrameWnd(0), m_list(nullptr), m_owner(nullptr) { } // OFFSET: 0x008C77A0 // FUNCTION: fn_11938 -UIDisconnectedServerMsgWnd::UIDisconnectedServerMsgWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_viewer(nullptr) { +UIDisconnectedServerMsgWnd::UIDisconnectedServerMsgWnd() + : UIFrameWnd(0), m_viewer(nullptr) { } // OFFSET: 0x008C82D0 // FUNCTION: fn_11951 -UILoadingWnd::UILoadingWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_progressBar(nullptr) { +UILoadingWnd::UILoadingWnd() + : UIFrameWnd(0), m_progressBar(nullptr) { } // OFFSET: 0x008C8650 // FUNCTION: fn_11957 -UINoticeConfirmWnd::UINoticeConfirmWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_event(28) { +UINoticeConfirmWnd::UINoticeConfirmWnd() + : UIFrameWnd(0), m_event(28) { } // OFFSET: 0x008C8770 // FUNCTION: fn_11959 -UINotifyLevelUpWnd::UINotifyLevelUpWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UINotifyLevelUpWnd::UINotifyLevelUpWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C87D0 // FUNCTION: fn_11960 -UINotifyQuestWnd::UINotifyQuestWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UINotifyQuestWnd::UINotifyQuestWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C8830 // FUNCTION: fn_11961 -UINpcEditDialogWnd::UINpcEditDialogWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UINpcEditDialogWnd::UINpcEditDialogWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C8890 // FUNCTION: fn_11962 -UINpcTextEditDialogWnd::UINpcTextEditDialogWnd(UIWindowContext& windows) - : UINpcEditDialogWnd(windows), m_tagCtrl(nullptr) { +UINpcTextEditDialogWnd::UINpcTextEditDialogWnd() + : UINpcEditDialogWnd(), m_tagCtrl(nullptr) { } // OFFSET: 0x008C8B50 // FUNCTION: fn_11968 -UIProhibitListWnd::UIProhibitListWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_count(0) { +UIProhibitListWnd::UIProhibitListWnd() + : UIFrameWnd(0), m_count(0) { } // OFFSET: 0x008C8BB0 // FUNCTION: fn_11969 -UIQuitWnd::UIQuitWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIQuitWnd::UIQuitWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C8C10 // FUNCTION: fn_11970 -UIRestartWnd::UIRestartWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIRestartWnd::UIRestartWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C93D0 // FUNCTION: fn_11980 -UITipOfTheDayWnd::UITipOfTheDayWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UITipOfTheDayWnd::UITipOfTheDayWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C9560 // FUNCTION: fn_11982 -UIToolTipWnd::UIToolTipWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIToolTipWnd::UIToolTipWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C95C0 // FUNCTION: fn_11983 -UIWaitWnd::UIWaitWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_button(nullptr) { +UIWaitWnd::UIWaitWnd() + : UIFrameWnd(0), m_button(nullptr) { } // OFFSET: 0x008C9990 // FUNCTION: fn_11987 -UInCash_CallWnd::UInCash_CallWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UInCash_CallWnd::UInCash_CallWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C8F00 // FUNCTION: fn_11973 -UISelectCartWnd::UISelectCartWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00B4(0), unknown_00B8(0), unknown_00BC(0), unknown_00C0(0) { +UISelectCartWnd::UISelectCartWnd() + : UIFrameWnd(0), unknown_00B4(0), unknown_00B8(0), unknown_00BC(0), unknown_00C0(0) { } // OFFSET: 0x008C9280 // FUNCTION: fn_11979 -UIStorePasswordInputWnd::UIStorePasswordInputWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00BC(-1), unknown_00C0(2) { +UIStorePasswordInputWnd::UIStorePasswordInputWnd() + : UIFrameWnd(0), unknown_00BC(-1), unknown_00C0(2) { std::memset(this->unknown_00D0, 0, sizeof(this->unknown_00D0)); std::memset(this->unknown_00D9, 0, sizeof(this->unknown_00D9)); std::memset(this->unknown_00E2, 0, sizeof(this->unknown_00E2)); @@ -6287,21 +6287,21 @@ UIStorePasswordInputWnd::UIStorePasswordInputWnd(UIWindowContext& windows) // OFFSET: 0x008C8D40 // FUNCTION: fn_11972 -UISecondPasswordInputWnd::UISecondPasswordInputWnd(UIWindowContext& windows) - : UIStorePasswordInputWnd(windows), unknown_010C(4), unknown_011C(0), unknown_0120(0), unknown_0124(), unknown_014C(0), +UISecondPasswordInputWnd::UISecondPasswordInputWnd() + : UIStorePasswordInputWnd(), unknown_010C(4), unknown_011C(0), unknown_0120(0), unknown_0124(), unknown_014C(0), unknown_0150(0), unknown_0154(0), unknown_0158(0), unknown_0164(0) { } // OFFSET: 0x008C8F80 // FUNCTION: fn_11974 -UISkillDescribeWnd::UISkillDescribeWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_text(nullptr) { +UISkillDescribeWnd::UISkillDescribeWnd() + : UIFrameWnd(0), m_text(nullptr) { } // OFFSET: 0x008C9430 // FUNCTION: fn_11981 -UITipboxWnd::UITipboxWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00B4(0), unknown_00B8(0), +UITipboxWnd::UITipboxWnd() + : UIFrameWnd(0), unknown_00B4(0), unknown_00B8(0), unknown_00BC(0), m_pageText(nullptr), m_pageTotalText(nullptr), unknown_00D0(0), unknown_00D4(0), unknown_00D8(0), m_buildTime(0), m_frameTime(0), unknown_00FC(false), unknown_0100(0) { this->unknown_00C0 = 0; @@ -6310,14 +6310,14 @@ UITipboxWnd::UITipboxWnd(UIWindowContext& windows) // OFFSET: 0x008C86B0 // FUNCTION: fn_11958 -UINotifyItemObtainWnd::UINotifyItemObtainWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_identified(false) { +UINotifyItemObtainWnd::UINotifyItemObtainWnd() + : UIFrameWnd(0), m_identified(false) { } // OFFSET: 0x008C7CB0 // FUNCTION: fn_11943 -UIItemCollectionWnd::UIItemCollectionWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_helpButton(nullptr) { +UIItemCollectionWnd::UIItemCollectionWnd() + : UIFrameWnd(0), m_helpButton(nullptr) { this->m_placement = nullptr; this->m_item.Reset(); this->unknown_0238 = 0; @@ -6336,87 +6336,87 @@ UIItemCollectionWnd::UIItemCollectionWnd(UIWindowContext& windows) // OFFSET: 0x008C7570 // FUNCTION: fn_11933 -UICombinedCardItemCollectionWnd::UICombinedCardItemCollectionWnd(UIWindowContext& windows) - : UIItemCollectionWnd(windows), m_cardPlacement(nullptr) { +UICombinedCardItemCollectionWnd::UICombinedCardItemCollectionWnd() + : UIItemCollectionWnd(), m_cardPlacement(nullptr) { } // OFFSET: 0x008C75D0 // FUNCTION: fn_11934 -UICombinedCardItemCollection_ComparisonWnd::UICombinedCardItemCollection_ComparisonWnd(UIWindowContext& windows) - : UIItemCollectionWnd(windows) { +UICombinedCardItemCollection_ComparisonWnd::UICombinedCardItemCollection_ComparisonWnd() + : UIItemCollectionWnd() { } // OFFSET: 0x008C7E40 // FUNCTION: fn_11944 -UIItemCollection_ComparisonWnd::UIItemCollection_ComparisonWnd(UIWindowContext& windows) - : UIItemCollectionWnd(windows) { +UIItemCollection_ComparisonWnd::UIItemCollection_ComparisonWnd() + : UIItemCollectionWnd() { } // OFFSET: 0x008C6FA0 // OFFSET: 0x008C7070 // FUNCTION: fn_11927 -UICardItemIllustWnd::UICardItemIllustWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UICardItemIllustWnd::UICardItemIllustWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C8390 // FUNCTION: fn_11953 -UIMenuWnd::UIMenuWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_menuId(10041), m_selected(-1), m_itemHeight(14), unknown_00CC(0), unknown_00DC(0) { +UIMenuWnd::UIMenuWnd() + : UIFrameWnd(0), m_menuId(10041), m_selected(-1), m_itemHeight(14), unknown_00CC(0), unknown_00DC(0) { } // OFFSET: 0x008C85A0 // FUNCTION: fn_11956 -UIMonsterDisplayWnd::UIMonsterDisplayWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIMonsterDisplayWnd::UIMonsterDisplayWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C8900 // FUNCTION: fn_11963 -UIPartyInvitationToWnd::UIPartyInvitationToWnd(UIWindowContext& windows) - : UIPartySettingWnd(windows) { +UIPartyInvitationToWnd::UIPartyInvitationToWnd() + : UIPartySettingWnd() { } // OFFSET: 0x008C8980 // FUNCTION: fn_11964 -UIPartySettingWnd::UIPartySettingWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIPartySettingWnd::UIPartySettingWnd() + : UIFrameWnd(0) { this->m_mode = 0; this->m_placement = nullptr; } // OFFSET: 0x008C8AB0 // FUNCTION: fn_11967 -UIPetTamingDeceiveWnd::UIPetTamingDeceiveWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_delay(1), m_state(0), m_tick(0), m_frame(-1), m_maxDelay(10000), m_started(0) { +UIPetTamingDeceiveWnd::UIPetTamingDeceiveWnd() + : UIFrameWnd(0), m_delay(1), m_state(0), m_tick(0), m_frame(-1), m_maxDelay(10000), m_started(0) { this->m_finishTime = 0xFFFFFFFF; } // OFFSET: 0x008C9060 // FUNCTION: fn_11975 -UISkillNameChangeWnd::UISkillNameChangeWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UISkillNameChangeWnd::UISkillNameChangeWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008C91F0 // OFFSET: 0x008C7710 // FUNCTION: fn_11937 -UICoupleAcceptWnd::UICoupleAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UICoupleAcceptWnd::UICoupleAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C8120 // FUNCTION: fn_11948 -UIJoinFriendAcceptWnd::UIJoinFriendAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIJoinFriendAcceptWnd::UIJoinFriendAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C81B0 // FUNCTION: fn_11949 -UIJoinGuildAcceptWnd::UIJoinGuildAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIJoinGuildAcceptWnd::UIJoinGuildAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008FE310 @@ -6492,26 +6492,26 @@ int UIJoinGuildAcceptWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a // OFFSET: 0x008C8510 // FUNCTION: fn_11955 -UIMixAcceptWnd::UIMixAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIMixAcceptWnd::UIMixAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C9160 // FUNCTION: fn_11977 -UIStarPlaceAcceptWnd::UIStarPlaceAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIStarPlaceAcceptWnd::UIStarPlaceAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C97F0 // FUNCTION: fn_11985 -UIYourItemWnd::UIYourItemWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIYourItemWnd::UIYourItemWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008C8C70 // FUNCTION: fn_11971 -UISayDialogWnd::UISayDialogWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UISayDialogWnd::UISayDialogWnd() + : UIFrameWnd(0) { this->m_viewer = nullptr; this->m_placement = nullptr; } @@ -6525,7 +6525,7 @@ void UINoticeConfirmWnd::Slot15(int width, int height) { int positions[2][2] = {{189, 96}, {234, 96}}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -6536,7 +6536,7 @@ void UINoticeConfirmWnd::Slot15(int width, int height) { } this->m_message0 = 184; - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(10, 22, width - 20, height - 55, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -6555,7 +6555,7 @@ void UINotifyLevelUpWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\basic_interface\\"); for (int i = 0; i < 1; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i] + "_off.bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i] + "_off.bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i] + "_on.bmp").c_str(), 2, 0); @@ -6575,7 +6575,7 @@ void UINotifyQuestWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\basic_interface\\"); for (int i = 0; i < 1; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i] + "_off.bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i] + "_off.bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i] + "_on.bmp").c_str(), 2, 0); @@ -6589,7 +6589,7 @@ void UINotifyQuestWnd::Slot15(int, int) { // OFFSET: 0x008E4F50 // FUNCTION: fn_12188 void UINpcEditDialogWnd::Slot15(int, int) { - this->edit = new UIEditCtrl(*this->m_context); + this->edit = new UIEditCtrl(); this->edit->SetSize(this->geometry.width - 77, 16); this->edit->Move(15, 22); this->edit->maximum = 12; @@ -6602,7 +6602,7 @@ void UINpcEditDialogWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int x = this->geometry.width - 55; const int y = this->geometry.height - 32; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -6617,7 +6617,7 @@ void UINpcEditDialogWnd::Slot15(int, int) { // OFFSET: 0x008E54B0 // FUNCTION: fn_12189 void UINpcTextEditDialogWnd::Slot15(int, int) { - this->edit = new UIEditCtrl(*this->m_context); + this->edit = new UIEditCtrl(); this->edit->SetSize(this->geometry.width - 77, 16); this->edit->Move(15, 22); this->edit->maximum = 70; @@ -6631,7 +6631,7 @@ void UINpcTextEditDialogWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int x = this->geometry.width - 55; const int y = this->geometry.height - 32; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -6651,7 +6651,7 @@ void UIQuitWnd::Slot15(int, int) { const char* names[3][3] = {{"esc_01a", "esc_01b", "esc_01c"}, {"esc_03a", "esc_03b", "esc_03c"}, {"esc_02a", "esc_02b", "esc_02c"}}; for (int i = 0; i < 3; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -6674,7 +6674,7 @@ void UIRestartWnd::Slot15(int, int) { int positions[4][4] = {{29, 22, 0, 0}, {29, 45, 0, 0}, {29, 68, 0, 0}, {29, 96, 0, 0}}; for (int i = 0; i < 4; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -6690,7 +6690,7 @@ void UIRestartWnd::Slot15(int, int) { // OFFSET: 0x008EAE30 // FUNCTION: fn_12206 void UIWaitWnd::Slot15(int width, int height) { - this->m_button = new UIBitmapButton(*this->m_context); + this->m_button = new UIBitmapButton(); this->m_button->SetBitmap("유저인터페이스\\btn_cancel.bmp", 0, 0); this->m_button->SetBitmap("유저인터페이스\\btn_cancel_a.bmp", 1, 0); this->m_button->SetBitmap("유저인터페이스\\btn_cancel_b.bmp", 2, 0); @@ -6700,7 +6700,7 @@ void UIWaitWnd::Slot15(int width, int height) { this->m_button->SetTooltip(""); this->AddChild(this->m_button); - this->m_textViewer = new UITextViewer(*this->m_context); + this->m_textViewer = new UITextViewer(); this->m_textViewer->Configure(10, 22, width - 20, height - 55, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -6723,7 +6723,7 @@ namespace { // OFFSET: 0x008E5A20 // FUNCTION: fn_12190 void UIPartyInvitationToWnd::Slot15(int, int) { - this->m_edit = new UIEditCtrl(*this->m_context); + this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(120, 20); this->m_edit->Move(20, 42); this->m_edit->maximum = 23; @@ -6737,7 +6737,7 @@ void UIPartyInvitationToWnd::Slot15(int, int) { int ids[2] = {184, 185}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -7197,7 +7197,7 @@ int UIYourItemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // OFFSET: 0x008E6B40 // FUNCTION: fn_12192 void UIPasswordWnd::Slot15(int, int) { - this->m_edit = new UIEditCtrl(*this->m_context); + this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(90, 16); this->m_edit->Move(15, 22); this->m_edit->maximum = 8; @@ -7207,7 +7207,7 @@ void UIPasswordWnd::Slot15(int, int) { this->AddChild(this->m_edit); g_windowMgr.SetFocus(this->m_edit); - auto* title = new UIStaticText(*this->m_context); + auto* title = new UIStaticText(); this->unknown_00B8 = reinterpret_cast(title); title->SetSize(this->geometry.width - 30, 15); title->Move(15, 6); @@ -7217,7 +7217,7 @@ void UIPasswordWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int x = this->geometry.width - 55; const int y = this->geometry.height - 32; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -7230,8 +7230,8 @@ void UIPasswordWnd::Slot15(int, int) { this->unknown_00BC = 0; } // FUNCTION: fn_11978 -UIStatusWnd::UIStatusWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIStatusWnd::UIStatusWnd() + : UIFrameWnd(0) { this->geometry.unknown_0030 = 0; this->m_info = nullptr; this->m_titleHeight = 17; @@ -8113,7 +8113,7 @@ void UINotifyItemObtainWnd::Paint() { void UIWhisperWnd::Slot15(int, int) { this->m_message0 = 184; - this->m_resizer = new UIResizer(*this->m_context); + this->m_resizer = new UIResizer(); this->m_resizer->SetSize(16, 16); this->m_resizer->SetDirection(7); this->m_resizer->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -8419,7 +8419,7 @@ void UIItemCollectionWnd::Paint() { // OFFSET: 0x008DB1F0 // FUNCTION: fn_12158 void UIAutoMessageWnd::Slot15(int, int) { - this->m_edit = new UIEditCtrl(*this->m_context); + this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(this->geometry.width - 77, 16); this->m_edit->Move(15, 22); this->m_edit->maximum = 100; @@ -8431,7 +8431,7 @@ void UIAutoMessageWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int x = this->geometry.width - 55; const int y = this->geometry.height - 32; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -8450,7 +8450,7 @@ void UInCash_CallWnd::Slot15(int, int) { const char* names[] = {"NC_CashShop"}; const std::string prefix("유저인터페이스\\basic_interface\\"); for (int index = 0; index < 1; ++index) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[index] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[index] + ".bmp").c_str(), 2, 0); @@ -8492,19 +8492,19 @@ int CSession::GetTraitStat(int type) { // OFFSET: 0x008C7F00 // FUNCTION: fn_11946 -UIItemIdentifyWnd::UIItemIdentifyWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_placement(nullptr) { +UIItemIdentifyWnd::UIItemIdentifyWnd() + : UIFrameWnd(0), m_placement(nullptr) { } // OFFSET: 0x008C7EA0 // FUNCTION: fn_11945 -UIItemCompositionWnd::UIItemCompositionWnd(UIWindowContext& windows) - : UIItemIdentifyWnd(windows), m_compositionPlacement(nullptr) { +UIItemCompositionWnd::UIItemCompositionWnd() + : UIItemIdentifyWnd(), m_compositionPlacement(nullptr) { } // OFFSET: 0x008C90E0 // FUNCTION: fn_11976 -UISpellListWnd::UISpellListWnd(UIWindowContext& windows) : UIItemIdentifyWnd(windows) { +UISpellListWnd::UISpellListWnd() : UIItemIdentifyWnd() { this->unknown_00FC = 0; } @@ -8577,8 +8577,8 @@ int UIPetEggListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argume // OFFSET: 0x008C8330 // FUNCTION: fn_11952 -UIMakingArrowListWnd::UIMakingArrowListWnd(UIWindowContext& windows) - : UIItemIdentifyWnd(windows) { +UIMakingArrowListWnd::UIMakingArrowListWnd() + : UIItemIdentifyWnd() { } // OFFSET: 0x008C8A50 @@ -8679,7 +8679,7 @@ void UILoadingWnd::Slot15(int, int) { // GLOBAL: gl_25392 static int s_loadingScreenIndex; - this->m_progressBar = new UIBarGraph2(*this->m_context); + this->m_progressBar = new UIBarGraph2(); this->m_progressBar->SetSize(240, 15); this->m_progressBar->Move(0, 0); this->m_progressBar->SetValue(0.0f); @@ -8711,8 +8711,8 @@ void UILoadingWnd::Slot15(int, int) { g_windowMgr.SetSurface0478(static_cast(ResourceMgr::Instance().Load(Resolve(name)))); } // FUNCTION: fn_11966 -UIPetEggListWnd::UIPetEggListWnd(UIWindowContext& windows) - : UIItemIdentifyWnd(windows) { +UIPetEggListWnd::UIPetEggListWnd() + : UIItemIdentifyWnd() { } // OFFSET: 0x008D1E80 @@ -8897,7 +8897,7 @@ void UIEquipWnd::Slot25(int x, int y) { // OFFSET: 0x008C9880 // FUNCTION: fn_11986 -UInCashWnd::UInCashWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UInCashWnd::UInCashWnd() : UIItemBaseWnd() { this->m_placement = nullptr; this->m_tab = 0; this->m_selected = 0; @@ -9239,7 +9239,7 @@ void UITipOfTheDayWnd::Slot15(int width, int height) { const char* tooltips[3] = {"", "", "/tip"}; for (int index = 0; index < 3; ++index) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[index][2] + ".bmp").c_str(), 2, 0); @@ -9261,7 +9261,7 @@ void UITipOfTheDayWnd::Slot15(int width, int height) { this->AddChild(this->m_textViewer); this->m_showTipsAtStartup = g_window315Enabled; - UICheckBox* checkBox = new UICheckBox(*this->m_context); + UICheckBox* checkBox = new UICheckBox(); checkBox->SetSize(this->TextWidth(LookupMessage(176), 0, 0, 12, 0, 0) + 12, 12); checkBox->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(176)); checkBox->Move(10, height - 20); @@ -10200,7 +10200,7 @@ int UIProhibitListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s if (!IsMonsterJob(g_session.m_aid)) { return 0; } - counter = new UICntWnd(*this->m_context); + counter = new UICntWnd(); counter->SetSize(0xB6, 0x2E); counter->Move((g_renderer->viewport.width - 640) / 2 + 200, ScaleByScreenHeight(200)); g_windowMgr.AddRendered(counter); @@ -10215,7 +10215,7 @@ int UIProhibitListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s if (a != 2 || !IsAdminAccount(g_session.m_aid)) { return 0; } - counter = new UICntWnd(*this->m_context); + counter = new UICntWnd(); counter->SetSize(0xB6, 0x2E); counter->Move((g_renderer->viewport.width - 640) / 2 + 200, ScaleByScreenHeight(200)); g_windowMgr.AddRendered(counter); diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp index d1372438..6f0a8155 100644 --- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp @@ -14,8 +14,8 @@ // OFFSET: 0x008C7AA0 // FUNCTION: fn_11941 -UIExchangeAcceptWnd::UIExchangeAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIChooseSellBuyWnd(windows, acceptance), saved(nullptr) { +UIExchangeAcceptWnd::UIExchangeAcceptWnd(UIAcceptanceContext& acceptance) + : UIChooseSellBuyWnd(acceptance), saved(nullptr) { } // OFFSET: 0x008CC9C0 diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp index 41a6a362..22e3df7b 100644 --- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp @@ -12,8 +12,8 @@ // OFFSET: 0x008C8240 // FUNCTION: fn_11950 -UIJoinPartyAcceptWnd::UIJoinPartyAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIJoinPartyAcceptWnd::UIJoinPartyAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008CCEE0 diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h index 209ecd98..b0c17e09 100644 --- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h +++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h @@ -23,7 +23,7 @@ struct UIAcceptanceContext { class UIChooseSellBuyWnd : public UIFrameWnd { public: - UIChooseSellBuyWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIChooseSellBuyWnd(UIAcceptanceContext& acceptance); ~UIChooseSellBuyWnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -41,7 +41,7 @@ protected: class UIExchangeAcceptWnd : public UIChooseSellBuyWnd { public: - UIExchangeAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIExchangeAcceptWnd(UIAcceptanceContext& acceptance); ~UIExchangeAcceptWnd() override; void Slot15(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -53,7 +53,7 @@ public: class UIJoinPartyAcceptWnd : public UIExchangeAcceptWnd { public: - UIJoinPartyAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIJoinPartyAcceptWnd(UIAcceptanceContext& acceptance); ~UIJoinPartyAcceptWnd() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::vector Slot44() override; @@ -61,33 +61,33 @@ public: class UIAllyGuildAcceptWnd : public UIExchangeAcceptWnd { public: - UIAllyGuildAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIAllyGuildAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; class UIBabyAcceptWnd2 : public UIExchangeAcceptWnd { public: - UIBabyAcceptWnd2(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIBabyAcceptWnd2(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::vector Slot44() override; }; class UIBabyAcceptWnd : public UIExchangeAcceptWnd { public: - UIBabyAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIBabyAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::vector Slot44() override; }; class UICoupleAcceptWnd : public UIExchangeAcceptWnd { public: - UICoupleAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UICoupleAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; class UIJoinFriendAcceptWnd : public UIExchangeAcceptWnd { public: - UIJoinFriendAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIJoinFriendAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::vector Slot44() override; @@ -97,14 +97,14 @@ public: class UIJoinGuildAcceptWnd : public UIExchangeAcceptWnd { public: - UIJoinGuildAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIJoinGuildAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::vector Slot44() override; }; class UIMixAcceptWnd : public UIExchangeAcceptWnd { public: - UIMixAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIMixAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00C0 */ unsigned char m_kind; @@ -112,7 +112,7 @@ public: class UIStarPlaceAcceptWnd : public UIExchangeAcceptWnd { public: - UIStarPlaceAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIStarPlaceAcceptWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::vector Slot44() override; @@ -121,7 +121,7 @@ public: class UIYourItemWnd : public UIExchangeAcceptWnd { public: - UIYourItemWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance); + UIYourItemWnd(UIAcceptanceContext& acceptance); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00C0 */ int m_index; diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp index 73a15c4f..eaac10a1 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp +++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp @@ -70,7 +70,7 @@ template <> AdventureGuide::CUITab* CUIListBox::CreateIt // FUNCTION: fn_13993 // FUNCTION: fn_13994 template void CUIListBox::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { int y = 0; @@ -99,7 +99,7 @@ template void CUIListBox::Slot15(int, int); // FUNCTION: fn_13997 // FUNCTION: fn_13998 template void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -161,7 +161,7 @@ void CUIListBoxEx::ClearItems // OFFSET: 0x009C2D90 // FUNCTION: fn_13999 void CUIAdventureGuide::Slot15(int width, int height) { - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(750, 468); this->background->Move(0, 0); { @@ -175,7 +175,7 @@ void CUIAdventureGuide::Slot15(int width, int height) { } this->AddChild(this->background); - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(750, 17); this->titleBar->Move(0, 0); { @@ -201,7 +201,7 @@ void CUIAdventureGuide::Slot15(int width, int height) { } this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); title->SetText("", 0); @@ -222,7 +222,7 @@ void CUIAdventureGuide::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* menuButton = new CUIImageButton(*this->m_context); + CUIImageButton* menuButton = new CUIImageButton(); menuButton->SetSize(11, 11); menuButton->Move(3, 3); menuButton->SetOnClick([this]() { this->OnButtonClick(); }); @@ -253,7 +253,7 @@ void CUIAdventureGuide::Slot15(int width, int height) { } this->titleBar->AddChild(menuButton); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(736, 3); closeButton->SetOnClick([this]() { this->OnClose(); }); @@ -286,12 +286,12 @@ void CUIAdventureGuide::Slot15(int width, int height) { } this->titleBar->SetSecondButton(closeButton); - this->characterInfo = new AdventureGuide::CUICharacterInfo(*this->m_context); + this->characterInfo = new AdventureGuide::CUICharacterInfo(); this->characterInfo->SetSize(161, 41); this->characterInfo->Move(1, 19); this->AddChild(this->characterInfo); - this->titleText = new CUIStaticText(*this->m_context); + this->titleText = new CUIStaticText(); this->titleText->SetSize(104, 20); this->titleText->Move(362, 28); this->titleText->SetText("", 0); @@ -312,27 +312,27 @@ void CUIAdventureGuide::Slot15(int width, int height) { this->titleText->SetOutline(0, 0xFFFFFF); this->AddChild(this->titleText); - this->intro = new AdventureGuide::CUIIntro(*this->m_context); + this->intro = new AdventureGuide::CUIIntro(); this->intro->SetSize(637, 373); this->intro->Move(112, 63); this->AddChild(this->intro); - this->quest = new AdventureGuide::CUIQuest(*this->m_context); + this->quest = new AdventureGuide::CUIQuest(); this->quest->SetSize(627, 387); this->quest->Move(122, 81); this->AddChild(this->quest); - this->monster = new AdventureGuide::CUIMonster(*this->m_context); + this->monster = new AdventureGuide::CUIMonster(); this->monster->SetSize(627, 387); this->monster->Move(122, 81); this->AddChild(this->monster); - this->item = new AdventureGuide::CUIItem(*this->m_context); + this->item = new AdventureGuide::CUIItem(); this->item->SetSize(627, 387); this->item->Move(122, 81); this->AddChild(this->item); - this->tabs = new CUIListBox(*this->m_context); + this->tabs = new CUIListBox(); this->tabs->SetSize(106, 372); this->tabs->Move(1, 63); this->tabs->SetOnSelect([this](AdventureGuide::CUITab* tab) { this->OnSelectTab(tab); }); @@ -1081,13 +1081,13 @@ namespace AdventureGuide { // OFFSET: 0x009C5400 // FUNCTION: fn_14000 void CUICharacterInfo::Slot15(int width, int height) { - this->jobIcon = new CUIStaticImage(*this->m_context); + this->jobIcon = new CUIStaticImage(); this->jobIcon->SetSize(25, 25); this->jobIcon->Move(10, 8); this->jobIcon->SetImage(std::string()); this->AddChild(this->jobIcon); - this->level = new CUIStaticText(*this->m_context); + this->level = new CUIStaticText(); this->level->SetSize(50, 12); this->level->Move(46, 6); this->level->SetText("", 0); @@ -1104,7 +1104,7 @@ void CUICharacterInfo::Slot15(int width, int height) { this->level->SetOutline(0, 0xFFFFFF); this->AddChild(this->level); - this->jobLevel = new CUIStaticText(*this->m_context); + this->jobLevel = new CUIStaticText(); this->jobLevel->SetSize(50, 12); this->jobLevel->Move(97, 6); this->jobLevel->SetText("", 0); @@ -1121,7 +1121,7 @@ void CUICharacterInfo::Slot15(int width, int height) { this->jobLevel->SetOutline(0, 0xFFFFFF); this->AddChild(this->jobLevel); - this->name = new CUIStaticText(*this->m_context); + this->name = new CUIStaticText(); this->name->SetSize(100, 12); this->name->Move(45, 22); this->name->SetText("", 0); @@ -1142,13 +1142,13 @@ void CUICharacterInfo::Slot15(int width, int height) { // OFFSET: 0x009C8D00 // FUNCTION: fn_14003 void CUIItemInfo::Slot15(int width, int height) { - this->image = new CUIStaticImage(*this->m_context); + this->image = new CUIStaticImage(); this->image->SetSize(75, 100); this->image->Move(45, 14); this->image->SetImage(std::string()); this->AddChild(this->image); - this->nameText = new CUIStaticText(*this->m_context); + this->nameText = new CUIStaticText(); this->nameText->SetSize(280, 12); this->nameText->Move(165, 13); this->nameText->SetText("", 0); @@ -1169,7 +1169,7 @@ void CUIItemInfo::Slot15(int width, int height) { this->nameText->SetOutline(0, 0xFFFFFF); this->AddChild(this->nameText); - CUITextViewer* description = new CUITextViewer(*this->m_context); + CUITextViewer* description = new CUITextViewer(); this->unknown_00F0 = reinterpret_cast(description); description->SetSize(173, 97); description->Move(165, 26); @@ -1236,7 +1236,7 @@ void CUIItemInfo::Slot15(int width, int height) { } this->AddChild(description); - CUITextViewer* options = new CUITextViewer(*this->m_context); + CUITextViewer* options = new CUITextViewer(); this->unknown_00F4 = reinterpret_cast(options); options->SetSize(115, 90); options->Move(338, 26); @@ -1303,7 +1303,7 @@ void CUIItemInfo::Slot15(int width, int height) { } this->AddChild(options); - CUITextViewer* sources = new CUITextViewer(*this->m_context); + CUITextViewer* sources = new CUITextViewer(); this->unknown_00F8 = reinterpret_cast(sources); sources->SetSize(108, 118); sources->Move(480, 5); @@ -1374,7 +1374,7 @@ void CUIItemInfo::Slot15(int width, int height) { // OFFSET: 0x009CC580 // FUNCTION: fn_14005 void CUIMonsterInfo::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(280, 12); this->unknown_00E8->Move(165, 19); this->unknown_00E8->SetText("", 0); @@ -1395,7 +1395,7 @@ void CUIMonsterInfo::Slot15(int width, int height) { this->unknown_00E8->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E8); - this->unknown_00EC = reinterpret_cast(new CUITextViewer(*this->m_context)); + this->unknown_00EC = reinterpret_cast(new CUITextViewer()); reinterpret_cast(this->unknown_00EC)->SetSize(288, 84); reinterpret_cast(this->unknown_00EC)->Move(165, 39); reinterpret_cast(this->unknown_00EC)->SetTextOffset(0, 6); @@ -1465,7 +1465,7 @@ void CUIMonsterInfo::Slot15(int width, int height) { } this->AddChild(this->unknown_00EC); - this->unknown_00F0 = reinterpret_cast(new CUITextViewer(*this->m_context)); + this->unknown_00F0 = reinterpret_cast(new CUITextViewer()); reinterpret_cast(this->unknown_00F0)->SetSize(108, 118); reinterpret_cast(this->unknown_00F0)->Move(480, 5); reinterpret_cast(this->unknown_00F0)->SetTextOffset(0, 6); @@ -1539,7 +1539,7 @@ void CUIMonsterInfo::Slot15(int width, int height) { // OFFSET: 0x009CFAF0 // FUNCTION: fn_14007 void CUIQuestInfo::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticImage(*this->m_context); + this->unknown_00E8 = new CUIStaticImage(); this->unknown_00E8->SetSize(85, 70); this->unknown_00E8->Move(250, 10); { @@ -1554,7 +1554,7 @@ void CUIQuestInfo::Slot15(int width, int height) { } this->AddChild(this->unknown_00E8); - this->unknown_00EC = reinterpret_cast(new CUITextViewer(*this->m_context)); + this->unknown_00EC = reinterpret_cast(new CUITextViewer()); reinterpret_cast(this->unknown_00EC)->SetSize(360, 57); reinterpret_cast(this->unknown_00EC)->Move(25, 13); reinterpret_cast(this->unknown_00EC)->SetTextOffset(0, 0); @@ -1624,7 +1624,7 @@ void CUIQuestInfo::Slot15(int width, int height) { } this->AddChild(this->unknown_00EC); - this->unknown_00F0 = reinterpret_cast(new CUITextViewer(*this->m_context)); + this->unknown_00F0 = reinterpret_cast(new CUITextViewer()); reinterpret_cast(this->unknown_00F0)->SetSize(200, 87); reinterpret_cast(this->unknown_00F0)->Move(400, 5); reinterpret_cast(this->unknown_00F0)->SetTextOffset(0, 6); @@ -1694,7 +1694,7 @@ void CUIQuestInfo::Slot15(int width, int height) { } this->AddChild(this->unknown_00F0); - this->unknown_00F4 = reinterpret_cast(new CUITextViewer(*this->m_context)); + this->unknown_00F4 = reinterpret_cast(new CUITextViewer()); reinterpret_cast(this->unknown_00F4)->SetSize(360, 13); reinterpret_cast(this->unknown_00F4)->Move(25, 73); reinterpret_cast(this->unknown_00F4)->SetTextOffset(0, 0); @@ -1893,7 +1893,7 @@ namespace AdventureGuide { // OFFSET: 0x009C1550 // FUNCTION: fn_13992 CUIListBox* CUITab::CreateSubTabList() { - this->subTabs = new CUIListBox(*this->m_context); + this->subTabs = new CUIListBox(); this->subTabs->SetSize(98, 26); this->subTabs->Move(0, 40); this->subTabs->SetOnSelect([this](CUISubTab* subTab) { this->OnSelectSubTab(subTab); }); @@ -1999,7 +1999,7 @@ CUIAdventureGuide* CreateAdventureGuide() { // FUNCTION: fn_14306 template <> AdventureGuide::CUISubTab* CUIListBox::CreateItem() { - AdventureGuide::CUISubTab* item = new AdventureGuide::CUISubTab(*this->m_context); + AdventureGuide::CUISubTab* item = new AdventureGuide::CUISubTab(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -2023,7 +2023,7 @@ AdventureGuide::CUISubTab* CUIListBox::CreateItem() { // FUNCTION: fn_14307 template <> AdventureGuide::CUITab* CUIListBox::CreateItem() { - AdventureGuide::CUITab* item = new AdventureGuide::CUITab(*this->m_context); + AdventureGuide::CUITab* item = new AdventureGuide::CUITab(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -2141,7 +2141,7 @@ namespace AdventureGuide { // OFFSET: 0x009C5BB0 // FUNCTION: fn_14001 void CUIIntro::Slot15(int width, int height) { - this->banner = new CUIStaticImage(*this->m_context); + this->banner = new CUIStaticImage(); this->banner->SetSize(630, 216); this->banner->Move(0, 0); { @@ -2154,13 +2154,13 @@ void CUIIntro::Slot15(int width, int height) { } this->AddChild(this->banner); - this->image = new CUIStaticImage(*this->m_context); + this->image = new CUIStaticImage(); this->image->SetSize(583, 162); this->image->Move(22, 27); this->image->SetImage(std::string()); this->AddChild(this->image); - this->contents = new CUIListBoxEx(*this->m_context); + this->contents = new CUIListBoxEx(); this->contents->itemWidth = 603; this->contents->rowHeight = 44; this->contents->SetSize(603, 166); @@ -2247,7 +2247,7 @@ void CUIIntro::Slot15(int width, int height) { // OFFSET: 0x009C6F50 // FUNCTION: fn_14002 void CUIItem::Slot15(int width, int height) { - this->itemList = new CUIListBoxEx(*this->m_context); + this->itemList = new CUIListBoxEx(); this->itemList->itemWidth = 603; this->itemList->rowHeight = 128; this->itemList->SetSize(627, 355); @@ -2329,7 +2329,7 @@ void CUIItem::Slot15(int width, int height) { this->itemList->AddNewItem(); this->AddChild(this->itemList); - this->unknown_0084 = new CUIImageButton(*this->m_context); + this->unknown_0084 = new CUIImageButton(); this->unknown_0084->SetSize(62, 20); this->unknown_0084->Move(471, 363); this->unknown_0084->SetOnClick([this]() { this->RequestNavigation(); }); @@ -2363,7 +2363,7 @@ void CUIItem::Slot15(int width, int height) { } this->AddChild(this->unknown_0084); - this->unknown_0088 = new CUIImageButton(*this->m_context); + this->unknown_0088 = new CUIImageButton(); this->unknown_0088->SetSize(62, 20); this->unknown_0088->Move(540, 363); this->unknown_0088->SetOnClick([this]() { this->SearchNavigation(); }); @@ -2402,7 +2402,7 @@ void CUIItem::Slot15(int width, int height) { // OFFSET: 0x009CDD40 // FUNCTION: fn_14006 void CUIQuest::Slot15(int width, int height) { - this->questList = new CUIListBoxEx(*this->m_context); + this->questList = new CUIListBoxEx(); this->questList->itemWidth = 603; this->questList->rowHeight = 97; this->questList->SetSize(627, 355); @@ -2484,7 +2484,7 @@ void CUIQuest::Slot15(int width, int height) { this->questList->AddNewItem(); this->AddChild(this->questList); - this->unknown_0084 = new CUIImageButton(*this->m_context); + this->unknown_0084 = new CUIImageButton(); this->unknown_0084->SetSize(62, 20); this->unknown_0084->Move(471, 363); this->unknown_0084->SetOnClick([this]() { this->RequestNavigation(); }); @@ -2518,7 +2518,7 @@ void CUIQuest::Slot15(int width, int height) { } this->AddChild(this->unknown_0084); - this->unknown_0088 = new CUIImageButton(*this->m_context); + this->unknown_0088 = new CUIImageButton(); this->unknown_0088->SetSize(62, 20); this->unknown_0088->Move(540, 363); this->unknown_0088->SetOnClick([this]() { this->SearchNavigation(); }); @@ -2557,7 +2557,7 @@ void CUIQuest::Slot15(int width, int height) { // OFFSET: 0x009CAE30 // FUNCTION: fn_14004 void CUIMonster::Slot15(int width, int height) { - this->monsterList = new CUIListBoxEx(*this->m_context); + this->monsterList = new CUIListBoxEx(); this->monsterList->itemWidth = 603; this->monsterList->rowHeight = 128; this->monsterList->SetSize(627, 355); @@ -2639,7 +2639,7 @@ void CUIMonster::Slot15(int width, int height) { this->monsterList->AddNewItem(); this->AddChild(this->monsterList); - this->unknown_0084 = new CUIImageButton(*this->m_context); + this->unknown_0084 = new CUIImageButton(); this->unknown_0084->SetSize(62, 20); this->unknown_0084->Move(540, 363); this->unknown_0084->SetOnClick([this]() { this->SearchNavigation(); }); diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.h b/Source/UI/AdventureGuide/UIAdventureGuide.h index d1c07f31..b939ab93 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.h +++ b/Source/UI/AdventureGuide/UIAdventureGuide.h @@ -45,7 +45,7 @@ namespace AdventureGuide { class CUIPage : public CUIControl { public: - explicit CUIPage(UIWindowContext& context) : CUIControl(context) { + explicit CUIPage() : CUIControl() { } virtual void Slot54(int first, int second) = 0; @@ -55,7 +55,7 @@ class CUICharacterInfo : public CUIControl { public: // OFFSET: 0x009D8F50 // FUNCTION: fn_14273 - explicit CUICharacterInfo(UIWindowContext& context) : CUIControl(context), level(nullptr), jobLevel(nullptr), name(nullptr), jobIcon(nullptr) { + explicit CUICharacterInfo() : CUIControl(), level(nullptr), jobLevel(nullptr), name(nullptr), jobIcon(nullptr) { } void Slot15(int width, int height) override; @@ -71,7 +71,7 @@ class CUIIntro : public CUIPage { public: // OFFSET: 0x009D8FE0 // FUNCTION: fn_14274 - explicit CUIIntro(UIWindowContext& context) : CUIPage(context), image(nullptr), contents(nullptr), banner(nullptr) { + explicit CUIIntro() : CUIPage(), image(nullptr), contents(nullptr), banner(nullptr) { } void Slot15(int width, int height) override; @@ -91,8 +91,8 @@ class CUIItem : public CUIPage { public: // OFFSET: 0x009D9080 // FUNCTION: fn_14275 - explicit CUIItem(UIWindowContext& context) - : CUIPage(context), unknown_0084(nullptr), unknown_0088(nullptr), unknown_008C(), location(-1), itemList(nullptr) { + explicit CUIItem() + : CUIPage(), unknown_0084(nullptr), unknown_0088(nullptr), unknown_008C(), location(-1), itemList(nullptr) { } void Slot15(int width, int height) override; @@ -115,7 +115,7 @@ class CUIMonster : public CUIPage { public: // OFFSET: 0x009D9220 // FUNCTION: fn_14277 - explicit CUIMonster(UIWindowContext& context) : CUIPage(context), unknown_0084(nullptr), unknown_0088(), monsterList(nullptr) { + explicit CUIMonster() : CUIPage(), unknown_0084(nullptr), unknown_0088(), monsterList(nullptr) { } void Slot15(int width, int height) override; @@ -136,7 +136,7 @@ class CUIQuest : public CUIPage { public: // OFFSET: 0x009D9360 // FUNCTION: fn_14279 - explicit CUIQuest(UIWindowContext& context) : CUIPage(context), unknown_0084(nullptr), unknown_0088(nullptr), unknown_008C(), questList(nullptr) { + explicit CUIQuest() : CUIPage(), unknown_0084(nullptr), unknown_0088(nullptr), unknown_008C(), questList(nullptr) { } void Slot15(int width, int height) override; diff --git a/Source/UI/Buttons/UIBasicButton.cpp b/Source/UI/Buttons/UIBasicButton.cpp index ae8d5605..31dbcbc1 100644 --- a/Source/UI/Buttons/UIBasicButton.cpp +++ b/Source/UI/Buttons/UIBasicButton.cpp @@ -7,7 +7,7 @@ // OFFSET: 0x0084EA20 // FUNCTION: fn_10649 -UIBasicButton::UIBasicButton(UIWindowContext& windows) : UIButton(windows), invalidateParent(0) { +UIBasicButton::UIBasicButton() : UIButton(), invalidateParent(0) { this->geometry.height = 20; } diff --git a/Source/UI/Buttons/UIBasicButton.h b/Source/UI/Buttons/UIBasicButton.h index 4d3df606..28bee48b 100644 --- a/Source/UI/Buttons/UIBasicButton.h +++ b/Source/UI/Buttons/UIBasicButton.h @@ -6,7 +6,8 @@ class UIBasicButton : public UIButton { public: UIBasicButton(); - UIBasicButton(UIWindowContext& windows); + UIBasicButton(UIWindowContext&) : UIBasicButton() { + } ~UIBasicButton() override; void Paint() override; bool Configure(int width, const char* value); diff --git a/Source/UI/Buttons/UIBitmapButton.cpp b/Source/UI/Buttons/UIBitmapButton.cpp index 7b5bf470..b95f6bb8 100644 --- a/Source/UI/Buttons/UIBitmapButton.cpp +++ b/Source/UI/Buttons/UIBitmapButton.cpp @@ -4,8 +4,8 @@ // OFFSET: 0x0084EAB0 // FUNCTION: fn_10650 -UIBitmapButton::UIBitmapButton(UIWindowContext& windowContext) - : UIButton(windowContext), m_bitmapWidth(0), m_bitmapHeight(0), m_invalidateParent(0) { +UIBitmapButton::UIBitmapButton() + : UIButton(), m_bitmapWidth(0), m_bitmapHeight(0), m_invalidateParent(0) { } // OFFSET: 0x008511B0 diff --git a/Source/UI/Buttons/UIBitmapButton.h b/Source/UI/Buttons/UIBitmapButton.h index 1320f917..4037d89b 100644 --- a/Source/UI/Buttons/UIBitmapButton.h +++ b/Source/UI/Buttons/UIBitmapButton.h @@ -9,7 +9,8 @@ class UIBitmapButton : public UIButton { public: UIBitmapButton(); - UIBitmapButton(UIWindowContext& windowContext); + UIBitmapButton(UIWindowContext&) : UIBitmapButton() { + } ~UIBitmapButton() override; void Paint() override; bool SetBitmap(const char* name, int state, unsigned char exactSize); diff --git a/Source/UI/Buttons/UIBmpRadioBtn.cpp b/Source/UI/Buttons/UIBmpRadioBtn.cpp index 0643a1a9..2b50311e 100644 --- a/Source/UI/Buttons/UIBmpRadioBtn.cpp +++ b/Source/UI/Buttons/UIBmpRadioBtn.cpp @@ -3,7 +3,7 @@ // OFFSET: 0x0086C590 // FUNCTION: fn_11028 -UIBmpRadioBtn::UIBmpRadioBtn(UIWindowContext& windows) : UIWindow(windows, 0) { +UIBmpRadioBtn::UIBmpRadioBtn() : UIWindow(0) { this->geometry.unknown_0030 = 0; this->geometry.id = 215; this->m_hovered = false; @@ -12,8 +12,8 @@ UIBmpRadioBtn::UIBmpRadioBtn(UIWindowContext& windows) : UIWindow(windows, 0) { // OFFSET: 0x0086C720 // FUNCTION: fn_11029 -UICaptchaImage::UICaptchaImage(UIWindowContext& windows, BitmapResourceContext& bitmaps) - : UIWindow(windows, 0), m_bitmap(bitmaps) { +UICaptchaImage::UICaptchaImage(BitmapResourceContext& bitmaps) + : UIWindow(0), m_bitmap(bitmaps) { } // OFFSET: 0x00870390 diff --git a/Source/UI/Buttons/UIBmpRadioBtn.h b/Source/UI/Buttons/UIBmpRadioBtn.h index cc8f411a..e624a2dc 100644 --- a/Source/UI/Buttons/UIBmpRadioBtn.h +++ b/Source/UI/Buttons/UIBmpRadioBtn.h @@ -24,7 +24,7 @@ class UIBmpRadioBtn : public UIWindow { friend class UIRodexInboxWnd; public: - UIBmpRadioBtn(UIWindowContext& windows); + UIBmpRadioBtn(); void Paint() override; void Slot25(int x, int y) override; void Slot28(int x, int y) override; @@ -48,7 +48,7 @@ protected: class UIBmpRadioBtn2 : public UIBmpRadioBtn { public: // INLINED - UIBmpRadioBtn2(UIWindowContext& windows) : UIBmpRadioBtn(windows) { + UIBmpRadioBtn2() : UIBmpRadioBtn() { } void Invalidate() override; void Slot47() override; @@ -58,7 +58,7 @@ public: class UICaptchaImage : public UIWindow { public: UICaptchaImage(); - UICaptchaImage(UIWindowContext& windows, BitmapResourceContext& bitmaps); + UICaptchaImage(BitmapResourceContext& bitmaps); ~UICaptchaImage() override; void Paint() override; void Slot28(int x, int y) override; diff --git a/Source/UI/Buttons/UIBmpTextButton.cpp b/Source/UI/Buttons/UIBmpTextButton.cpp index c3380946..b4c6ac02 100644 --- a/Source/UI/Buttons/UIBmpTextButton.cpp +++ b/Source/UI/Buttons/UIBmpTextButton.cpp @@ -8,7 +8,7 @@ // OFFSET: 0x0084ED30 // FUNCTION: fn_10652 -UIBmpTextButton::UIBmpTextButton(UIWindowContext& windows) : UIBitmapButton(windows) { +UIBmpTextButton::UIBmpTextButton() : UIBitmapButton() { } // OFFSET: 0x00852360 diff --git a/Source/UI/Buttons/UIBmpTextButton.h b/Source/UI/Buttons/UIBmpTextButton.h index 252b4882..3a4a13f1 100644 --- a/Source/UI/Buttons/UIBmpTextButton.h +++ b/Source/UI/Buttons/UIBmpTextButton.h @@ -18,7 +18,6 @@ struct BitmapButtonTextStyle { class UIBmpTextButton : public UIBitmapButton { public: UIBmpTextButton(); - UIBmpTextButton(UIWindowContext& windows); ~UIBmpTextButton() override; void Paint() override; void SetText(std::string value); diff --git a/Source/UI/Buttons/UIBmpTextButton2.cpp b/Source/UI/Buttons/UIBmpTextButton2.cpp index 6ea2aa71..842bfc56 100644 --- a/Source/UI/Buttons/UIBmpTextButton2.cpp +++ b/Source/UI/Buttons/UIBmpTextButton2.cpp @@ -5,7 +5,7 @@ // OFFSET: 0x0084ECB0 // FUNCTION: fn_10651 -UIBmpTextButton2::UIBmpTextButton2(UIWindowContext& windows) : UIBitmapButton(windows) { +UIBmpTextButton2::UIBmpTextButton2() : UIBitmapButton() { } // OFFSET: 0x0085BCF0 diff --git a/Source/UI/Buttons/UIBmpTextButton2.h b/Source/UI/Buttons/UIBmpTextButton2.h index 44250656..0d55b993 100644 --- a/Source/UI/Buttons/UIBmpTextButton2.h +++ b/Source/UI/Buttons/UIBmpTextButton2.h @@ -20,7 +20,7 @@ struct BmpTextButtonLabel { class UIBmpTextButton2 : public UIBitmapButton { public: - UIBmpTextButton2(UIWindowContext& windows); + UIBmpTextButton2(); void Paint() override; void DrawLabels(); diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index b810a987..03d54866 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -16,8 +16,8 @@ // OFFSET: 0x0084EDD0 // FUNCTION: fn_10653 -UIButton::UIButton(UIWindowContext& windowContext) - : UIWindow(windowContext, 0), m_disabled(0), m_argument(0) { +UIButton::UIButton() + : UIWindow(0), m_disabled(0), m_argument(0) { this->geometry.unknown_0030 = 0; } diff --git a/Source/UI/Buttons/UIButton.h b/Source/UI/Buttons/UIButton.h index 1e2219be..bfdf62db 100644 --- a/Source/UI/Buttons/UIButton.h +++ b/Source/UI/Buttons/UIButton.h @@ -31,7 +31,8 @@ class UIButton : public UIWindow { public: UIButton(); - UIButton(UIWindowContext& windowContext); + UIButton(UIWindowContext&) : UIButton() { + } ~UIButton() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UICashEmotionSprBtn.h b/Source/UI/Buttons/UICashEmotionSprBtn.h index e7ad520e..37a512b7 100644 --- a/Source/UI/Buttons/UICashEmotionSprBtn.h +++ b/Source/UI/Buttons/UICashEmotionSprBtn.h @@ -7,7 +7,7 @@ class UICashEmotionSprBtn : public UISpriteButton2 { friend class UICashEmotionPiece; public: - UICashEmotionSprBtn(UIWindowContext& windowContext, UIWindow* target); + UICashEmotionSprBtn(UIWindow* target); void Paint() override; void Slot28(int x, int y) override; diff --git a/Source/UI/Buttons/UICheckBox.cpp b/Source/UI/Buttons/UICheckBox.cpp index 4ebb69de..b3d6be1c 100644 --- a/Source/UI/Buttons/UICheckBox.cpp +++ b/Source/UI/Buttons/UICheckBox.cpp @@ -11,8 +11,8 @@ // OFFSET: 0x0084F010 // FUNCTION: fn_10656 -UICheckBox::UICheckBox(UIWindowContext& windowContext) - : UIWindow(windowContext, 0), m_disabled(0), m_hidden(0), m_color(0), m_fontHeight(12), m_message(-1), m_notify(0) { +UICheckBox::UICheckBox() + : UIWindow(0), m_disabled(0), m_hidden(0), m_color(0), m_fontHeight(12), m_message(-1), m_notify(0) { this->geometry.unknown_0030 = 0; this->geometry.id = 213; } diff --git a/Source/UI/Buttons/UICheckBox.h b/Source/UI/Buttons/UICheckBox.h index 8c1c40aa..be9b32cf 100644 --- a/Source/UI/Buttons/UICheckBox.h +++ b/Source/UI/Buttons/UICheckBox.h @@ -15,7 +15,8 @@ class UICheckBox : public UIWindow { public: UICheckBox(); - UICheckBox(UIWindowContext& windowContext); + UICheckBox(UIWindowContext&) : UICheckBox() { + } ~UICheckBox() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UIItemMoveInfo.cpp b/Source/UI/Buttons/UIItemMoveInfo.cpp index bbe30ad5..1b713fd2 100644 --- a/Source/UI/Buttons/UIItemMoveInfo.cpp +++ b/Source/UI/Buttons/UIItemMoveInfo.cpp @@ -2,6 +2,6 @@ // OFFSET: 0x0086D4D0 // FUNCTION: fn_11046 -UIItemMoveInfo::UIItemMoveInfo(UIWindowContext& windows) - : UITextButton(windows), m_item() { +UIItemMoveInfo::UIItemMoveInfo() + : UITextButton(), m_item() { } diff --git a/Source/UI/Buttons/UIItemMoveInfo.h b/Source/UI/Buttons/UIItemMoveInfo.h index 902f2550..737c30a7 100644 --- a/Source/UI/Buttons/UIItemMoveInfo.h +++ b/Source/UI/Buttons/UIItemMoveInfo.h @@ -8,7 +8,7 @@ class UIItemMoveInfo : public UITextButton { friend class UIItemCollectionWnd; public: - UIItemMoveInfo(UIWindowContext& windows); + UIItemMoveInfo(); void Paint() override; void Slot28(int x, int y) override; void Slot48() override; diff --git a/Source/UI/Buttons/UIItemTagButton.h b/Source/UI/Buttons/UIItemTagButton.h index 28c636f4..24ff1be7 100644 --- a/Source/UI/Buttons/UIItemTagButton.h +++ b/Source/UI/Buttons/UIItemTagButton.h @@ -11,7 +11,6 @@ class UIItemTagButton : public UITextButton { public: UIItemTagButton(); - UIItemTagButton(UIWindowContext& windows); void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UIJobSlotButton.cpp b/Source/UI/Buttons/UIJobSlotButton.cpp index 44d45454..be561101 100644 --- a/Source/UI/Buttons/UIJobSlotButton.cpp +++ b/Source/UI/Buttons/UIJobSlotButton.cpp @@ -2,7 +2,7 @@ // OFFSET: 0x007BAD70 // FUNCTION: fn_09276 -UIJobSlotButton::UIJobSlotButton(UIWindowContext& windows) : UIBitmapButton(windows), selected(0) { +UIJobSlotButton::UIJobSlotButton() : UIBitmapButton(), selected(0) { } // OFFSET: 0x007BB6B0 diff --git a/Source/UI/Buttons/UIJobSlotButton.h b/Source/UI/Buttons/UIJobSlotButton.h index f3c57ab9..2c2f0ac1 100644 --- a/Source/UI/Buttons/UIJobSlotButton.h +++ b/Source/UI/Buttons/UIJobSlotButton.h @@ -5,7 +5,7 @@ class UIJobSlotButton : public UIBitmapButton { public: - UIJobSlotButton(UIWindowContext& windows); + UIJobSlotButton(); ~UIJobSlotButton() override; void Slot31(int x, int y) override; void SetSelected(unsigned char value); diff --git a/Source/UI/Buttons/UINaviLinkButton.cpp b/Source/UI/Buttons/UINaviLinkButton.cpp index 6d41c596..166b1553 100644 --- a/Source/UI/Buttons/UINaviLinkButton.cpp +++ b/Source/UI/Buttons/UINaviLinkButton.cpp @@ -4,7 +4,7 @@ // OFFSET: 0x0086DF60 // FUNCTION: fn_11062 -UINaviLinkButton::UINaviLinkButton(UIWindowContext& windows) : UITextButton(windows) { +UINaviLinkButton::UINaviLinkButton() : UITextButton() { } // OFFSET: 0x00873A90 diff --git a/Source/UI/Buttons/UINaviLinkButton.h b/Source/UI/Buttons/UINaviLinkButton.h index aa7be5d2..79875e0c 100644 --- a/Source/UI/Buttons/UINaviLinkButton.h +++ b/Source/UI/Buttons/UINaviLinkButton.h @@ -5,7 +5,7 @@ class UINaviLinkButton : public UITextButton { public: - UINaviLinkButton(UIWindowContext& windows); + UINaviLinkButton(); ~UINaviLinkButton() override; void Slot25(int x, int y) override; std::string Link(); diff --git a/Source/UI/Buttons/UINoneVisibleButton.cpp b/Source/UI/Buttons/UINoneVisibleButton.cpp index 469c0f14..62a65267 100644 --- a/Source/UI/Buttons/UINoneVisibleButton.cpp +++ b/Source/UI/Buttons/UINoneVisibleButton.cpp @@ -8,5 +8,5 @@ void UINoneVisibleButton::Paint() { // OFFSET: 0x0084FF80 // FUNCTION: fn_10669 -UINoneVisibleButton::UINoneVisibleButton(UIWindowContext& windowContext) : UIButton(windowContext) { +UINoneVisibleButton::UINoneVisibleButton() : UIButton() { } diff --git a/Source/UI/Buttons/UINoneVisibleButton.h b/Source/UI/Buttons/UINoneVisibleButton.h index 1639ca0f..8ac93b70 100644 --- a/Source/UI/Buttons/UINoneVisibleButton.h +++ b/Source/UI/Buttons/UINoneVisibleButton.h @@ -5,7 +5,7 @@ class UINoneVisibleButton : public UIButton { public: - UINoneVisibleButton(UIWindowContext& windowContext); + UINoneVisibleButton(); void Paint() override; }; diff --git a/Source/UI/Buttons/UIRadioBtn.cpp b/Source/UI/Buttons/UIRadioBtn.cpp index d91dc1dc..9d00b11e 100644 --- a/Source/UI/Buttons/UIRadioBtn.cpp +++ b/Source/UI/Buttons/UIRadioBtn.cpp @@ -87,7 +87,7 @@ void UIRadioBtn::SetText(const char* value) { // OFFSET: 0x0084FFE0 // FUNCTION: fn_10670 -UIRadioBtn::UIRadioBtn(UIWindowContext& windows) : UIWindow(windows, 0) { +UIRadioBtn::UIRadioBtn() : UIWindow(0) { this->geometry.unknown_0030 = 0; this->enabled = 1; this->geometry.id = 215; diff --git a/Source/UI/Buttons/UIRadioBtn.h b/Source/UI/Buttons/UIRadioBtn.h index 5b359afc..cc110f74 100644 --- a/Source/UI/Buttons/UIRadioBtn.h +++ b/Source/UI/Buttons/UIRadioBtn.h @@ -9,7 +9,7 @@ class UIRadioBtn : public UIWindow { public: - UIRadioBtn(UIWindowContext& windows); + UIRadioBtn(); ~UIRadioBtn() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UIRadioButton.h b/Source/UI/Buttons/UIRadioButton.h index b17df51a..e705f45f 100644 --- a/Source/UI/Buttons/UIRadioButton.h +++ b/Source/UI/Buttons/UIRadioButton.h @@ -11,7 +11,7 @@ public: /* 0120 */ bool checked; /* 0128 */ std::function onCheck; - explicit CUICheckBox(UIWindowContext& context); + CUICheckBox(); void SetOnCheck(std::function callback); void Paint() override; @@ -23,7 +23,7 @@ class CUIRadioButton : public CUICheckBox { public: /* 0150 */ std::function onSelect; - explicit CUIRadioButton(UIWindowContext& context); + CUIRadioButton(); void SetOnSelect(std::function callback); void Slot25(int x, int y) override; }; diff --git a/Source/UI/Buttons/UIReplayButton.h b/Source/UI/Buttons/UIReplayButton.h index cc46d886..1e277a28 100644 --- a/Source/UI/Buttons/UIReplayButton.h +++ b/Source/UI/Buttons/UIReplayButton.h @@ -5,7 +5,7 @@ class UIReplayButton : public UIBitmapButton { public: - UIReplayButton(UIWindowContext& windows); + UIReplayButton(); void Slot31(int x, int y) override; }; diff --git a/Source/UI/Buttons/UISlotBmpButton.cpp b/Source/UI/Buttons/UISlotBmpButton.cpp index 54f124fa..3f3afe66 100644 --- a/Source/UI/Buttons/UISlotBmpButton.cpp +++ b/Source/UI/Buttons/UISlotBmpButton.cpp @@ -2,7 +2,7 @@ // OFFSET: 0x0086E8D0 // FUNCTION: fn_11078 -UISlotBmpButton::UISlotBmpButton(UIWindowContext& windows, int index, bool) - : UIBitmapButton(windows), m_index(index), unknown_0124(false), unknown_0128(0), m_slot(-1), icon(nullptr), unknown_0134(0), unknown_0136(5), +UISlotBmpButton::UISlotBmpButton(int index, bool) + : UIBitmapButton(), m_index(index), unknown_0124(false), unknown_0128(0), m_slot(-1), icon(nullptr), unknown_0134(0), unknown_0136(5), m_inRange(false) { } diff --git a/Source/UI/Buttons/UISlotBmpButton.h b/Source/UI/Buttons/UISlotBmpButton.h index 88aeeb6a..5667f699 100644 --- a/Source/UI/Buttons/UISlotBmpButton.h +++ b/Source/UI/Buttons/UISlotBmpButton.h @@ -9,7 +9,7 @@ class UISlotBmpButton : public UIBitmapButton { friend class UINewSelectCharWnd; public: - UISlotBmpButton(UIWindowContext& windows, int index, bool); + UISlotBmpButton(int index, bool); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Buttons/UISpriteButton.h b/Source/UI/Buttons/UISpriteButton.h index 8393242f..33898200 100644 --- a/Source/UI/Buttons/UISpriteButton.h +++ b/Source/UI/Buttons/UISpriteButton.h @@ -8,7 +8,8 @@ class UISpriteButton : public UIButton { public: UISpriteButton(); - UISpriteButton(UIWindowContext& windowContext); + UISpriteButton(UIWindowContext&) : UISpriteButton() { + } ~UISpriteButton() override; void Paint() override; void Slot25(int x, int y) override; @@ -47,7 +48,7 @@ public: class UISpriteButton2 : public UISpriteButton { public: - UISpriteButton2(UIWindowContext& windowContext, UIWindow* target); + UISpriteButton2(UIWindow* target); ~UISpriteButton2() override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; diff --git a/Source/UI/Buttons/UITVBitmapButton.h b/Source/UI/Buttons/UITVBitmapButton.h index 3189c6c5..715d06bb 100644 --- a/Source/UI/Buttons/UITVBitmapButton.h +++ b/Source/UI/Buttons/UITVBitmapButton.h @@ -8,9 +8,6 @@ class UITVBitmapButton : public UIBitmapButton { public: UITVBitmapButton(); - // INLINED - UITVBitmapButton(UIWindowContext& windowContext) : UIBitmapButton(windowContext), m_value(0) { - } void Slot31(int x, int y) override; void Slot32(int x, int y) override; void Slot33(int x, int y) override; diff --git a/Source/UI/Buttons/UITVTextButton.h b/Source/UI/Buttons/UITVTextButton.h index aef5d25e..a4ef1ba4 100644 --- a/Source/UI/Buttons/UITVTextButton.h +++ b/Source/UI/Buttons/UITVTextButton.h @@ -11,11 +11,6 @@ class UITVTextButton : public UIButton { public: UITVTextButton(); - // INLINED - UITVTextButton(UIWindowContext& windowContext) - : UIButton(windowContext), unknown_00B4(0), unknown_00B5(0), unknown_00B6(0), m_border(0), m_fill(0), m_fillColor(0xFFFFFF), - m_textColor(0), m_outlineColor(0xFFFFFF), m_highlightColor(0), m_outlined(0), m_fontHeight(12), m_fontFamily(0), m_value(0) { - } void Paint() override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; diff --git a/Source/UI/Buttons/UITagButton.cpp b/Source/UI/Buttons/UITagButton.cpp index d91a9c5d..8b8afc9b 100644 --- a/Source/UI/Buttons/UITagButton.cpp +++ b/Source/UI/Buttons/UITagButton.cpp @@ -9,7 +9,7 @@ std::string g_emptyString; // OFFSET: 0x009B52E0 // FUNCTION: fn_13842 -UITagButton::UITagButton(UIWindowContext& windows) : UITextButton(windows), item(), m_strings() { +UITagButton::UITagButton() : UITextButton(), item(), m_strings() { } // OFFSET: 0x009B54A0 diff --git a/Source/UI/Buttons/UITagButton.h b/Source/UI/Buttons/UITagButton.h index 3df7a7b5..0a61d0ce 100644 --- a/Source/UI/Buttons/UITagButton.h +++ b/Source/UI/Buttons/UITagButton.h @@ -12,7 +12,7 @@ class UITagButton : public UITextButton { friend class UITagListBox; public: - UITagButton(UIWindowContext& windows); + UITagButton(); /* 00F8 */ ITEM_INFO item; /* 01F0 */ std::vector m_strings; diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index f0316fda..735c74eb 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -63,7 +63,7 @@ int g_screenHeight; // OFFSET: 0x0086EEB0 // FUNCTION: fn_11085 -UITextButton::UITextButton(UIWindowContext& windows) : UIButton(windows), m_outlineColor(0xFFFFFF), m_value(0) { +UITextButton::UITextButton() : UIButton(), m_outlineColor(0xFFFFFF), m_value(0) { } // OFFSET: 0x00874690 @@ -583,7 +583,7 @@ void UIListBox::Slot28(int x, int y) { hover = nullptr; } - UIColorTransBalloonText* balloon = new UIColorTransBalloonText(*this->m_context); + UIColorTransBalloonText* balloon = new UIColorTransBalloonText(); hover = balloon; balloon->SetSize(8, 8); @@ -1064,7 +1064,7 @@ void UIString::ResetCursor(int, int) { // OFFSET: 0x0086EA50 // FUNCTION: fn_11080 -UIString::UIString(UIWindowContext& windows) : UIWindow(windows, 0), unknown_0080(1), unknown_009C(0), unknown_00A0(0), unknown_00A4(0) { +UIString::UIString() : UIWindow(0), unknown_0080(1), unknown_009C(0), unknown_00A0(0), unknown_00A4(0) { this->unknown_0084.clear(); this->unknown_00AC.clear(); this->unknown_00C4.clear(); @@ -2175,7 +2175,7 @@ void TableBox::Slot15(int, int) { // OFFSET: 0x00884DE0 // FUNCTION: fn_11314 void UIChatHisBox2::Slot15(int width, int height) { - auto* vertical = new UIScrollBar(*this->m_context); + auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -2185,7 +2185,7 @@ void UIChatHisBox2::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(this->verticalBar); - auto* horizontal = new UIScrollBar2(*this->m_context); + auto* horizontal = new UIScrollBar2(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; @@ -2199,7 +2199,7 @@ void UIChatHisBox2::Slot15(int width, int height) { // OFFSET: 0x00884F40 // FUNCTION: fn_11315 void UIChatHisBox3::Slot15(int width, int height) { - auto* vertical = new UIScrollBar3(*this->m_context); + auto* vertical = new UIScrollBar3(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -2209,7 +2209,7 @@ void UIChatHisBox3::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(this->verticalBar); - auto* horizontal = new UIScrollBar3(*this->m_context); + auto* horizontal = new UIScrollBar3(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; @@ -2223,7 +2223,7 @@ void UIChatHisBox3::Slot15(int width, int height) { // OFFSET: 0x008850C0 // FUNCTION: fn_11316 void UIChatHisBox::Slot15(int width, int height) { - auto* vertical = new UIScrollBar2(*this->m_context); + auto* vertical = new UIScrollBar2(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -2233,7 +2233,7 @@ void UIChatHisBox::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(this->verticalBar); - auto* horizontal = new UIScrollBar2(*this->m_context); + auto* horizontal = new UIScrollBar2(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; @@ -2487,7 +2487,7 @@ void UIPackageBoxNameList::Slot25(int x, int y) { // OFFSET: 0x00886AE0 // FUNCTION: fn_11328 void UIListBoxID::Slot15(int width, int height) { - auto* vertical = new UIScrollBar(*this->m_context); + auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -2497,7 +2497,7 @@ void UIListBoxID::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(this->verticalBar); - auto* horizontal = new UIScrollBar(*this->m_context); + auto* horizontal = new UIScrollBar(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; @@ -2516,7 +2516,7 @@ void UITableBox::Slot15(int, int) { // OFFSET: 0x008872B0 // FUNCTION: fn_11335 void UITreeView::Slot15(int width, int height) { - auto* vertical = new UIScrollBar3(*this->m_context); + auto* vertical = new UIScrollBar3(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -2526,7 +2526,7 @@ void UITreeView::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(this->verticalBar); - this->edit = new UIEditCtrl2(*this->m_context); + this->edit = new UIEditCtrl2(); this->edit->SetSize(100, 19); this->edit->Move(-100, -100); this->AddChild(this->edit); @@ -2549,7 +2549,7 @@ void UISlotBmpButton::Slot15(int, int) { const std::string path = "유저인터페이스\\renewalparty\\"; char name[256]; std::sprintf(name, "%sicon_jobs_%d.bmp", path.c_str(), 0); - this->icon = new UIStaticBitmap(*this->m_context); + this->icon = new UIStaticBitmap(); this->icon->SetBitmap(name); this->icon->SetSize(this->icon->geometry.width, this->icon->geometry.height); this->icon->Move(118, 14); @@ -2571,7 +2571,6 @@ int UIListBoxNavi::LineOffset() { // OFFSET: 0x0088AB70 // FUNCTION: fn_11356 void UIComboBoxV2Wnd::Paint() { - UIWindowContext& context = *this->m_context; this->ClearSurface(0xFFFF00FF); if (!this->text.empty()) { @@ -2627,7 +2626,7 @@ void UITreeView::AddNodeButtons(UITreeNode* node, int id) { std::string path = "유저인터페이스\\basic_interface\\"; for (int index = 0; index < 2; ++index) { - UITVBitmapButton* button = new UITVBitmapButton(*this->m_context); + UITVBitmapButton* button = new UITVBitmapButton(); button->SetBitmap((path + names[index]).c_str(), 0, 0); button->SetBitmap((path + names[index]).c_str(), 1, 0); button->SetBitmap((path + names[index]).c_str(), 2, 0); @@ -2652,7 +2651,7 @@ void UITreeView::AddNodeButtons(UITreeNode* node, int id) { // OFFSET: 0x008814C0 // FUNCTION: fn_11297 void UITreeView::AddNodeLabel(UITreeNode* node, int id) { - UITVTextButton* button = new UITVTextButton(*this->m_context); + UITVTextButton* button = new UITVTextButton(); button->SetSize(1, 1); button->SetLabel(node->name); button->ResizeToText(); @@ -2745,7 +2744,6 @@ void UINewComboBoxCtrl::Paint() { // OFFSET: 0x0088EB70 // FUNCTION: fn_11384 void UIShowAndEditTimeCtrl::Paint() { - UIWindowContext& context = *this->m_context; this->ClearSurface(0xFFFF00FF); this->DrawTextAt(22, 3, "m", 0, 0, 12, 0, 0, 0); this->DrawTextAt(60, 3, "s", 0, 0, 12, 0, 0, 0); @@ -3407,7 +3405,7 @@ void UIRPImageWnd::Paint() { // OFFSET: 0x0086EBB0 // FUNCTION: fn_11081 UITVBitmapButton::UITVBitmapButton() - : UIBitmapButton(*reinterpret_cast(nullptr)), m_value(0) { + : UIBitmapButton(), m_value(0) { } // OFFSET: 0x0086EC10 @@ -3433,7 +3431,7 @@ UITVTextButton::UITVTextButton() : UIButton() { // OFFSET: 0x0086DE10 // FUNCTION: fn_11060 -UIMemberListBox::UIMemberListBox(UIWindowContext& windows) : UIChatHisBox2(windows) { +UIMemberListBox::UIMemberListBox() : UIChatHisBox2() { this->backgroundRed = 255; this->backgroundGreen = 255; this->backgroundBlue = 255; diff --git a/Source/UI/Buttons/UITextButton.h b/Source/UI/Buttons/UITextButton.h index c5cee0a4..5d1a137a 100644 --- a/Source/UI/Buttons/UITextButton.h +++ b/Source/UI/Buttons/UITextButton.h @@ -31,7 +31,8 @@ public: friend void OpenTextButtonNavigation(UITextButton* button); UITextButton(); - UITextButton(UIWindowContext& windows); + UITextButton(UIWindowContext&) : UITextButton() { + } ~UITextButton() override; void Paint() override; void Slot27(int x, int y) override; diff --git a/Source/UI/CashEmotion/UICashEmotionPack.h b/Source/UI/CashEmotion/UICashEmotionPack.h index 977a6e33..f6ce81d0 100644 --- a/Source/UI/CashEmotion/UICashEmotionPack.h +++ b/Source/UI/CashEmotion/UICashEmotionPack.h @@ -17,7 +17,7 @@ class UICashEmotionPack : public UIWindow { friend class UICashEmotionListChildWnd_UnPurchased; public: - explicit UICashEmotionPack(UIWindowContext& windows); + UICashEmotionPack(); ~UICashEmotionPack() override; void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/CashEmotion/UICashEmotionPiece.h b/Source/UI/CashEmotion/UICashEmotionPiece.h index 95bf373c..1e42620d 100644 --- a/Source/UI/CashEmotion/UICashEmotionPiece.h +++ b/Source/UI/CashEmotion/UICashEmotionPiece.h @@ -9,8 +9,7 @@ class UICashEmotionSprBtn; class UICashEmotionPiece : public UIWindow { public: - UICashEmotionPiece(); - __declspec(noinline) UICashEmotionPiece(UIWindowContext& windows); + __declspec(noinline) UICashEmotionPiece(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp index 33b7f3ce..df4c62f9 100644 --- a/Source/UI/CashShop/UICashShopWnd.cpp +++ b/Source/UI/CashShop/UICashShopWnd.cpp @@ -109,26 +109,26 @@ struct CashShopReplaceCartItemText { // OFFSET: 0x007CD5F0 // FUNCTION: fn_09511 -UICashShopWnd::UICashShopWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_banner(nullptr), m_secondBanner(nullptr), m_selectedTab(0), m_itemsPerPage(9), m_columns(3), m_page(0), +UICashShopWnd::UICashShopWnd() + : UIFrameWnd(0), m_banner(nullptr), m_secondBanner(nullptr), m_selectedTab(0), m_itemsPerPage(9), m_columns(3), m_page(0), m_pageCount(0), unknown_00E0(nullptr), unknown_00E8(0), unknown_00EC(0), unknown_00F0(0), unknown_00F4(nullptr), m_cart(nullptr) { } // OFFSET: 0x007CD750 // FUNCTION: fn_09512 -UICashShopWnd_Banner::UICashShopWnd_Banner(UIWindowContext& windows) - : UIWindow(windows, 0), m_index(0), m_lastTick(timeGetTime()) { +UICashShopWnd_Banner::UICashShopWnd_Banner() + : UIWindow(0), m_index(0), m_lastTick(timeGetTime()) { } // OFFSET: 0x007CD800 // FUNCTION: fn_09513 -UICashShopWnd_Cart::UICashShopWnd_Cart(UIWindowContext& windows) - : UIWindow(windows, 0), m_scrollBar(nullptr), m_visibleCount(6), m_scrollIndex(0) { +UICashShopWnd_Cart::UICashShopWnd_Cart() + : UIWindow(0), m_scrollBar(nullptr), m_visibleCount(6), m_scrollIndex(0) { } // OFFSET: 0x007CD8C0 // FUNCTION: fn_09514 -UICashShopWnd_CartItem::UICashShopWnd_CartItem(UIWindowContext& windows) : UIWindow(windows, 0) { +UICashShopWnd_CartItem::UICashShopWnd_CartItem() : UIWindow(0) { } // OFFSET: 0x007CDE30 @@ -240,12 +240,12 @@ void UICashShopWnd::Slot15(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_banner = new UICashShopWnd_Banner(*this->m_context); + this->m_banner = new UICashShopWnd_Banner(); this->m_banner->SetSize(0x213, 0x33); this->m_banner->Move(3, 0x12); this->AddChild(this->m_banner); if (g_session.unknown_5912) { - this->m_secondBanner = new UICashShopWnd_Banner(*this->m_context); + this->m_secondBanner = new UICashShopWnd_Banner(); this->m_secondBanner->SetSize(0xB0, 0x38); this->m_secondBanner->Move(0x21A, 0x1A9); this->AddChild(this->m_secondBanner); @@ -256,7 +256,7 @@ void UICashShopWnd::Slot15(int, int) { const int tooltips[11] = {0xCDA, 0xCDB, 0xCDC, 0xCDD, 0xCDE, 0xCDF, 0xCE0, 0xCE1, 0xCE2, 0xE48, 0xECE}; UIBmpRadioBtn* button = nullptr; if (tab != 8 && tab != 10) { - button = new UIBmpRadioBtn(*this->m_context); + button = new UIBmpRadioBtn(); button->SetBitmap(FormatOwnedString("유저인터페이스\\cashshop\\img_shop_tap%d_off.bmp", tab).c_str(), 0); button->SetBitmap(FormatOwnedString("유저인터페이스\\cashshop\\img_shop_tap%d_off.bmp", tab).c_str(), 1); button->SetBitmap(FormatOwnedString("유저인터페이스\\cashshop\\img_shop_tap%d_on.bmp", tab).c_str(), 2); @@ -271,7 +271,7 @@ void UICashShopWnd::Slot15(int, int) { this->m_tabButtons.insert(std::make_pair(tab, button)); } - UIBitmapButton* previous = new UIBitmapButton(*this->m_context); + UIBitmapButton* previous = new UIBitmapButton(); previous->SetBitmap("유저인터페이스\\cashshop\\bt_arrowL_off.bmp", 0, 0); previous->SetBitmap("유저인터페이스\\cashshop\\bt_arrowL_off.bmp", 1, 0); previous->SetBitmap("유저인터페이스\\cashshop\\bt_arrowL_on.bmp", 2, 0); @@ -280,7 +280,7 @@ void UICashShopWnd::Slot15(int, int) { previous->SetId(0x13C); this->AddChild(previous); - UIBitmapButton* next = new UIBitmapButton(*this->m_context); + UIBitmapButton* next = new UIBitmapButton(); next->SetBitmap("유저인터페이스\\cashshop\\bt_arrowR_off.bmp", 0, 0); next->SetBitmap("유저인터페이스\\cashshop\\bt_arrowR_off.bmp", 1, 0); next->SetBitmap("유저인터페이스\\cashshop\\bt_arrowR_on.bmp", 2, 0); @@ -289,7 +289,7 @@ void UICashShopWnd::Slot15(int, int) { next->SetId(0x13D); this->AddChild(next); - UIBitmapButton* first = new UIBitmapButton(*this->m_context); + UIBitmapButton* first = new UIBitmapButton(); first->SetBitmap("유저인터페이스\\cashshop\\bt_arrowL2_off.bmp", 0, 0); first->SetBitmap("유저인터페이스\\cashshop\\bt_arrowL2_off.bmp", 1, 0); first->SetBitmap("유저인터페이스\\cashshop\\bt_arrowL2_on.bmp", 2, 0); @@ -298,7 +298,7 @@ void UICashShopWnd::Slot15(int, int) { first->SetId(0x183); this->AddChild(first); - UIBitmapButton* last = new UIBitmapButton(*this->m_context); + UIBitmapButton* last = new UIBitmapButton(); last->SetBitmap("유저인터페이스\\cashshop\\bt_arrowR2_off.bmp", 0, 0); last->SetBitmap("유저인터페이스\\cashshop\\bt_arrowR2_off.bmp", 1, 0); last->SetBitmap("유저인터페이스\\cashshop\\bt_arrowR2_on.bmp", 2, 0); @@ -307,7 +307,7 @@ void UICashShopWnd::Slot15(int, int) { last->SetId(0x184); this->AddChild(last); - UIBmpTextButton* charge = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* charge = new UIBmpTextButton(); charge->SetBitmap("유저인터페이스\\cashshop\\btn_charge_normal.bmp", 0, 0); charge->SetBitmap("유저인터페이스\\cashshop\\btn_charge_press.bmp", 1, 0); charge->SetBitmap("유저인터페이스\\cashshop\\btn_charge_press.bmp", 2, 0); @@ -317,7 +317,7 @@ void UICashShopWnd::Slot15(int, int) { charge->SetId(0x11C); this->AddChild(charge); - this->unknown_00E4 = new UIBmpTextButton(*this->m_context); + this->unknown_00E4 = new UIBmpTextButton(); this->unknown_00E4->SetBitmap("유저인터페이스\\cashshop\\btn_refresh_normal.bmp", 0, 0); this->unknown_00E4->SetBitmap("유저인터페이스\\cashshop\\btn_refresh_press.bmp", 1, 0); this->unknown_00E4->SetBitmap("유저인터페이스\\cashshop\\btn_refresh_press.bmp", 2, 0); @@ -327,7 +327,7 @@ void UICashShopWnd::Slot15(int, int) { this->unknown_00E4->SetId(0x19F); this->AddChild(this->unknown_00E4); - this->unknown_00E0 = new UIEditCtrl(*this->m_context); + this->unknown_00E0 = new UIEditCtrl(); this->unknown_00E0->SetSize(0x123, 0xE); this->unknown_00E0->Move(0x5E, 0x206); this->unknown_00E0->preserveInput = 1; @@ -335,7 +335,7 @@ void UICashShopWnd::Slot15(int, int) { this->unknown_00E0->TextColor(0xB1B1B1, 0xFFFFFFFFu); this->AddChild(this->unknown_00E0); - UIBitmapButton* search = new UIBitmapButton(*this->m_context); + UIBitmapButton* search = new UIBitmapButton(); search->SetBitmap("유저인터페이스\\cashshop\\btn_searchbar_normal.bmp", 0, 0); search->SetBitmap("유저인터페이스\\cashshop\\btn_searchbar_over.bmp", 1, 0); search->SetBitmap("유저인터페이스\\cashshop\\btn_searchbar_press.bmp", 2, 0); @@ -344,7 +344,7 @@ void UICashShopWnd::Slot15(int, int) { search->SetId(0x141); this->AddChild(search); - UIBmpTextButton* buy = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* buy = new UIBmpTextButton(); buy->SetBitmap("유저인터페이스\\cashshop\\btn_buy_normal.bmp", 0, 0); buy->SetBitmap("유저인터페이스\\cashshop\\btn_buy_press.bmp", 1, 0); buy->SetBitmap("유저인터페이스\\cashshop\\btn_buy_press.bmp", 2, 0); @@ -354,7 +354,7 @@ void UICashShopWnd::Slot15(int, int) { buy->SetId(0xE0); this->AddChild(buy); - this->unknown_00F4 = new UIEditCtrl_Custom(*this->m_context); + this->unknown_00F4 = new UIEditCtrl_Custom(); this->unknown_00F4->SetSize(0x3E, 0xE); this->unknown_00F4->Move(0x27C, 0x1C0); this->unknown_00F4->unknown_0128 = 1; @@ -364,7 +364,7 @@ void UICashShopWnd::Slot15(int, int) { this->AddChild(this->unknown_00F4); for (int index = 0; index < this->m_itemsPerPage; ++index) { - UICashShopWnd_Item* item = new UICashShopWnd_Item(*this->m_context); + UICashShopWnd_Item* item = new UICashShopWnd_Item(); item->SetSize(0xAC, 0x7E); item->Move(index % this->m_columns * 0xAF + 8, index / this->m_columns * 0x7F + 0x6B); item->Show(0); @@ -372,7 +372,7 @@ void UICashShopWnd::Slot15(int, int) { this->m_itemWindows.push_back(item); } - this->m_cart = new UICashShopWnd_Cart(*this->m_context); + this->m_cart = new UICashShopWnd_Cart(); this->m_cart->SetSize(0xB9, 0x15E); this->m_cart->Move(0x219, 0x48); this->AddChild(this->m_cart); @@ -389,7 +389,7 @@ void UICashShopWnd::Slot15(int, int) { // OFFSET: 0x007CF760 // FUNCTION: fn_09536 void UICashShopWnd_Cart::Slot15(int, int) { - this->m_scrollBar = new UIScrollBar_Custom(*this->m_context); + this->m_scrollBar = new UIScrollBar_Custom(); this->m_scrollBar->Configure(this->geometry.width - 7, 0, this->geometry.height, 1, 7, 7); this->m_scrollBar->SetArrowBitmaps("유저인터페이스\\cashshop\\shop_scroll_up.bmp", "유저인터페이스\\cashshop\\shop_scroll_down.bmp"); this->m_scrollBar->SetThumbBitmaps( @@ -399,7 +399,7 @@ void UICashShopWnd_Cart::Slot15(int, int) { int y = 5; for (int index = 0; index < this->m_visibleCount; ++index) { - UICashShopWnd_CartItem* item = new UICashShopWnd_CartItem(*this->m_context); + UICashShopWnd_CartItem* item = new UICashShopWnd_CartItem(); item->SetSize(0xAC, 0x36); item->Move(3, y); item->Show(0); @@ -412,7 +412,7 @@ void UICashShopWnd_Cart::Slot15(int, int) { // OFFSET: 0x007CFB20 // FUNCTION: fn_09537 void UICashShopWnd_CartItem::Slot15(int, int) { - UIBitmapButton* close = new UIBitmapButton(*this->m_context); + UIBitmapButton* close = new UIBitmapButton(); close->SetBitmap("유저인터페이스\\cashshop\\btn_close.bmp", 0, 0); close->SetBitmap("유저인터페이스\\cashshop\\btn_close.bmp", 1, 0); close->SetBitmap("유저인터페이스\\cashshop\\btn_close.bmp", 2, 0); @@ -421,7 +421,7 @@ void UICashShopWnd_CartItem::Slot15(int, int) { close->SetId(0xD3); this->AddChild(close); - UIBitmapButton* plus = new UIBitmapButton(*this->m_context); + UIBitmapButton* plus = new UIBitmapButton(); plus->SetBitmap("유저인터페이스\\cashshop\\btn_plus_normal.bmp", 0, 0); plus->SetBitmap("유저인터페이스\\cashshop\\btn_plus_over.bmp", 1, 0); plus->SetBitmap("유저인터페이스\\cashshop\\btn_plus_press.bmp", 2, 0); @@ -430,7 +430,7 @@ void UICashShopWnd_CartItem::Slot15(int, int) { plus->SetId(0x117); this->AddChild(plus); - UIBitmapButton* minus = new UIBitmapButton(*this->m_context); + UIBitmapButton* minus = new UIBitmapButton(); minus->SetBitmap("유저인터페이스\\cashshop\\btn_minus_normal.bmp", 0, 0); minus->SetBitmap("유저인터페이스\\cashshop\\btn_minus_over.bmp", 1, 0); minus->SetBitmap("유저인터페이스\\cashshop\\btn_minus_press.bmp", 2, 0); @@ -443,7 +443,7 @@ void UICashShopWnd_CartItem::Slot15(int, int) { // OFFSET: 0x007CFD20 // FUNCTION: fn_09538 void UICashShopWnd_Item::Slot15(int, int) { - this->m_addButton = new UIBmpTextButton(*this->m_context); + this->m_addButton = new UIBmpTextButton(); this->m_addButton->SetBitmap("유저인터페이스\\cashshop\\btn_add_normal.bmp", 0, 0); this->m_addButton->SetBitmap("유저인터페이스\\cashshop\\btn_add_press.bmp", 1, 0); this->m_addButton->SetBitmap("유저인터페이스\\cashshop\\btn_add_press.bmp", 2, 0); @@ -454,7 +454,7 @@ void UICashShopWnd_Item::Slot15(int, int) { this->m_addButton->SetId(0xE0); this->AddChild(this->m_addButton); - this->m_soldOut = new UIStaticBitmap(*this->m_context); + this->m_soldOut = new UIStaticBitmap(); this->m_soldOut->SetBitmap("유저인터페이스\\cashshop\\img_shop_soldout.bmp"); this->m_soldOut->SetSize(this->m_soldOut->geometry.width, this->m_soldOut->geometry.height); this->m_soldOut->Move(9, 9); @@ -780,7 +780,7 @@ void UICashShopWnd_CartItem::Slot35(int delta) { void UICashShopWnd_Banner::CreateButtons() { int index = 0; for (std::vector::iterator entry = this->m_entries.begin(); entry != this->m_entries.end(); ++entry) { - UIBmpRadioBtn* button = new UIBmpRadioBtn(*this->m_context); + UIBmpRadioBtn* button = new UIBmpRadioBtn(); button->SetBitmap("유저인터페이스\\cashshop\\btn_ad_off.bmp", 0); button->SetBitmap("유저인터페이스\\cashshop\\btn_ad_off.bmp", 1); button->SetBitmap("유저인터페이스\\cashshop\\btn_ad_on.bmp", 2); diff --git a/Source/UI/CashShop/UICashShopWnd.h b/Source/UI/CashShop/UICashShopWnd.h index a1800062..aa55ca1f 100644 --- a/Source/UI/CashShop/UICashShopWnd.h +++ b/Source/UI/CashShop/UICashShopWnd.h @@ -24,7 +24,7 @@ public: /* 0018 */ std::string url; }; - UICashShopWnd_Banner(UIWindowContext& windows); + UICashShopWnd_Banner(); void Slot19() override; void Paint() override; void ResetCursor(int x, int y) override; @@ -42,7 +42,7 @@ public: class UICashShopWnd_CartItem : public UIWindow { public: - UICashShopWnd_CartItem(UIWindowContext& windows); + UICashShopWnd_CartItem(); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; @@ -60,7 +60,7 @@ public: class UICashShopWnd_Cart : public UIWindow { public: - UICashShopWnd_Cart(UIWindowContext& windows); + UICashShopWnd_Cart(); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; @@ -79,8 +79,8 @@ public: class UICashShopWnd_Item : public UIWindow { public: // INLINED - UICashShopWnd_Item(UIWindowContext& windows) - : UIWindow(windows, 0), m_addButton(nullptr), m_largeLayout(false), m_soldOut(nullptr) { + UICashShopWnd_Item() + : UIWindow(0), m_addButton(nullptr), m_largeLayout(false), m_soldOut(nullptr) { } void Slot10(int x, int y, std::intptr_t value) override; @@ -100,7 +100,7 @@ public: class UICashShopWnd : public UIFrameWnd { public: - UICashShopWnd(UIWindowContext& windows); + UICashShopWnd(); ~UICashShopWnd() override; bool Slot03() override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Chat/UIChatRoomMakeWnd.cpp b/Source/UI/Chat/UIChatRoomMakeWnd.cpp index 280ed936..485e8490 100644 --- a/Source/UI/Chat/UIChatRoomMakeWnd.cpp +++ b/Source/UI/Chat/UIChatRoomMakeWnd.cpp @@ -4,13 +4,13 @@ // OFFSET: 0x008C7280 // FUNCTION: fn_11929 -UIChatRoomMakeWnd::UIChatRoomMakeWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIChatRoomMakeWnd::UIChatRoomMakeWnd() : UIFrameWnd(0) { this->m_title = LookupMessage(125); } // OFFSET: 0x008C7120 // FUNCTION: fn_11928 -UIChatRoomChangeWnd::UIChatRoomChangeWnd(UIWindowContext& windows) : UIChatRoomMakeWnd(windows) { +UIChatRoomChangeWnd::UIChatRoomChangeWnd() : UIChatRoomMakeWnd() { this->m_title = LookupMessage(126); } diff --git a/Source/UI/Chat/UIChatRoomMakeWnd.h b/Source/UI/Chat/UIChatRoomMakeWnd.h index 2f7b6b72..d910378f 100644 --- a/Source/UI/Chat/UIChatRoomMakeWnd.h +++ b/Source/UI/Chat/UIChatRoomMakeWnd.h @@ -9,7 +9,7 @@ class UIChatRoomMakeWnd : public UIFrameWnd { public: - UIChatRoomMakeWnd(UIWindowContext& windows); + UIChatRoomMakeWnd(); ~UIChatRoomMakeWnd() override; void Paint() override; @@ -23,7 +23,7 @@ public: class UIChatRoomChangeWnd : public UIChatRoomMakeWnd { public: - UIChatRoomChangeWnd(UIWindowContext& windows); + UIChatRoomChangeWnd(); }; #endif diff --git a/Source/UI/Chat/UIChatRoomTitle.cpp b/Source/UI/Chat/UIChatRoomTitle.cpp index 8671c1ad..94ef14ef 100644 --- a/Source/UI/Chat/UIChatRoomTitle.cpp +++ b/Source/UI/Chat/UIChatRoomTitle.cpp @@ -15,13 +15,13 @@ // OFFSET: 0x0084EF70 // FUNCTION: fn_10655 -UIChatRoomTitle::UIChatRoomTitle(UIWindowContext& context) : UIWindow(context, 0) { +UIChatRoomTitle::UIChatRoomTitle() : UIWindow(0) { } // OFFSET: 0x0085AB80 // FUNCTION: fn_10785 void UIChatRoomTitle::Slot15(int, int) { - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize(this->geometry.width - 34, 15); this->label->Move(31, 8); this->label->SetTextFitted(""); diff --git a/Source/UI/Chat/UIChatRoomTitle.h b/Source/UI/Chat/UIChatRoomTitle.h index 13d9d38e..a8618bf3 100644 --- a/Source/UI/Chat/UIChatRoomTitle.h +++ b/Source/UI/Chat/UIChatRoomTitle.h @@ -22,7 +22,7 @@ class UIChatRoomTitle : public UIWindow { friend class CGameMode; public: - explicit UIChatRoomTitle(UIWindowContext& context); + UIChatRoomTitle(); void Slot15(int width, int height) override; void Slot26(int x, int y) override; void Paint() override; diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp index d8ea3dde..32149e1f 100644 --- a/Source/UI/Chat/UISubChatHisWnd.cpp +++ b/Source/UI/Chat/UISubChatHisWnd.cpp @@ -125,7 +125,7 @@ void UISubChatHisWnd::Slot11() { void UISubChatHisWnd::Slot15(int width, int height) { { const std::string name = "유저인터페이스\\basic_interface\\stickon"; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); this->m_stickButton = button; button->SetBitmap((name + "_a.bmp").c_str(), 0, 0); button->SetBitmap((name + "_b.bmp").c_str(), 1, 0); @@ -139,7 +139,7 @@ void UISubChatHisWnd::Slot15(int width, int height) { { std::string name = "유저인터페이스\\basic_interface\\battle_option"; name += "2"; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); this->m_optionButton = button; button->SetBitmap((name + "_a.bmp").c_str(), 0, 0); button->SetBitmap((name + "_b.bmp").c_str(), 1, 0); @@ -152,7 +152,7 @@ void UISubChatHisWnd::Slot15(int width, int height) { { const std::string name = "유저인터페이스\\basic_interface\\wnd_mini"; - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); this->m_miniButton = button; button->SetBitmap((name + "_a.bmp").c_str(), 0, 0); button->SetBitmap((name + "_b.bmp").c_str(), 1, 0); @@ -162,12 +162,12 @@ void UISubChatHisWnd::Slot15(int width, int height) { this->AddChild(button); } - this->m_chatBox = new UIChatHisBox(*this->m_context); + this->m_chatBox = new UIChatHisBox(); this->m_chatBox->Configure(0, 0, this->geometry.width - 8, this->geometry.height - this->unknown_00F0 - this->m_inputHeight - 4, 0); this->m_chatBox->Move(5, this->m_inputHeight + 4); this->AddChild(this->m_chatBox); - this->m_resizer = new UIResizer(*this->m_context); + this->m_resizer = new UIResizer(); this->m_resizer->SetSize(14, 14); this->m_resizer->SetDirection(7); this->m_resizer->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -196,7 +196,7 @@ void UISubChatHisWnd::Slot15(int width, int height) { } } - this->m_edit = new UIEditCtrl2(*this->m_context); + this->m_edit = new UIEditCtrl2(); this->m_edit->SetSize(100, 19); this->m_edit->Move(-100, -100); this->AddChild(this->m_edit); @@ -206,8 +206,8 @@ void UISubChatHisWnd::Slot15(int width, int height) { // OFFSET: 0x00912340 // FUNCTION: fn_12529 -UISubChatHisWnd::UISubChatHisWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UISubChatHisWnd::UISubChatHisWnd() + : UIFrameWnd(0) { this->m_saved = nullptr; this->m_resizer = nullptr; this->m_chatBox = nullptr; diff --git a/Source/UI/Chat/UISubChatHisWnd.h b/Source/UI/Chat/UISubChatHisWnd.h index f5dd86d5..b447a8f4 100644 --- a/Source/UI/Chat/UISubChatHisWnd.h +++ b/Source/UI/Chat/UISubChatHisWnd.h @@ -27,7 +27,6 @@ class UISubChatHisWnd : public UIFrameWnd { public: UISubChatHisWnd(); - UISubChatHisWnd(UIWindowContext& windows); void Resize(int width, int height) override; void Move(int x, int y) override; void Slot11() override; diff --git a/Source/UI/Chat/UIWhisperWnd.cpp b/Source/UI/Chat/UIWhisperWnd.cpp index 39b4ffa0..260a4cfd 100644 --- a/Source/UI/Chat/UIWhisperWnd.cpp +++ b/Source/UI/Chat/UIWhisperWnd.cpp @@ -2,7 +2,7 @@ // OFFSET: 0x008C9620 // FUNCTION: fn_11984 -UIWhisperWnd::UIWhisperWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIWhisperWnd::UIWhisperWnd() : UIFrameWnd(0) { this->unknown_0100 = 0; this->m_code = std::string(); } diff --git a/Source/UI/Chat/UIWhisperWnd.h b/Source/UI/Chat/UIWhisperWnd.h index 391d7a11..c7c6b3bb 100644 --- a/Source/UI/Chat/UIWhisperWnd.h +++ b/Source/UI/Chat/UIWhisperWnd.h @@ -19,7 +19,7 @@ struct WhisperLogLine { class UIWhisperWnd : public UIFrameWnd { public: - UIWhisperWnd(UIWindowContext& windows); + UIWhisperWnd(); /* 00B4 */ std::string m_target; /* 00CC */ std::string m_name; diff --git a/Source/UI/Clan/UIClanWnd.cpp b/Source/UI/Clan/UIClanWnd.cpp index 12f5b3dc..930e020f 100644 --- a/Source/UI/Clan/UIClanWnd.cpp +++ b/Source/UI/Clan/UIClanWnd.cpp @@ -17,7 +17,7 @@ // OFFSET: 0x0084CBD0 // FUNCTION: fn_10625 -UIClanInfoManageWnd::UIClanInfoManageWnd(UIWindowContext& windows) : UIClanWnd(windows), m_emblem(nullptr) {} +UIClanInfoManageWnd::UIClanInfoManageWnd() : UIClanWnd(), m_emblem(nullptr) {} // OFFSET: 0x0084CEF0 // FUNCTION: fn_10628 @@ -30,7 +30,7 @@ int UIClanInfoManageWnd::Slot53() { void UIClanInfoManageWnd::Slot15(int width, int height) { if (!this->m_title) { const char* title = LookupMessage(2355); - this->m_title = new UIStaticText(*this->m_context); + this->m_title = new UIStaticText(); this->m_title->SetSize(62, 15); this->m_title->SetTextFitted(title); this->m_title->Move(3, 22); diff --git a/Source/UI/Clan/UIClanWnd.h b/Source/UI/Clan/UIClanWnd.h index f514f5a5..0ba10fbc 100644 --- a/Source/UI/Clan/UIClanWnd.h +++ b/Source/UI/Clan/UIClanWnd.h @@ -10,7 +10,7 @@ class UIStaticText; class UIClanWnd : public UIFrameWnd { public: // INLINED - UIClanWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), m_saved(nullptr), m_title(nullptr) { + UIClanWnd() : UIFrameWnd(0), m_saved(nullptr), m_title(nullptr) { } void Slot11() override; void Paint() override; @@ -25,7 +25,7 @@ protected: class UIClanInfoManageWnd : public UIClanWnd { public: - UIClanInfoManageWnd(UIWindowContext& windows); + UIClanInfoManageWnd(); void Slot15(int width, int height) override; void Slot25(int x, int y) override; void Paint() override; diff --git a/Source/UI/Dialogs/UIBookWnd.h b/Source/UI/Dialogs/UIBookWnd.h index 43b2e850..338ddba0 100644 --- a/Source/UI/Dialogs/UIBookWnd.h +++ b/Source/UI/Dialogs/UIBookWnd.h @@ -12,7 +12,7 @@ class UITextViewer; class UIBookWnd : public UIFrameWnd { public: - UIBookWnd(UIWindowContext& windows); + UIBookWnd(); /* 00B4 */ UITextViewer* m_viewer; /* 00B8 */ UIWindow* unknown_00B8; /* 00BC */ char m_bookName[100]; diff --git a/Source/UI/Dialogs/UIChooseWarpWnd.h b/Source/UI/Dialogs/UIChooseWarpWnd.h index 67710b60..11b67671 100644 --- a/Source/UI/Dialogs/UIChooseWarpWnd.h +++ b/Source/UI/Dialogs/UIChooseWarpWnd.h @@ -10,7 +10,7 @@ class UIListBox; class UIChooseWarpWnd : public UIFrameWnd { public: - UIChooseWarpWnd(UIWindowContext& windows); + UIChooseWarpWnd(); void Slot15(int width, int height) override; void Paint() override; std::vector Slot44() override; diff --git a/Source/UI/Dialogs/UIChooseWnd.cpp b/Source/UI/Dialogs/UIChooseWnd.cpp index 2869cf5e..1174f929 100644 --- a/Source/UI/Dialogs/UIChooseWnd.cpp +++ b/Source/UI/Dialogs/UIChooseWnd.cpp @@ -8,8 +8,8 @@ UIChooseWnd::~UIChooseWnd() { // OFFSET: 0x008C74C0 // FUNCTION: fn_11932 -UIChooseWnd::UIChooseWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_list(nullptr), m_okButton(nullptr), m_cancelButton(nullptr) { +UIChooseWnd::UIChooseWnd() + : UIFrameWnd(0), m_list(nullptr), m_okButton(nullptr), m_cancelButton(nullptr) { this->unknown_00B4 = -1; this->m_placement = nullptr; } diff --git a/Source/UI/Dialogs/UIChooseWnd.h b/Source/UI/Dialogs/UIChooseWnd.h index 34ae32a8..ad223e5c 100644 --- a/Source/UI/Dialogs/UIChooseWnd.h +++ b/Source/UI/Dialogs/UIChooseWnd.h @@ -11,7 +11,7 @@ class UIListBox; class UIChooseWnd : public UIFrameWnd { public: - UIChooseWnd(UIWindowContext& windows); + UIChooseWnd(); ~UIChooseWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h b/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h index 4f0462ba..671d22a4 100644 --- a/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h +++ b/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h @@ -7,7 +7,7 @@ class UITextViewer; class UIDisconnectedServerMsgWnd : public UIFrameWnd { public: - UIDisconnectedServerMsgWnd(UIWindowContext& windows); + UIDisconnectedServerMsgWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.cpp b/Source/UI/Dialogs/UIEmailAddressWnd.cpp index 1a5e124f..38feff7a 100644 --- a/Source/UI/Dialogs/UIEmailAddressWnd.cpp +++ b/Source/UI/Dialogs/UIEmailAddressWnd.cpp @@ -20,6 +20,6 @@ int UIEmailAddressWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s // OFFSET: 0x008C7800 // FUNCTION: fn_11939 -UIEmailAddressWnd::UIEmailAddressWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIEmailAddressWnd::UIEmailAddressWnd() + : UIFrameWnd(0) { } diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.h b/Source/UI/Dialogs/UIEmailAddressWnd.h index c0e702d8..5199ed5d 100644 --- a/Source/UI/Dialogs/UIEmailAddressWnd.h +++ b/Source/UI/Dialogs/UIEmailAddressWnd.h @@ -7,7 +7,7 @@ class UIEditCtrl; class UIEmailAddressWnd : public UIFrameWnd { public: - UIEmailAddressWnd(UIWindowContext& windows); + UIEmailAddressWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp b/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp index 6c4146f1..d7269eb9 100644 --- a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp +++ b/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp @@ -9,7 +9,7 @@ // OFFSET: 0x008E1210 // FUNCTION: fn_12174 void UIGraffiStrboxWnd::Slot15(int, int) { - this->edit = new UIEditCtrl(*this->m_context); + this->edit = new UIEditCtrl(); this->edit->SetSize(240, 16); this->edit->Move(22, 50); this->edit->maximum = 20; @@ -23,7 +23,7 @@ void UIGraffiStrboxWnd::Slot15(int, int) { int positions[2][2] = {{189, 96}, {234, 96}}; for (int index = 0; index < 2; ++index) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[index][2] + ".bmp").c_str(), 2, 0); @@ -38,6 +38,6 @@ void UIGraffiStrboxWnd::Slot15(int, int) { // OFFSET: 0x008C7C50 // FUNCTION: fn_11942 -UIGraffiStrboxWnd::UIGraffiStrboxWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIGraffiStrboxWnd::UIGraffiStrboxWnd() + : UIFrameWnd(0) { } diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.h b/Source/UI/Dialogs/UIGraffiStrboxWnd.h index 5744975a..a7fb4de2 100644 --- a/Source/UI/Dialogs/UIGraffiStrboxWnd.h +++ b/Source/UI/Dialogs/UIGraffiStrboxWnd.h @@ -7,7 +7,7 @@ class UIEditCtrl; class UIGraffiStrboxWnd : public UIFrameWnd { public: - UIGraffiStrboxWnd(UIWindowContext& windows); + UIGraffiStrboxWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Dialogs/UILoadingWnd.h b/Source/UI/Dialogs/UILoadingWnd.h index 7975712f..64d51881 100644 --- a/Source/UI/Dialogs/UILoadingWnd.h +++ b/Source/UI/Dialogs/UILoadingWnd.h @@ -8,7 +8,7 @@ class UILoadingWnd : public UIFrameWnd { public: - UILoadingWnd(UIWindowContext& windows); + UILoadingWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIMenuWnd.h b/Source/UI/Dialogs/UIMenuWnd.h index 791e8cb4..c889babf 100644 --- a/Source/UI/Dialogs/UIMenuWnd.h +++ b/Source/UI/Dialogs/UIMenuWnd.h @@ -9,7 +9,7 @@ class UIMenuWnd : public UIFrameWnd { public: - UIMenuWnd(UIWindowContext& windows); + UIMenuWnd(); /* 00B4 */ int m_menuId; /* 00B8 */ int m_selected; /* 00BC */ int m_itemHeight; diff --git a/Source/UI/Dialogs/UIMinimapZoomWnd.cpp b/Source/UI/Dialogs/UIMinimapZoomWnd.cpp index 0ce71660..3c25fab6 100644 --- a/Source/UI/Dialogs/UIMinimapZoomWnd.cpp +++ b/Source/UI/Dialogs/UIMinimapZoomWnd.cpp @@ -3,7 +3,7 @@ // OFFSET: 0x008C8460 // FUNCTION: fn_11954 UIMinimapZoomWnd::UIMinimapZoomWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), + : UIFrameWnd(0), m_zoom(), unknown_00BC(0), unknown_00C0(0), diff --git a/Source/UI/Dialogs/UINoticeConfirmWnd.h b/Source/UI/Dialogs/UINoticeConfirmWnd.h index 979f345c..d03d283b 100644 --- a/Source/UI/Dialogs/UINoticeConfirmWnd.h +++ b/Source/UI/Dialogs/UINoticeConfirmWnd.h @@ -7,7 +7,7 @@ class UITextViewer; class UINoticeConfirmWnd : public UIFrameWnd { public: - UINoticeConfirmWnd(UIWindowContext& windows); + UINoticeConfirmWnd(); /* 00B4 */ UITextViewer* m_viewer; /* 00B8 */ int m_event; diff --git a/Source/UI/Dialogs/UINotifyLevelUpWnd.h b/Source/UI/Dialogs/UINotifyLevelUpWnd.h index 02f57c31..cfd79e21 100644 --- a/Source/UI/Dialogs/UINotifyLevelUpWnd.h +++ b/Source/UI/Dialogs/UINotifyLevelUpWnd.h @@ -6,7 +6,7 @@ class UINotifyLevelUpWnd : public UIFrameWnd { public: - UINotifyLevelUpWnd(UIWindowContext& windows); + UINotifyLevelUpWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Dialogs/UINotifyQuestWnd.h b/Source/UI/Dialogs/UINotifyQuestWnd.h index 5e6eb9a7..a88d84d0 100644 --- a/Source/UI/Dialogs/UINotifyQuestWnd.h +++ b/Source/UI/Dialogs/UINotifyQuestWnd.h @@ -6,7 +6,7 @@ class UINotifyQuestWnd : public UIFrameWnd { public: - UINotifyQuestWnd(UIWindowContext& windows); + UINotifyQuestWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Dialogs/UINpcEditDialogWnd.h b/Source/UI/Dialogs/UINpcEditDialogWnd.h index ae8483f9..2da1fe4d 100644 --- a/Source/UI/Dialogs/UINpcEditDialogWnd.h +++ b/Source/UI/Dialogs/UINpcEditDialogWnd.h @@ -10,7 +10,7 @@ struct ITEM_INFO; class UINpcEditDialogWnd : public UIFrameWnd { public: - UINpcEditDialogWnd(UIWindowContext& windows); + UINpcEditDialogWnd(); void Paint() override; void Slot15(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -27,7 +27,7 @@ protected: class UINpcTextEditDialogWnd : public UINpcEditDialogWnd { public: - UINpcTextEditDialogWnd(UIWindowContext& windows); + UINpcTextEditDialogWnd(); void Slot15(int width, int height) override; void InsertItemTag(const ITEM_INFO& item); void InsertSkillTag(int tagId); diff --git a/Source/UI/Dialogs/UIPasswordWnd.cpp b/Source/UI/Dialogs/UIPasswordWnd.cpp index faf8992f..ebce3c90 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.cpp +++ b/Source/UI/Dialogs/UIPasswordWnd.cpp @@ -14,7 +14,7 @@ int g_passwordWndMode; // OFFSET: 0x008C89F0 // FUNCTION: fn_11965 -UIPasswordWnd::UIPasswordWnd(UIWindowContext& windows) : UIItemDropCntWnd(windows) {} +UIPasswordWnd::UIPasswordWnd() : UIItemDropCntWnd() {} // OFFSET: 0x0090C970 // FUNCTION: fn_12451 @@ -54,7 +54,7 @@ void UIPasswordWnd::CreateKeypad(unsigned int seed) { const int commandPositions[5][2] = {{414, 192}, {414, 220}, {414, 248}, {414, 192}, {414, 276}}; for (int i = 0; i < 5; ++i) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->unknown_0150[i] = button; button->SetBitmap((prefix + commandNames[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + commandNames[i][1] + ".bmp").c_str(), 1, 0); @@ -79,7 +79,7 @@ void UIPasswordWnd::CreateKeypad(unsigned int seed) { for (int i = 0; i < 10; ++i) { const int digit = this->m_digits[i]; - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->unknown_0124[i] = button; button->SetBitmap((prefix + keyNames[digit][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + keyNames[digit][1] + ".bmp").c_str(), 1, 0); @@ -90,7 +90,7 @@ void UIPasswordWnd::CreateKeypad(unsigned int seed) { this->AddChild(button); } - UIBitmapButton* reset = new UIBitmapButton(*this->m_context); + UIBitmapButton* reset = new UIBitmapButton(); this->unknown_0124[10] = reset; reset->SetBitmap((prefix + keyNames[10][0] + ".bmp").c_str(), 0, 0); reset->SetBitmap((prefix + keyNames[10][1] + ".bmp").c_str(), 1, 0); @@ -114,13 +114,13 @@ void UIPasswordWnd::CreateKeypad(unsigned int seed) { } this->unknown_0150[2]->Enable(0); - this->unknown_0164 = new UIStaticText(*this->m_context); + this->unknown_0164 = new UIStaticText(); this->unknown_0164->SetSize(300, 15); this->unknown_0164->SetText(LookupMessage(0x771), 0); this->unknown_0164->Move(200, 30); this->AddChild(this->unknown_0164); - UIStaticText* notice = new UIStaticText(*this->m_context); + UIStaticText* notice = new UIStaticText(); notice->SetSize(320, 15); notice->SetText(LookupMessage(0x772), 0); notice->Move(200, 50); diff --git a/Source/UI/Dialogs/UIPasswordWnd.h b/Source/UI/Dialogs/UIPasswordWnd.h index cf3c0a5e..490abce4 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.h +++ b/Source/UI/Dialogs/UIPasswordWnd.h @@ -9,7 +9,7 @@ class UIStaticText; class UIItemDropCntWnd : public UIFrameWnd { public: - UIItemDropCntWnd(UIWindowContext& windows); + UIItemDropCntWnd(); /* 00B4 */ UIEditCtrl* m_edit; /* 00B8 */ std::uint32_t unknown_00B8; @@ -21,7 +21,7 @@ public: class UIPasswordWnd : public UIItemDropCntWnd { public: - UIPasswordWnd(UIWindowContext& windows); + UIPasswordWnd(); /* 00BC */ int unknown_00BC; /* 00C0 */ unsigned char unknown_00C0[0x38]; @@ -53,7 +53,7 @@ protected: class UIStorePasswordInputWnd : public UIFrameWnd { public: - UIStorePasswordInputWnd(UIWindowContext& windows); + UIStorePasswordInputWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -76,7 +76,7 @@ public: class UISecondPasswordInputWnd : public UIStorePasswordInputWnd { public: - UISecondPasswordInputWnd(UIWindowContext& windows); + UISecondPasswordInputWnd(); void Paint() override; void ShuffleKeypad(); diff --git a/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h b/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h index 6971b638..3e2cb4d7 100644 --- a/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h +++ b/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h @@ -5,7 +5,7 @@ class UIPetTamingDeceiveWnd : public UIFrameWnd { public: - UIPetTamingDeceiveWnd(UIWindowContext& windows); + UIPetTamingDeceiveWnd(); /* 00B4 */ int m_delay; /* 00B8 */ int m_state; /* 00BC */ int m_tick; diff --git a/Source/UI/Dialogs/UIProhibitListWnd.h b/Source/UI/Dialogs/UIProhibitListWnd.h index 56332d29..2d0b32d1 100644 --- a/Source/UI/Dialogs/UIProhibitListWnd.h +++ b/Source/UI/Dialogs/UIProhibitListWnd.h @@ -6,7 +6,7 @@ class UIProhibitListWnd : public UIFrameWnd { public: - UIProhibitListWnd(UIWindowContext& windows); + UIProhibitListWnd(); /* 00B4 */ int m_count; /* 00B8 */ std::uint32_t m_aid; diff --git a/Source/UI/Dialogs/UIQuitWnd.h b/Source/UI/Dialogs/UIQuitWnd.h index d5ea4884..9f997a6c 100644 --- a/Source/UI/Dialogs/UIQuitWnd.h +++ b/Source/UI/Dialogs/UIQuitWnd.h @@ -6,7 +6,7 @@ class UIQuitWnd : public UIFrameWnd { public: - UIQuitWnd(UIWindowContext& windows); + UIQuitWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Dialogs/UIRestartWnd.h b/Source/UI/Dialogs/UIRestartWnd.h index 834e76e1..1834ab18 100644 --- a/Source/UI/Dialogs/UIRestartWnd.h +++ b/Source/UI/Dialogs/UIRestartWnd.h @@ -6,7 +6,7 @@ class UIRestartWnd : public UIFrameWnd { public: - UIRestartWnd(UIWindowContext& windows); + UIRestartWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Dialogs/UISayDialogWnd.h b/Source/UI/Dialogs/UISayDialogWnd.h index 408ba1db..13178208 100644 --- a/Source/UI/Dialogs/UISayDialogWnd.h +++ b/Source/UI/Dialogs/UISayDialogWnd.h @@ -9,7 +9,7 @@ struct WindowPlacement; class UISayDialogWnd : public UIFrameWnd { public: - UISayDialogWnd(UIWindowContext& windows); + UISayDialogWnd(); /* 00B4 */ UIWindow* m_viewer; /* 00B8 */ std::list m_buttons; /* 00C0 */ std::list unknown_00C0; diff --git a/Source/UI/Dialogs/UISelectCartWnd.h b/Source/UI/Dialogs/UISelectCartWnd.h index df1a4aeb..39f19e25 100644 --- a/Source/UI/Dialogs/UISelectCartWnd.h +++ b/Source/UI/Dialogs/UISelectCartWnd.h @@ -6,7 +6,7 @@ class UISelectCartWnd : public UIFrameWnd { public: - UISelectCartWnd(UIWindowContext& windows); + UISelectCartWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Dialogs/UITipOfTheDayWnd.h b/Source/UI/Dialogs/UITipOfTheDayWnd.h index c8a454b1..5f104127 100644 --- a/Source/UI/Dialogs/UITipOfTheDayWnd.h +++ b/Source/UI/Dialogs/UITipOfTheDayWnd.h @@ -9,7 +9,7 @@ extern int g_window315Enabled; class UITipOfTheDayWnd : public UIFrameWnd { public: - UITipOfTheDayWnd(UIWindowContext& windows); + UITipOfTheDayWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Dialogs/UITipboxWnd.h b/Source/UI/Dialogs/UITipboxWnd.h index 52b67fb0..afd501c0 100644 --- a/Source/UI/Dialogs/UITipboxWnd.h +++ b/Source/UI/Dialogs/UITipboxWnd.h @@ -36,7 +36,7 @@ struct TipBoxDot { class UITipboxWnd : public UIFrameWnd { public: - UITipboxWnd(UIWindowContext& windows); + UITipboxWnd(); void ShowTip(int id); void TrimAt(std::string& text, const char* marker); void UpdateAnimations(); diff --git a/Source/UI/Dialogs/UIToolTipWnd.h b/Source/UI/Dialogs/UIToolTipWnd.h index ae159a9c..9ad8e481 100644 --- a/Source/UI/Dialogs/UIToolTipWnd.h +++ b/Source/UI/Dialogs/UIToolTipWnd.h @@ -7,7 +7,7 @@ class UIListBox; class UIToolTipWnd : public UIFrameWnd { public: - UIToolTipWnd(UIWindowContext& windows); + UIToolTipWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp b/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp index 39d683a2..313a861d 100644 --- a/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp +++ b/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp @@ -51,8 +51,8 @@ private: // OFFSET: 0x00AB49D0 // FUNCTION: fn_17446 -UIWaitDBSaveWnd::UIWaitDBSaveWnd(UIWindowContext& windowContext) - : UIWindow(windowContext, 0), m_animation(0), m_frame(0), m_loopLimit(0), m_sprite(nullptr), m_action(nullptr), m_startTime(0), m_loop(1), +UIWaitDBSaveWnd::UIWaitDBSaveWnd() + : UIWindow(0), m_animation(0), m_frame(0), m_loopLimit(0), m_sprite(nullptr), m_action(nullptr), m_startTime(0), m_loop(1), m_closeTime(0) { const std::uint8_t actionSource[] = {0x36, 0xCE, 0xE6, 0x4D, 0xCF, 0x8B, 0xAC, 0x76, 0x17, 0xCA, 0xD3, 0x77, 0xE4, 0xBE, 0xB3, 0x78, 0x00, 0xCB, 0xE6, 0x57, 0xEC, 0xE7, 0x9E, 0x74, 0x15, 0xAF}; @@ -73,7 +73,7 @@ UIWaitDBSaveWnd::UIWaitDBSaveWnd(UIWindowContext& windowContext) // OFFSET: 0x00AB4CE0 // FUNCTION: fn_17448 void UIWaitDBSaveWnd::Slot15(int width, int height) { - UIButton* button = new UIButton(*this->m_context); + UIButton* button = new UIButton(); button->SetSize(width, height); button->Move(0, 0); button->SetId(0); diff --git a/Source/UI/Dialogs/UIWaitDBSaveWnd.h b/Source/UI/Dialogs/UIWaitDBSaveWnd.h index e175ff15..a389c1ef 100644 --- a/Source/UI/Dialogs/UIWaitDBSaveWnd.h +++ b/Source/UI/Dialogs/UIWaitDBSaveWnd.h @@ -10,7 +10,7 @@ class CSprRes; class UIWaitDBSaveWnd : public UIWindow { public: - UIWaitDBSaveWnd(UIWindowContext& windowContext); + UIWaitDBSaveWnd(); void Slot15(int width, int height) override; void Slot18() override; void Slot19() override; diff --git a/Source/UI/Dialogs/UIWaitWnd.h b/Source/UI/Dialogs/UIWaitWnd.h index f8b18024..747de571 100644 --- a/Source/UI/Dialogs/UIWaitWnd.h +++ b/Source/UI/Dialogs/UIWaitWnd.h @@ -8,7 +8,7 @@ class UITextViewer; class UIWaitWnd : public UIFrameWnd { public: - UIWaitWnd(UIWindowContext& windows); + UIWaitWnd(); /* 00B4 */ UITextViewer* m_textViewer; /* 00B8 */ UIBitmapButton* m_button; diff --git a/Source/UI/Edit/ItemTagRetirement.cpp b/Source/UI/Edit/ItemTagRetirement.cpp index 3c7c9544..565f4920 100644 --- a/Source/UI/Edit/ItemTagRetirement.cpp +++ b/Source/UI/Edit/ItemTagRetirement.cpp @@ -213,7 +213,7 @@ void UIItemTagCtrl::sub_89CFE0(const ITEM_INFO& item, unsigned int color) { tag += item.DisplayName(0); tag += ">"; - UIItemTagButton* button = new UIItemTagButton(*this->m_context); + UIItemTagButton* button = new UIItemTagButton(); std::string label = "<"; label += FitText(*this->geometry.surface, item.DisplayName(0), this->tagWidth / 2); diff --git a/Source/UI/Edit/UICandidateWnd.cpp b/Source/UI/Edit/UICandidateWnd.cpp index 4fe94f2c..b591f5f4 100644 --- a/Source/UI/Edit/UICandidateWnd.cpp +++ b/Source/UI/Edit/UICandidateWnd.cpp @@ -14,15 +14,15 @@ // OFFSET: 0x0096D300 // FUNCTION: fn_13194 -UICandidateWnd::UICandidateWnd(UIWindowContext& windowContext) : UIFrameWnd(windowContext, 0) {} +UICandidateWnd::UICandidateWnd() : UIFrameWnd(0) {} // OFFSET: 0x0096D370 // FUNCTION: fn_13195 -UICompositionWnd::UICompositionWnd(UIWindowContext& windowContext) : UIFrameWnd(windowContext, 0) {} +UICompositionWnd::UICompositionWnd() : UIFrameWnd(0) {} // OFFSET: 0x0096D3F0 // FUNCTION: fn_13196 -UIKeyStrokeWnd::UIKeyStrokeWnd(UIWindowContext& windowContext) : UIFrameWnd(windowContext, 0) {} +UIKeyStrokeWnd::UIKeyStrokeWnd() : UIFrameWnd(0) {} // OFFSET: 0x0096D6F0 // FUNCTION: fn_13200 diff --git a/Source/UI/Edit/UICandidateWnd.h b/Source/UI/Edit/UICandidateWnd.h index 696eb6e8..21c41f20 100644 --- a/Source/UI/Edit/UICandidateWnd.h +++ b/Source/UI/Edit/UICandidateWnd.h @@ -8,7 +8,7 @@ class UICandidateWnd : public UIFrameWnd { public: - UICandidateWnd(UIWindowContext& windowContext); + UICandidateWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -24,7 +24,7 @@ protected: class UICompositionWnd : public UIFrameWnd { public: - UICompositionWnd(UIWindowContext& windowContext); + UICompositionWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -36,7 +36,7 @@ protected: class UIKeyStrokeWnd : public UIFrameWnd { public: - UIKeyStrokeWnd(UIWindowContext& windowContext); + UIKeyStrokeWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Edit/UIEditBoxEx.cpp b/Source/UI/Edit/UIEditBoxEx.cpp index b431398c..2c91c94f 100644 --- a/Source/UI/Edit/UIEditBoxEx.cpp +++ b/Source/UI/Edit/UIEditBoxEx.cpp @@ -660,7 +660,7 @@ void CUIEditCtrlEx::SetText(const char* value) { // FUNCTION: fn_14432 void CUIEditBoxEx::Create(int width, int height, bool withScrollBar) { this->RemoveChild(this->edit, 1); - CUIEditCtrlEx* edit = new CUIEditCtrlEx(*this->m_context); + CUIEditCtrlEx* edit = new CUIEditCtrlEx(); this->edit = edit; edit->SetSize(width, height); if (withScrollBar) { @@ -763,7 +763,7 @@ void CUIEditCtrlEx::PaintTextLines() { } } -CUIEditCtrlEx::CUIEditCtrlEx(UIWindowContext& windows) : UIEditCtrl3(windows) { +CUIEditCtrlEx::CUIEditCtrlEx() : UIEditCtrl3() { this->normalColor = 0; this->unknown_018C = 0; this->unknown_0190 = 0; diff --git a/Source/UI/Edit/UIEditBoxEx.h b/Source/UI/Edit/UIEditBoxEx.h index d8135d8d..29a14500 100644 --- a/Source/UI/Edit/UIEditBoxEx.h +++ b/Source/UI/Edit/UIEditBoxEx.h @@ -20,7 +20,7 @@ struct EditLine { class CUIEditCtrlEx : public UIEditCtrl3 { public: - CUIEditCtrlEx(UIWindowContext& windows); + CUIEditCtrlEx(); void Paint() override; void Invalidate() override; void SelectAll() override; @@ -64,7 +64,7 @@ public: class CUIEditBoxEx : public CUIControl { public: - explicit CUIEditBoxEx(UIWindowContext& context); + CUIEditBoxEx(); void Resize(int width, int height) override; bool Slot05() override; void Paint() override; diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 59610e0b..ee30d231 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -213,7 +213,7 @@ protected: // OFFSET: 0x0084F860 // FUNCTION: fn_10662 UIEditCtrl::UIEditCtrl(const UIEditCtrl& other) - : UIWindow(*other.m_context, 0), anchor(0), cursor(0), mask(0), maximum(0), flat(0), red(0), green(0), blue(0), borderRed(0), borderGreen(0), borderBlue(0), textColor(0), + : UIWindow(0), anchor(0), cursor(0), mask(0), maximum(0), flat(0), red(0), green(0), blue(0), borderRed(0), borderGreen(0), borderBlue(0), textColor(0), secondColor(0), firstVisible(0), textY(0), invalidatesParent(0), disabled(0), unknown_00F0(0), topPadding(0), preserveInput(0) { this->tooltip = other.tooltip; this->disabled = other.disabled; @@ -250,8 +250,8 @@ UIEditCtrl::UIEditCtrl(const UIEditCtrl& other) // OFFSET: 0x0084FAE0 // FUNCTION: fn_10663 -UIEditCtrl::UIEditCtrl(UIWindowContext& windows) - : UIWindow(windows, 0), anchor(0), cursor(0), mask(0), maximum(255), flat(1), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0), +UIEditCtrl::UIEditCtrl() + : UIWindow(0), anchor(0), cursor(0), mask(0), maximum(255), flat(1), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0), textColor(0), secondColor(0xFFFFFFFF), firstVisible(0), textY(0), invalidatesParent(0), disabled(0), unknown_00F0(0), topPadding(0), preserveInput(0), unknown_011C(nullptr) { this->text.reserve(255); @@ -576,7 +576,7 @@ void UIEditCtrl::DrawSelection(int x, int width) { // OFFSET: 0x0096F410 // FUNCTION: fn_13233 -UISkillListWnd::UISkillListWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UISkillListWnd::UISkillListWnd() : UIFrameWnd(0) { this->scrollBar = nullptr; this->unknown_00C0 = 0; this->hovered = -1; @@ -585,7 +585,7 @@ UISkillListWnd::UISkillListWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0 } // INLINED -UIEditCtrlWheel::UIEditCtrlWheel(UIWindowContext& windows) : UIEditCtrl(windows) { +UIEditCtrlWheel::UIEditCtrlWheel() : UIEditCtrl() { } // OFFSET: 0x009701B0 @@ -842,7 +842,7 @@ int UISpriteButton::FrameWidth(int action, int frame) { // OFFSET: 0x0097D220 // FUNCTION: fn_13325 void UINoticeMessageBox_LockSellItem::Slot15(int, int) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\inventory\\bt_close.bmp", 0, 0); button->SetBitmap("유저인터페이스\\inventory\\bt_close.bmp", 1, 0); button->SetBitmap("유저인터페이스\\inventory\\bt_close.bmp", 2, 0); @@ -1465,14 +1465,14 @@ void UIMerchantItemMyShopWnd::Paint() { // OFFSET: 0x0097A670 // FUNCTION: fn_13319 void UIMerchantItemPurchaseMSGWnd::Slot15(int, int) { - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(100, 15); this->title->SetTextFitted(LookupMessage(2326)); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - this->buyButton = new UIBitmapButton(*this->m_context); + this->buyButton = new UIBitmapButton(); this->buyButton->SetBitmap("유저인터페이스\\btn_buy.bmp", 0, 0); this->buyButton->SetBitmap("유저인터페이스\\btn_buy_a.bmp", 1, 0); this->buyButton->SetBitmap("유저인터페이스\\btn_buy_b.bmp", 2, 0); @@ -1481,7 +1481,7 @@ void UIMerchantItemPurchaseMSGWnd::Slot15(int, int) { this->buyButton->SetId(184); this->AddChild(this->buyButton); - this->cancelButton = new UIBitmapButton(*this->m_context); + this->cancelButton = new UIBitmapButton(); this->cancelButton->SetBitmap("유저인터페이스\\btn_cancel.bmp", 0, 0); this->cancelButton->SetBitmap("유저인터페이스\\btn_cancel_a.bmp", 1, 0); this->cancelButton->SetBitmap("유저인터페이스\\btn_cancel_b.bmp", 2, 0); @@ -1490,18 +1490,18 @@ void UIMerchantItemPurchaseMSGWnd::Slot15(int, int) { this->cancelButton->SetId(185); this->AddChild(this->cancelButton); - this->firstLine = new UIStaticText(*this->m_context); + this->firstLine = new UIStaticText(); this->firstLine->SetSize(200, 15); this->firstLine->SetText(LookupMessage(2327), 0); this->firstLine->Move(10, 20); this->AddChild(this->firstLine); - this->secondLine = new UIStaticText(*this->m_context); + this->secondLine = new UIStaticText(); this->secondLine->SetSize(200, 15); this->secondLine->Move(10, 40); this->AddChild(this->secondLine); - this->thirdLine = new UIStaticText(*this->m_context); + this->thirdLine = new UIStaticText(); this->thirdLine->SetSize(200, 15); this->thirdLine->SetText(LookupMessage(2329), 0); this->thirdLine->Move(10, 60); @@ -2316,7 +2316,7 @@ void UIMerchantShopMakeWnd::SendShopRequest() { // OFFSET: 0x00974820 // FUNCTION: fn_13306 void UIMerchantShopMakeWnd::AddActionButton() { - this->unknown_0168 = new UIBasicButton(*this->m_context); + this->unknown_0168 = new UIBasicButton(); this->unknown_0168->Configure(60, LookupMessage(3637)); this->unknown_0168->Move(this->geometry.width - 156, this->geometry.height - 24); this->unknown_0168->SetTooltip(LookupMessage(3638)); @@ -2563,7 +2563,7 @@ void UIMerchantShopMakeWnd::SetItems(int count, const short* ids) { void UIMerchantItemMyShopWnd::OpenShop() { this->shopOpen = 1; if (!this->actionButton) { - this->actionButton = new UIBasicButton(*this->m_context); + this->actionButton = new UIBasicButton(); this->actionButton->Configure(42, LookupMessage(2925)); this->actionButton->Move(this->geometry.width - this->actionButton->geometry.width - 66, this->geometry.height - 24); this->actionButton->SetId(506); @@ -3066,7 +3066,7 @@ void UIMerchantItemWnd::Slot10(int x, int y, std::intptr_t value) { // FUNCTION: fn_13321 void UIMerchantItemShopWnd::Slot15(int width, int height) { if (this->unknown_010C) { - this->notice = new UIStaticText(*this->m_context); + this->notice = new UIStaticText(); this->notice->SetSize(160, 15); char text[80]; std::sprintf(text, LookupMessage(1735), 0); @@ -3270,7 +3270,7 @@ std::string UIEditCtrl3::PlaceLineLinks(const char* line, std::string& text, con break; } - UIItemTagButton* button = new (std::nothrow) UIItemTagButton(*this->m_context); + UIItemTagButton* button = new (std::nothrow) UIItemTagButton(); reinterpret_cast(button->unknown_00F8) = item; button->Configure(name.c_str(), 0x82F2E1, 0, 12, 0, 0); button->SetTooltip(item.DisplayName(0).c_str()); @@ -3427,20 +3427,20 @@ void UIEditCtrl3::WrapLines(std::vector& lines) { // OFFSET: 0x00975CD0 // FUNCTION: fn_13310 void UIItemSellWnd2::Slot15(int width, int height) { - this->total = new UIStaticText(*this->m_context); + this->total = new UIStaticText(); this->total->SetSize(160, 15); this->total->SetTextAutoWidth(""); this->total->Move(12, this->geometry.height - 21); this->AddChild(this->total); - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize(90, 15); title->SetText(LookupMessage(1569), 0); title->Move(16, 2); title->shadow = 1; this->AddChild(title); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(3); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3448,7 +3448,7 @@ void UIItemSellWnd2::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -3458,7 +3458,7 @@ void UIItemSellWnd2::Slot15(int width, int height) { int positions[2][2] = {{this->geometry.width - 106, this->geometry.height - 24}, {this->geometry.width - 61, this->geometry.height - 24}}; int ids[2] = {184, 185}; for (int index = 0; index < 2; ++index) { - this->buttons[index] = new UIBitmapButton(*this->m_context); + this->buttons[index] = new UIBitmapButton(); UIBitmapButton* button = static_cast(this->buttons[index]); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); @@ -3477,7 +3477,7 @@ void UIItemSellWnd2::Slot15(int width, int height) { // OFFSET: 0x009768A0 // FUNCTION: fn_13311 void UIItemSellWnd::Slot15(int width, int height) { - this->total = new UIStaticText(*this->m_context); + this->total = new UIStaticText(); this->total->SetSize(160, 15); char text[80]; std::sprintf(text, "Total : %d Zeny", 0); @@ -3485,14 +3485,14 @@ void UIItemSellWnd::Slot15(int width, int height) { this->total->Move(12, this->geometry.height - 21); this->AddChild(this->total); - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize(90, 15); title->SetText(LookupMessage(168), 0); title->Move(16, 2); title->shadow = 1; this->AddChild(title); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(3); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3500,7 +3500,7 @@ void UIItemSellWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -3510,7 +3510,7 @@ void UIItemSellWnd::Slot15(int width, int height) { int positions[2][2] = {{this->geometry.width - 106, this->geometry.height - 24}, {this->geometry.width - 61, this->geometry.height - 24}}; int ids[2] = {184, 185}; for (int index = 0; index < 2; ++index) { - this->buttons[index] = new UIBitmapButton(*this->m_context); + this->buttons[index] = new UIBitmapButton(); UIBitmapButton* button = static_cast(this->buttons[index]); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); @@ -3529,14 +3529,14 @@ void UIItemSellWnd::Slot15(int width, int height) { // OFFSET: 0x00977510 // FUNCTION: fn_13312 void UIItemShopWnd2::Slot15(int width, int height) { - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(70, 15); this->title->SetText(LookupMessage(167), 0); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3544,14 +3544,14 @@ void UIItemShopWnd2::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - this->checkBox = new UICheckBox(*this->m_context); + this->checkBox = new UICheckBox(); this->checkBox->SetSize(200, 12); this->checkBox->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(295)); this->checkBox->Move(12, this->geometry.height - 20); this->checkBox->SetChecked(g_windowMgr.unknown_0064); this->AddChild(this->checkBox); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - this->unknown_0108 - this->unknown_0104 - 17); this->AddChild(this->scrollBar); @@ -3564,14 +3564,14 @@ void UIItemShopWnd2::Slot15(int width, int height) { // OFFSET: 0x009777B0 // FUNCTION: fn_13313 void UIItemShopWnd::Slot15(int width, int height) { - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(70, 15); this->title->SetText(LookupMessage(167), 0); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3579,14 +3579,14 @@ void UIItemShopWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - this->checkBox = new UICheckBox(*this->m_context); + this->checkBox = new UICheckBox(); this->checkBox->SetSize(200, 12); this->checkBox->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(295)); this->checkBox->Move(12, this->geometry.height - 20); this->checkBox->SetChecked(g_windowMgr.unknown_0064); this->AddChild(this->checkBox); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - this->unknown_0108 - this->unknown_0104 - 17); this->AddChild(this->scrollBar); @@ -3599,20 +3599,20 @@ void UIItemShopWnd::Slot15(int width, int height) { // OFFSET: 0x00977A50 // FUNCTION: fn_13314 void UIItemStoreFindWnd::Slot15(int width, int height) { - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); static_cast(this->scrollBar)->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); char text[64]; std::sprintf(text, "서브창고"); - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(this->geometry.width - 32, 15); this->title->SetTextFitted(text); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - this->resizeHandle = new UIResizer(*this->m_context); + this->resizeHandle = new UIResizer(); this->resizeHandle->SetSize(16, 16); this->resizeHandle->SetDirection(7); this->resizeHandle->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3627,20 +3627,20 @@ void UIItemStoreFindWnd::Slot15(int width, int height) { // OFFSET: 0x00977C40 // FUNCTION: fn_13315 void UIItemStoreSubWnd::Slot15(int width, int height) { - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); static_cast(this->scrollBar)->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); char text[64]; std::sprintf(text, "서브창고"); - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(this->geometry.width - 32, 15); this->title->SetTextFitted(text); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - this->resizeHandle = new UIResizer(*this->m_context); + this->resizeHandle = new UIResizer(); this->resizeHandle->SetSize(16, 16); this->resizeHandle->SetDirection(7); this->resizeHandle->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3652,14 +3652,14 @@ void UIItemStoreSubWnd::Slot15(int width, int height) { // OFFSET: 0x0097BD30 // FUNCTION: fn_13322 void UIMerchantItemWnd::Slot15(int width, int height) { - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize(90, 15); title->SetText(LookupMessage(222), 0); title->Move(16, 2); title->shadow = 1; this->AddChild(title); - this->info = new UIStaticText(*this->m_context); + this->info = new UIStaticText(); this->info->SetSize(220, 15); char text[128]; std::sprintf(text, "Num: %d/%d Weight: %d/%d", g_session.cartCount, g_session.cartMaxCount, g_session.cartWeight, g_session.cartMaxWeight); @@ -3667,7 +3667,7 @@ void UIMerchantItemWnd::Slot15(int width, int height) { this->info->Move(16, this->geometry.height - 19); this->AddChild(this->info); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3675,7 +3675,7 @@ void UIMerchantItemWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -3690,7 +3690,7 @@ void UIMerchantItemWnd::Slot15(int width, int height) { // OFFSET: 0x0097BFF0 // FUNCTION: fn_13323 void UIMerchantMirrorItemWnd::Slot15(int width, int height) { - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize(150, 15); int messageId; if (this->unknown_00F4 == 1) { @@ -3705,7 +3705,7 @@ void UIMerchantMirrorItemWnd::Slot15(int width, int height) { title->shadow = 1; this->AddChild(title); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -3713,7 +3713,7 @@ void UIMerchantMirrorItemWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -5316,7 +5316,7 @@ int UIMerchantItemShopWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x0097AA00 // FUNCTION: fn_13320 void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { - this->total = new UIStaticText(*this->m_context); + this->total = new UIStaticText(); this->total->SetSize(160, 15); char text[80]; std::sprintf(text, "Total : %d Zeny", 0); @@ -5324,7 +5324,7 @@ void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { this->total->Move(12, this->geometry.height - 21); this->AddChild(this->total); - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize(160, 15); title->SetText(LookupMessage(this->unknown_0108 ? 168 : 228), 0); title->Move(16, 2); @@ -5337,7 +5337,7 @@ void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { if (this->unknown_0108) { const char* names[2][3] = {{"btn_sell", "btn_sell_a", "btn_sell_b"}, {"btn_cancel", "btn_cancel_a", "btn_cancel_b"}}; for (int index = 0; index < 2; ++index) { - this->buttons[index] = new UIBitmapButton(*this->m_context); + this->buttons[index] = new UIBitmapButton(); UIBitmapButton* button = static_cast(this->buttons[index]); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); @@ -5350,7 +5350,7 @@ void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { } else { const char* names[2][3] = {{"btn_buy", "btn_buy_a", "btn_buy_b"}, {"btn_cancel", "btn_cancel_a", "btn_cancel_b"}}; for (int index = 0; index < 2; ++index) { - this->buttons[index] = new UIBitmapButton(*this->m_context); + this->buttons[index] = new UIBitmapButton(); UIBitmapButton* button = static_cast(this->buttons[index]); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); @@ -5372,7 +5372,7 @@ void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { // FUNCTION: fn_13318 void UIMerchantItemMyShopWnd::Slot15(int width, int height) { if (this->unknown_0100) { - this->notice = new UIStaticText(*this->m_context); + this->notice = new UIStaticText(); this->notice->SetSize(160, 15); char text[80]; std::sprintf(text, LookupMessage(1735), 0); @@ -5381,14 +5381,14 @@ void UIMerchantItemMyShopWnd::Slot15(int width, int height) { this->AddChild(this->notice); } - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(240, 15); this->title->SetText(LookupMessage(this->unknown_0100 ? 1734 : 3237), 0); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -5396,12 +5396,12 @@ void UIMerchantItemMyShopWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - this->unknown_011C - 17); this->AddChild(this->scrollBar); - this->saleAlarm = new UICheckBox(*this->m_context); + this->saleAlarm = new UICheckBox(); this->saleAlarm->SetSize(240, 12); this->saleAlarm->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(this->unknown_0100 ? 2698 : 2642)); this->saleAlarm->FitToText(); @@ -5414,7 +5414,7 @@ void UIMerchantItemMyShopWnd::Slot15(int width, int height) { int positions[1][2] = {{this->geometry.width - 61, this->geometry.height - 24}}; int ids[1] = {201}; for (int index = 0; index < 1; ++index) { - this->buttons[index] = new UIBitmapButton(*this->m_context); + this->buttons[index] = new UIBitmapButton(); UIBitmapButton* button = static_cast(this->buttons[index]); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); @@ -6232,8 +6232,8 @@ bool UIEditCtrl::DecodeItemLink(const std::vector& values, ITEM_INFO& item) // OFFSET: 0x0096E650 // FUNCTION: fn_13214 -UIItemBaseWnd::UIItemBaseWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0), resizer(nullptr), scrollBar(nullptr), scroll(0), unknown_00E4(0) { +UIItemBaseWnd::UIItemBaseWnd() + : UIFrameWnd(0), resizer(nullptr), scrollBar(nullptr), scroll(0), unknown_00E4(0) { this->showQuantity = 1; this->unknown_00B8 = 0; this->buttons[0] = nullptr; @@ -6243,12 +6243,12 @@ UIItemBaseWnd::UIItemBaseWnd(UIWindowContext& windowContext) // OFFSET: 0x0096E750 // FUNCTION: fn_13215 -UIItemDropCntWnd::UIItemDropCntWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIItemDropCntWnd::UIItemDropCntWnd() : UIFrameWnd(0) { } // OFFSET: 0x0096E7B0 // FUNCTION: fn_13216 -UIItemPurchaseWnd::UIItemPurchaseWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemPurchaseWnd::UIItemPurchaseWnd() : UIItemBaseWnd() { this->hovered = -1; this->unknown_00B8 = 1; this->unknown_00FC = 0; @@ -6257,7 +6257,7 @@ UIItemPurchaseWnd::UIItemPurchaseWnd(UIWindowContext& windows) : UIItemBaseWnd(w // OFFSET: 0x0096E830 // FUNCTION: fn_13217 -UIItemSellWnd2::UIItemSellWnd2(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemSellWnd2::UIItemSellWnd2() : UIItemBaseWnd() { this->hovered = -1; this->unknown_00B8 = 1; this->saved = nullptr; @@ -6266,7 +6266,7 @@ UIItemSellWnd2::UIItemSellWnd2(UIWindowContext& windows) : UIItemBaseWnd(windows // OFFSET: 0x0096E8B0 // FUNCTION: fn_13218 -UIItemSellWnd::UIItemSellWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemSellWnd::UIItemSellWnd() : UIItemBaseWnd() { this->hovered = -1; this->unknown_00B8 = 1; this->saved = nullptr; @@ -6274,7 +6274,7 @@ UIItemSellWnd::UIItemSellWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) // OFFSET: 0x0096E930 // FUNCTION: fn_13219 -UIItemShopWnd2::UIItemShopWnd2(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemShopWnd2::UIItemShopWnd2() : UIItemBaseWnd() { this->hovered = -1; this->showQuantity = 0; this->unknown_00F8 = 0; @@ -6286,7 +6286,7 @@ UIItemShopWnd2::UIItemShopWnd2(UIWindowContext& windows) : UIItemBaseWnd(windows // OFFSET: 0x0096E9D0 // FUNCTION: fn_13220 -UIItemShopWnd::UIItemShopWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemShopWnd::UIItemShopWnd() : UIItemBaseWnd() { this->hovered = -1; this->showQuantity = 0; this->unknown_00F8 = 0; @@ -6299,7 +6299,7 @@ UIItemShopWnd::UIItemShopWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) // OFFSET: 0x0096EA80 // FUNCTION: fn_13221 -UIItemStoreFindWnd::UIItemStoreFindWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemStoreFindWnd::UIItemStoreFindWnd() : UIItemBaseWnd() { this->saved = nullptr; this->scrollBar = nullptr; this->scroll = 0; @@ -6311,7 +6311,7 @@ UIItemStoreFindWnd::UIItemStoreFindWnd(UIWindowContext& windows) : UIItemBaseWnd // OFFSET: 0x0096EB70 // FUNCTION: fn_13222 -UIItemStoreSubWnd::UIItemStoreSubWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemStoreSubWnd::UIItemStoreSubWnd() : UIItemBaseWnd() { this->saved = nullptr; this->scrollBar = nullptr; this->scroll = 0; @@ -6323,7 +6323,7 @@ UIItemStoreSubWnd::UIItemStoreSubWnd(UIWindowContext& windows) : UIItemBaseWnd(w // OFFSET: 0x0096EC60 // FUNCTION: fn_13223 -UIItemStoreWnd::UIItemStoreWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemStoreWnd::UIItemStoreWnd() : UIItemBaseWnd() { this->unknown_016C = 0; this->unknown_0170 = 0; this->unknown_0174 = 0; @@ -6348,7 +6348,7 @@ UIItemStoreWnd::UIItemStoreWnd(UIWindowContext& windows) : UIItemBaseWnd(windows // OFFSET: 0x009792B0 // FUNCTION: fn_13317 void UIItemWnd::Slot15(int width, int height) { - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -6356,7 +6356,7 @@ void UIItemWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 17, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -6369,7 +6369,7 @@ void UIItemWnd::Slot15(int width, int height) { this->visibleRows = (height - 38) / 32; this->SendMsg(nullptr, 23, 0, 0, 0, 0); - this->tabs = new (std::nothrow) UITabControl(*this->m_context); + this->tabs = new (std::nothrow) UITabControl(); this->tabs->Configure(0, 17, 10, 1, 0, 1, 0, 0, 0, 0, 0, 0); this->tabs->Move(3, 18); this->AddChild(this->tabs); @@ -6381,7 +6381,7 @@ void UIItemWnd::Slot15(int width, int height) { this->tabs->colors[3] = SkinPaletteColor(ResourceMgr::Instance(), cell, g_skinInfo.Selected()); this->tabs->Invalidate(); - this->lockDropBox = new (std::nothrow) UICheckBox(*this->m_context); + this->lockDropBox = new (std::nothrow) UICheckBox(); this->lockDropBox->SetSize(14, 11); this->lockDropBox->SetBitmaps("유저인터페이스\\inventory\\item_drop_lock_on.bmp", "유저인터페이스\\inventory\\item_drop_lock_off.bmp"); this->lockDropBox->Move(79, height - 16); @@ -6389,7 +6389,7 @@ void UIItemWnd::Slot15(int width, int height) { this->lockDropBox->SetTooltip(LookupMessage(2843)); this->AddChild(this->lockDropBox); - UICheckBox* compare = new (std::nothrow) UICheckBox(*this->m_context); + UICheckBox* compare = new (std::nothrow) UICheckBox(); this->optionBox = compare; compare->SetSize(12, 12); static_cast(this->optionBox)->SetBitmaps("유저인터페이스\\inventory\\item_compare_on.bmp", "유저인터페이스\\inventory\\item_compare_off.bmp"); @@ -6399,7 +6399,7 @@ void UIItemWnd::Slot15(int width, int height) { static_cast(this->optionBox)->SetTooltip(LookupMessage(2842)); this->AddChild(this->optionBox); - this->countButton = new (std::nothrow) UIBitmapButton(*this->m_context); + this->countButton = new (std::nothrow) UIBitmapButton(); this->countButton->SetBitmap("유저인터페이스\\inventory\\icon_num.bmp", 0, 0); this->countButton->SetBitmap("유저인터페이스\\inventory\\icon_num.bmp", 1, 0); this->countButton->SetBitmap("유저인터페이스\\inventory\\icon_num.bmp", 2, 0); @@ -6409,7 +6409,7 @@ void UIItemWnd::Slot15(int width, int height) { this->countButton->SetTooltip(LookupMessage(3560)); this->AddChild(this->countButton); - UIBitmapButton* lockDeal = new UIBitmapButton(*this->m_context); + UIBitmapButton* lockDeal = new UIBitmapButton(); this->unknown_0124 = lockDeal; lockDeal->SetBitmap(g_session.m_blockPrivateTab != 1 ? "유저인터페이스\\inventory\\bt_itemDeal_lock_off.bmp" : "유저인터페이스\\inventory\\bt_itemdeal_lock_on.bmp", 0, 0); static_cast(this->unknown_0124)->SetBitmap("유저인터페이스\\inventory\\bt_itemDeal_lock_over.bmp", 1, 0); @@ -6420,7 +6420,7 @@ void UIItemWnd::Slot15(int width, int height) { this->unknown_0124->SetId(507); this->AddChild(this->unknown_0124); - this->unknown_012C = new UIBitmapButton(*this->m_context); + this->unknown_012C = new UIBitmapButton(); this->RefreshSortButton(); this->unknown_012C->SetSize(static_cast(this->unknown_012C)->BitmapWidth(), static_cast(this->unknown_012C)->BitmapHeight()); this->unknown_012C->Move(157, this->geometry.height - 19); @@ -6430,7 +6430,7 @@ void UIItemWnd::Slot15(int width, int height) { // OFFSET: 0x0096ED90 // FUNCTION: fn_13224 -UIItemWnd::UIItemWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIItemWnd::UIItemWnd() : UIItemBaseWnd() { this->unknown_0124 = 0; this->unknown_0128 = nullptr; this->unknown_012C = 0; @@ -6447,7 +6447,7 @@ UIItemWnd::UIItemWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { // OFFSET: 0x0096EE60 // FUNCTION: fn_13225 -UIMerchantItemMyShopWnd::UIMerchantItemMyShopWnd(UIWindowContext& windows, int value) : UIItemBaseWnd(windows) { +UIMerchantItemMyShopWnd::UIMerchantItemMyShopWnd(int value) : UIItemBaseWnd() { this->unknown_0100 = value; this->startTick = 0; this->duration = 0; @@ -6461,8 +6461,8 @@ UIMerchantItemMyShopWnd::UIMerchantItemMyShopWnd(UIWindowContext& windows, int v // OFFSET: 0x0096EF10 // FUNCTION: fn_13226 -UIMerchantItemPurchaseMSGWnd::UIMerchantItemPurchaseMSGWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0) { +UIMerchantItemPurchaseMSGWnd::UIMerchantItemPurchaseMSGWnd() + : UIFrameWnd(0) { this->title = nullptr; this->firstLine = nullptr; this->thirdLine = nullptr; @@ -6474,7 +6474,7 @@ UIMerchantItemPurchaseMSGWnd::UIMerchantItemPurchaseMSGWnd(UIWindowContext& wind // OFFSET: 0x0096EFC0 // FUNCTION: fn_13227 -UIMerchantItemPurchaseWnd::UIMerchantItemPurchaseWnd(UIWindowContext& windows, int value) : UIItemBaseWnd(windows) { +UIMerchantItemPurchaseWnd::UIMerchantItemPurchaseWnd(int value) : UIItemBaseWnd() { this->unknown_0108 = value; this->unknown_00B8 = 1; this->unknown_00F8 = 0; @@ -6486,7 +6486,7 @@ UIMerchantItemPurchaseWnd::UIMerchantItemPurchaseWnd(UIWindowContext& windows, i // OFFSET: 0x0096F060 // FUNCTION: fn_13228 -UIMerchantItemShopWnd::UIMerchantItemShopWnd(UIWindowContext& windows, int value) : UIItemBaseWnd(windows) { +UIMerchantItemShopWnd::UIMerchantItemShopWnd(int value) : UIItemBaseWnd() { this->unknown_0108 = 0; this->unknown_010C = value; this->startTick = 0; @@ -6500,14 +6500,14 @@ UIMerchantItemShopWnd::UIMerchantItemShopWnd(UIWindowContext& windows, int value // OFFSET: 0x0096F110 // FUNCTION: fn_13229 -UIMerchantItemWnd::UIMerchantItemWnd(UIWindowContext& windows) : UIItemBaseWnd(windows) { +UIMerchantItemWnd::UIMerchantItemWnd() : UIItemBaseWnd() { this->unknown_00B8 = 1; this->saved = nullptr; } // OFFSET: 0x0096F180 // FUNCTION: fn_13230 -UIMerchantMirrorItemWnd::UIMerchantMirrorItemWnd(UIWindowContext& windows, int value) : UIItemBaseWnd(windows) { +UIMerchantMirrorItemWnd::UIMerchantMirrorItemWnd(int value) : UIItemBaseWnd() { this->unknown_00F4 = value; this->unknown_00B8 = 1; this->saved = nullptr; @@ -6515,7 +6515,7 @@ UIMerchantMirrorItemWnd::UIMerchantMirrorItemWnd(UIWindowContext& windows, int v // OFFSET: 0x0096F3A0 // FUNCTION: fn_13232 -UINoticeMessageBox_LockSellItem::UINoticeMessageBox_LockSellItem(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UINoticeMessageBox_LockSellItem::UINoticeMessageBox_LockSellItem() : UIFrameWnd(0) { this->startTick = timeGetTime(); this->duration = 2000; } @@ -7679,7 +7679,7 @@ int UIItemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intp normal = "유저인터페이스\\inventory\\bt_itemDeal_lock_off.bmp"; } else { if (!this->unknown_0128) { - this->unknown_0128 = new UINoticeMessageBox_LockSellItem(*this->m_context); + this->unknown_0128 = new UINoticeMessageBox_LockSellItem(); this->unknown_0128->SetSize(242, 26); this->unknown_0128->Move(30, this->geometry.height - 50); this->AddChild(this->unknown_0128); @@ -9071,7 +9071,7 @@ void UIItemPurchaseWnd::Slot15(int width, int height) { caption->shadow = 1; this->AddChild(caption); - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(3); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -9079,7 +9079,7 @@ void UIItemPurchaseWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); diff --git a/Source/UI/Edit/UIEditCtrl.h b/Source/UI/Edit/UIEditCtrl.h index f4b0bc65..6ad9cdf0 100644 --- a/Source/UI/Edit/UIEditCtrl.h +++ b/Source/UI/Edit/UIEditCtrl.h @@ -22,8 +22,9 @@ class UIEditCtrl : public UIWindow { public: UIEditCtrl(); + UIEditCtrl(UIWindowContext&) : UIEditCtrl() { + } UIEditCtrl(const UIEditCtrl& other); - UIEditCtrl(UIWindowContext& windows); ~UIEditCtrl() override; bool Slot05() override; void Paint() override; @@ -93,14 +94,14 @@ private: class UIEditCtrlWheel : public UIEditCtrl { public: - UIEditCtrlWheel(UIWindowContext& windows); + UIEditCtrlWheel(); ~UIEditCtrlWheel() override; void Slot35(int value) override; }; class UIEditCtrl2 : public UIEditCtrl { public: - UIEditCtrl2(UIWindowContext& windows); + UIEditCtrl2(); ~UIEditCtrl2() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; @@ -108,7 +109,8 @@ public: class UIEditCtrl3 : public UIEditCtrl2 { public: UIEditCtrl3(); - UIEditCtrl3(UIWindowContext& windows); + UIEditCtrl3(UIWindowContext&) : UIEditCtrl3() { + } UIEditCtrl3(const UIEditCtrl3& other); ~UIEditCtrl3() override; void Slot15(int width, int height) override; @@ -170,7 +172,7 @@ public: class UIEditCtrl4 : public UIEditCtrl { public: - UIEditCtrl4(UIWindowContext& windows); + UIEditCtrl4(); ~UIEditCtrl4() override; void Slot23() override; void PaintText() override; @@ -185,7 +187,7 @@ public: class UIEditCtrl5 : public UIEditCtrl4 { public: - UIEditCtrl5(UIWindowContext& windows); + UIEditCtrl5(); ~UIEditCtrl5() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; @@ -201,7 +203,6 @@ public: class UIChatEditCtrl : public UIEditCtrl { public: UIChatEditCtrl(); - UIChatEditCtrl(UIWindowContext& windows); void Paint() override; void Slot25(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -218,7 +219,7 @@ public: class UIEditCtrl_OldList : public UIEditCtrl { public: - UIEditCtrl_OldList(UIWindowContext& windows); + UIEditCtrl_OldList(); void Paint() override; void Slot35(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -230,7 +231,7 @@ public: class UIWhisperEditCtrl : public UIEditCtrl { public: - UIWhisperEditCtrl(UIWindowContext& windows); + UIWhisperEditCtrl(); void Slot23() override; void Slot24(int retained) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -243,9 +244,7 @@ public: class UIEditCtrlVarId : public UIEditCtrl { public: // INLINED - UIEditCtrlVarId(UIWindowContext& windows) : UIEditCtrl(windows) {} - // INLINED - UIEditCtrlVarId() {} + UIEditCtrlVarId() : UIEditCtrl() {} void Slot24(int retained) override; void Slot35(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -257,7 +256,7 @@ bool HasNaviLinkTag(const std::string& text); class UIShowAndEditTimeCtrl : public UIWindow { public: - explicit UIShowAndEditTimeCtrl(UIWindowContext& windows); + UIShowAndEditTimeCtrl(); void Paint() override; void Slot15(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Edit/UIEditCtrl_Currency.cpp b/Source/UI/Edit/UIEditCtrl_Currency.cpp index 540db947..88c6e042 100644 --- a/Source/UI/Edit/UIEditCtrl_Currency.cpp +++ b/Source/UI/Edit/UIEditCtrl_Currency.cpp @@ -2,13 +2,13 @@ // OFFSET: 0x0086D250 // FUNCTION: fn_11043 -UIEditCtrl_Custom::UIEditCtrl_Custom(UIWindowContext& windows) - : UIEditCtrl2(windows), unknown_011C(0), unknown_0120(0), unknown_0124(0), unknown_0128(0) { +UIEditCtrl_Custom::UIEditCtrl_Custom() + : UIEditCtrl2(), unknown_011C(0), unknown_0120(0), unknown_0124(0), unknown_0128(0) { } // OFFSET: 0x0086D1B0 // FUNCTION: fn_11042 -UIEditCtrl_Currency::UIEditCtrl_Currency(UIWindowContext& windows) : UIEditCtrl_Custom(windows) { +UIEditCtrl_Currency::UIEditCtrl_Currency() : UIEditCtrl_Custom() { this->unknown_0128 = 1; this->formattedLength = 0; } diff --git a/Source/UI/Edit/UIEditCtrl_Currency.h b/Source/UI/Edit/UIEditCtrl_Currency.h index 9f961802..b057bea5 100644 --- a/Source/UI/Edit/UIEditCtrl_Currency.h +++ b/Source/UI/Edit/UIEditCtrl_Currency.h @@ -9,7 +9,6 @@ class UIEditCtrl_Custom : public UIEditCtrl2 { public: UIEditCtrl_Custom(); - UIEditCtrl_Custom(UIWindowContext& windows); void PaintText() override; void Synchronize() override; void Trim() override; @@ -24,7 +23,6 @@ public: class UIEditCtrl_Currency : public UIEditCtrl_Custom { public: UIEditCtrl_Currency(); - UIEditCtrl_Currency(UIWindowContext& windows); void Slot19() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Edit/UIEditCtrl_OldList.cpp b/Source/UI/Edit/UIEditCtrl_OldList.cpp index 77b4aa36..bba0b660 100644 --- a/Source/UI/Edit/UIEditCtrl_OldList.cpp +++ b/Source/UI/Edit/UIEditCtrl_OldList.cpp @@ -2,6 +2,6 @@ // OFFSET: 0x0084FCC0 // FUNCTION: fn_10664 -UIEditCtrl_OldList::UIEditCtrl_OldList(UIWindowContext& windows) : UIEditCtrl(windows), historyIndex(-1) { +UIEditCtrl_OldList::UIEditCtrl_OldList() : UIEditCtrl(), historyIndex(-1) { this->textY = 3; } diff --git a/Source/UI/Edit/UIEditLinks.cpp b/Source/UI/Edit/UIEditLinks.cpp index 8f849289..d14d75c8 100644 --- a/Source/UI/Edit/UIEditLinks.cpp +++ b/Source/UI/Edit/UIEditLinks.cpp @@ -257,7 +257,7 @@ void UIEditCtrl::InsertLink(const char* value) { this->anchor = this->cursor = static_cast(this->text.size()); g_serverLanguage->Select(this->cursor, this->cursor); - auto* button = new UINaviLinkButton(*this->m_context); + auto* button = new UINaviLinkButton(); button->Configure(display.c_str(), 0x009E68F0, 0, 12, 0, 0); button->SetId(438); diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index 82641b76..804de965 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -23,7 +23,7 @@ // OFFSET: 0x0084F250 // FUNCTION: fn_10657 -UIEditCtrl2::UIEditCtrl2(UIWindowContext& windows) : UIEditCtrl(windows) { +UIEditCtrl2::UIEditCtrl2() : UIEditCtrl() { } // OFFSET: 0x008515E0 @@ -296,7 +296,7 @@ void UIEditCtrl3::HandleInputMessage(unsigned key, std::intptr_t data) { // OFFSET: 0x0084F570 // FUNCTION: fn_10659 -UIEditCtrl3::UIEditCtrl3(UIWindowContext& windows) : UIEditCtrl2(windows) { +UIEditCtrl3::UIEditCtrl3() : UIEditCtrl2() { this->unknown_0130 = 0; this->unknown_0134 = 0; this->unknown_0138 = 14; @@ -370,7 +370,7 @@ UIEditCtrl3::~UIEditCtrl3() { // OFFSET: 0x0085AC40 // FUNCTION: fn_10786 void UIEditCtrl3::Slot15(int width, int height) { - auto* scrollBar = new UIScrollBar(*this->m_context); + auto* scrollBar = new UIScrollBar(); this->unknown_0130 = scrollBar; scrollBar->Configure(width - 10, 0, 1, height); this->AddChild(scrollBar); @@ -749,7 +749,7 @@ int UIEditCtrl::MeasureText(const std::string& text, const int& bytes) { // OFFSET: 0x0084F7B0 // FUNCTION: fn_10660 -UIEditCtrl4::UIEditCtrl4(UIWindowContext& windows) : UIEditCtrl(windows), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) { +UIEditCtrl4::UIEditCtrl4() : UIEditCtrl(), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) { } // OFFSET: 0x00852870 @@ -805,7 +805,7 @@ void UIEditCtrl4::SetPlaceholderColor(std::uint32_t color) { // OFFSET: 0x0084F7B0 // FUNCTION: fn_10661 -UIEditCtrl5::UIEditCtrl5(UIWindowContext& windows) : UIEditCtrl4(windows) { +UIEditCtrl5::UIEditCtrl5() : UIEditCtrl4() { } // OFFSET: 0x008528F0 @@ -911,7 +911,7 @@ void UIBitmapEditCtrl::SetBitmapName(const char* name) { // OFFSET: 0x0084EE90 // FUNCTION: fn_10654 -UIChatEditCtrl::UIChatEditCtrl(UIWindowContext& windows) : UIEditCtrl(windows), unknown_0140(0), historyLimit(30) { +UIChatEditCtrl::UIChatEditCtrl() : UIEditCtrl(), unknown_0140(0), historyLimit(30) { this->history.reserve(this->historyLimit); this->unknown_0144 = 0; } @@ -1054,7 +1054,7 @@ int UIEditCtrl_OldList::SendMsg(UIWindow* sender, int message, std::intptr_t arg void UIShowAndEditTimeCtrl::Slot15(int, int) { for (int i = 0; i < 2; ++i) { UIEditCtrlVarId*& field = this->fields[i]; - field = new UIEditCtrlVarId(*this->m_context); + field = new UIEditCtrlVarId(); field->SetSize(20, 18); field->Background(232, 232, 232); field->Border(192, 192, 192); @@ -1111,7 +1111,7 @@ void UIEditCtrl3::ClearLineState() { // OFFSET: 0x0086E7D0 // FUNCTION: fn_11077 -UIShowAndEditTimeCtrl::UIShowAndEditTimeCtrl(UIWindowContext& windows) : UIWindow(windows, 0) { +UIShowAndEditTimeCtrl::UIShowAndEditTimeCtrl() : UIWindow(0) { this->unknown_0084 = 0; this->unknown_0088 = 0; } diff --git a/Source/UI/Edit/UIWhisperEditCtrl.cpp b/Source/UI/Edit/UIWhisperEditCtrl.cpp index 58cbebd2..997c0e5a 100644 --- a/Source/UI/Edit/UIWhisperEditCtrl.cpp +++ b/Source/UI/Edit/UIWhisperEditCtrl.cpp @@ -2,5 +2,5 @@ // OFFSET: 0x00850890 // FUNCTION: fn_10681 -UIWhisperEditCtrl::UIWhisperEditCtrl(UIWindowContext& windows) : UIEditCtrl(windows), historyIndex(0) { +UIWhisperEditCtrl::UIWhisperEditCtrl() : UIEditCtrl(), historyIndex(0) { } diff --git a/Source/UI/Emotion/UIEmotionWnd.cpp b/Source/UI/Emotion/UIEmotionWnd.cpp index 5d8882ee..d97be016 100644 --- a/Source/UI/Emotion/UIEmotionWnd.cpp +++ b/Source/UI/Emotion/UIEmotionWnd.cpp @@ -27,7 +27,7 @@ UIBitmapButton* UIEmotionWnd::AddCloseButton(const char* tooltip, int width) { width = this->geometry.width; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_off.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 2, 0); @@ -47,7 +47,7 @@ void UIEmotionWnd::Slot15(int, int) { auto* emotions = reinterpret_cast(&g_session.unknown_0FF8); for (int i = 0; i < 10; ++i) { - UIEditCtrl2* edit = new UIEditCtrl2(*this->m_context); + UIEditCtrl2* edit = new UIEditCtrl2(); this->m_edits[i] = edit; edit->SetSize(270, 16); edit->Move(83, y - 3); @@ -59,7 +59,7 @@ void UIEmotionWnd::Slot15(int, int) { char buffer[16]; std::sprintf(buffer, "Alt + %d", i + 1); - UIStaticText* label = new UIStaticText(*this->m_context); + UIStaticText* label = new UIStaticText(); this->m_labels[i] = label; label->SetSize(70, 16); label->Move(20, y); @@ -73,7 +73,7 @@ void UIEmotionWnd::Slot15(int, int) { this->UIFrameWnd::AddCloseButton("Alt+M", 0); std::string path = "유저인터페이스\\"; - this->viewButton = new UIBitmapButton(*this->m_context); + this->viewButton = new UIBitmapButton(); this->viewButton->SetBitmap((path + "btn_view" + ".bmp").c_str(), 0, 0); this->viewButton->SetBitmap((path + "btn_view_a" + ".bmp").c_str(), 1, 0); this->viewButton->SetBitmap((path + "btn_view_b" + ".bmp").c_str(), 2, 0); diff --git a/Source/UI/Enchant/EnchantUI.h b/Source/UI/Enchant/EnchantUI.h index e267680f..54078ab8 100644 --- a/Source/UI/Enchant/EnchantUI.h +++ b/Source/UI/Enchant/EnchantUI.h @@ -94,8 +94,8 @@ public: class CUIIngredient : public CUIControl { public: - explicit CUIIngredient(UIWindowContext& context) - : CUIControl(context), unknown_0080(nullptr), unknown_0084(nullptr), itemIcon(nullptr), ownedText(nullptr), requiredText(nullptr) { + explicit CUIIngredient() + : CUIControl(), unknown_0080(nullptr), unknown_0084(nullptr), itemIcon(nullptr), ownedText(nullptr), requiredText(nullptr) { } /* 0080 */ CUIStaticImage* unknown_0080; @@ -111,7 +111,7 @@ public: #pragma pack(push, 4) class CUIEnchantPage : public CUIControl { public: - explicit CUIEnchantPage(UIWindowContext& context); + CUIEnchantPage(); union { /* 0080 */ unsigned char unknown_0080[0x4]; @@ -220,7 +220,7 @@ public: class CUIMainPage : public CUIControl { public: - __declspec(noinline) explicit CUIMainPage(UIWindowContext& context); + __declspec(noinline) CUIMainPage(); /* 0080 */ CUIEnchantPage* firstPage; /* 0084 */ CUIEnchantPage* secondPage; @@ -258,7 +258,7 @@ public: class CUISlot : public CUIControl { public: // INLINED - explicit CUISlot(UIWindowContext& context) : CUIControl(context), radioButton(nullptr), itemIcon(nullptr), description(nullptr) { + explicit CUISlot() : CUIControl(), radioButton(nullptr), itemIcon(nullptr), description(nullptr) { } /* 0080 */ CUIRadioButton* radioButton; diff --git a/Source/UI/Enchant/UIEnchantUI.cpp b/Source/UI/Enchant/UIEnchantUI.cpp index 20c1ccef..c5fe9219 100644 --- a/Source/UI/Enchant/UIEnchantUI.cpp +++ b/Source/UI/Enchant/UIEnchantUI.cpp @@ -57,7 +57,7 @@ CEnchantMgr* Singleton::s_instance = nullptr; // FUNCTION: fn_14814 // FUNCTION: fn_14815 template void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -83,7 +83,7 @@ __declspec(noinline) void CUIListBoxEx __declspec(noinline) void CUIListBoxEx::AddNewItem(); template <> -__declspec(noinline) CUIListBoxEx::CUIListBoxEx(UIWindowContext& context); +__declspec(noinline) CUIListBoxEx::CUIListBoxEx(); // OFFSET: 0x009F93D0 // FUNCTION: fn_14806 @@ -301,26 +301,26 @@ CUIEnchantUI::~CUIEnchantUI() { namespace EnchantUI { // OFFSET: 0x009F70C0 // FUNCTION: fn_14768 -CUIEnchantPage::CUIEnchantPage(UIWindowContext& context) - : CUIControl(context), unknown_0080{}, gameItem(nullptr), unknown_0088(), unknown_0090(), enchantList(nullptr), unknown_009C{}, enchantInfo(nullptr), +CUIEnchantPage::CUIEnchantPage() + : CUIControl(), unknown_0080{}, gameItem(nullptr), unknown_0088(), unknown_0090(), enchantList(nullptr), unknown_009C{}, enchantInfo(nullptr), group(0), unknown_00B0(-1) { } // OFFSET: 0x009F72F0 // FUNCTION: fn_14770 -CUIMainPage::CUIMainPage(UIWindowContext& context) : CUIControl(context), firstPage(nullptr), secondPage(nullptr), tab(nullptr) { +CUIMainPage::CUIMainPage() : CUIControl(), firstPage(nullptr), secondPage(nullptr), tab(nullptr) { } } // OFFSET: 0x009F7380 // FUNCTION: fn_14771 -CUITab::CUITab(UIWindowContext& context) : CUIControl(context), current(nullptr) { +CUITab::CUITab() : CUIControl(), current(nullptr) { } // OFFSET: 0x009F7420 // FUNCTION: fn_14772 -CUITabButton::CUITabButton(UIWindowContext& context) - : CUIImageTextButton(context), page(nullptr), useSkinColors(0), normalColor(0xFFFFFF), selectedColor(0xFFFFFF), borderColor(0xCECECE), normalCell{0, 0}, +CUITabButton::CUITabButton() + : CUIImageTextButton(), page(nullptr), useSkinColors(0), normalColor(0xFFFFFF), selectedColor(0xFFFFFF), borderColor(0xCECECE), normalCell{0, 0}, selectedCell{0, 0}, borderCell{3, 1} { } @@ -334,7 +334,7 @@ namespace EnchantUI { // OFFSET: 0x009F9CE0 // FUNCTION: fn_14816 void CUIEnchantItem::Slot15(int width, int height) { - this->itemIcon = new CUIGameItem(*this->m_context); + this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); this->itemIcon->Move(2, 3); @@ -342,7 +342,7 @@ void CUIEnchantItem::Slot15(int width, int height) { this->itemIcon->unknown_0085 = 1; this->AddChild(this->itemIcon); - this->name = new CUIStaticText(*this->m_context); + this->name = new CUIStaticText(); this->name->SetSize(101, 12); this->name->Move(28, 9); this->name->SetText("", 0); @@ -366,7 +366,7 @@ void CUIEnchantItem::Slot15(int width, int height) { // OFFSET: 0x00A00880 // FUNCTION: fn_14828 void CUITargetItem::Slot15(int width, int height) { - this->itemIcon = new CUIGameItem(*this->m_context); + this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); this->itemIcon->Move(6, 13); @@ -374,7 +374,7 @@ void CUITargetItem::Slot15(int width, int height) { this->itemIcon->unknown_0085 = 1; this->AddChild(this->itemIcon); - this->unknown_00EC = new CUIStaticImage(*this->m_context); + this->unknown_00EC = new CUIStaticImage(); this->unknown_00EC->SetSize(12, 12); this->unknown_00EC->Move(166, 7); { @@ -390,7 +390,7 @@ void CUITargetItem::Slot15(int width, int height) { } this->AddChild(this->unknown_00EC); - this->unknown_00F0 = new CUIStaticText(*this->m_context); + this->unknown_00F0 = new CUIStaticText(); this->unknown_00F0->SetSize(152, 12); this->unknown_00F0->Move(38, 23); this->unknown_00F0->SetText("", 0); @@ -419,7 +419,7 @@ void CUIEnchantPage::Slot58(int) { // OFFSET: 0x009F99B0 // FUNCTION: fn_14812 CUIIngredient* CUIEnchantPage::CreateIngredient() { - CUIIngredient* ingredient = new CUIIngredient(*this->m_context); + CUIIngredient* ingredient = new CUIIngredient(); ingredient->SetSize(70, 50); ingredient->Move(4, 200); this->AddChild(ingredient); @@ -429,7 +429,7 @@ CUIIngredient* CUIEnchantPage::CreateIngredient() { // OFFSET: 0x009FB800 // FUNCTION: fn_14818 void CUIIngredient::Slot15(int width, int height) { - this->unknown_0080 = new CUIStaticImage(*this->m_context); + this->unknown_0080 = new CUIStaticImage(); this->unknown_0080->SetSize(70, 50); this->unknown_0080->Move(0, 0); { @@ -445,7 +445,7 @@ void CUIIngredient::Slot15(int width, int height) { } this->AddChild(this->unknown_0080); - this->unknown_0084 = new CUIStaticImage(*this->m_context); + this->unknown_0084 = new CUIStaticImage(); this->unknown_0084->SetSize(70, 50); this->unknown_0084->Move(0, 0); { @@ -461,7 +461,7 @@ void CUIIngredient::Slot15(int width, int height) { } this->AddChild(this->unknown_0084); - this->itemIcon = new CUIGameItem(*this->m_context); + this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); this->itemIcon->Move(6, 10); @@ -469,7 +469,7 @@ void CUIIngredient::Slot15(int width, int height) { this->itemIcon->unknown_0085 = 1; this->AddChild(this->itemIcon); - this->ownedText = new CUIStaticText(*this->m_context); + this->ownedText = new CUIStaticText(); this->ownedText->SetSize(40, 14); this->ownedText->Move(30, 17); this->ownedText->SetText("", 0); @@ -489,7 +489,7 @@ void CUIIngredient::Slot15(int width, int height) { this->ownedText->SetOutline(1, 0x965532); this->AddChild(this->ownedText); - this->requiredText = new CUIStaticText(*this->m_context); + this->requiredText = new CUIStaticText(); this->requiredText->SetSize(40, 14); this->requiredText->Move(30, 31); this->requiredText->SetText("", 0); @@ -673,22 +673,22 @@ namespace EnchantUI { // OFFSET: 0x009FC080 // FUNCTION: fn_14819 void CUINormal::Slot15(int width, int height) { - this->firstPage = new CUINormalRandom(*this->m_context); + this->firstPage = new CUINormalRandom(); this->firstPage->SetSize(470, 377); this->firstPage->Move(0, 0); this->AddChild(this->firstPage); - this->secondPage = new CUINormalPerfect(*this->m_context); + this->secondPage = new CUINormalPerfect(); this->secondPage->SetSize(470, 377); this->secondPage->Move(0, 0); this->AddChild(this->secondPage); - this->tab = new CUITab(*this->m_context); + this->tab = new CUITab(); this->tab->SetSize(76, 20); this->tab->Move(7, 1); this->AddChild(this->tab); - CUITabButton* firstButton = new CUITabButton(*this->m_context); + CUITabButton* firstButton = new CUITabButton(); firstButton->SetSize(38, 20); firstButton->Move(0, 0); firstButton->disabled = 0; @@ -732,7 +732,7 @@ void CUINormal::Slot15(int width, int height) { } this->tab->AddChild(firstButton); - CUITabButton* secondButton = new CUITabButton(*this->m_context); + CUITabButton* secondButton = new CUITabButton(); secondButton->SetSize(38, 20); secondButton->Move(38, 0); secondButton->disabled = 0; @@ -786,7 +786,7 @@ void CUINormal::Slot15(int width, int height) { // OFFSET: 0x009FF700 // FUNCTION: fn_14827 void CUISlot::Slot15(int width, int height) { - this->radioButton = new CUIRadioButton(*this->m_context); + this->radioButton = new CUIRadioButton(); this->radioButton->SetSize(44, 44); this->radioButton->Move(59, 1); this->radioButton->SetOnSelect([this](CUIRadioButton* button) { this->SelectSlot(button); }); @@ -831,7 +831,7 @@ void CUISlot::Slot15(int width, int height) { this->radioButton->Invalidate(); this->AddChild(this->radioButton); - this->itemIcon = new CUIGameItem(*this->m_context); + this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); this->itemIcon->Move(69, 11); @@ -839,7 +839,7 @@ void CUISlot::Slot15(int width, int height) { this->itemIcon->unknown_0085 = 1; this->AddChild(this->itemIcon); - this->description = new CUITextViewer(*this->m_context); + this->description = new CUITextViewer(); this->description->SetSize(96, 39); this->description->Move(0, 44); this->description->SetTextOffset(2, 0); @@ -919,22 +919,22 @@ void CUISlot::Slot15(int width, int height) { // OFFSET: 0x00A00D50 // FUNCTION: fn_14829 void CUIUpgrade::Slot15(int width, int height) { - this->firstPage = new CUIUpgradeRandom(*this->m_context); + this->firstPage = new CUIUpgradeRandom(); this->firstPage->SetSize(470, 377); this->firstPage->Move(0, 0); this->AddChild(this->firstPage); - this->secondPage = new CUIUpgradePerfect(*this->m_context); + this->secondPage = new CUIUpgradePerfect(); this->secondPage->SetSize(470, 377); this->secondPage->Move(0, 0); this->AddChild(this->secondPage); - this->tab = new CUITab(*this->m_context); + this->tab = new CUITab(); this->tab->SetSize(76, 20); this->tab->Move(7, 1); this->AddChild(this->tab); - CUITabButton* firstButton = new CUITabButton(*this->m_context); + CUITabButton* firstButton = new CUITabButton(); firstButton->SetSize(38, 20); firstButton->Move(0, 0); firstButton->disabled = 0; @@ -978,7 +978,7 @@ void CUIUpgrade::Slot15(int width, int height) { } this->tab->AddChild(firstButton); - CUITabButton* secondButton = new CUITabButton(*this->m_context); + CUITabButton* secondButton = new CUITabButton(); secondButton->SetSize(38, 20); secondButton->Move(38, 0); secondButton->disabled = 0; @@ -1284,16 +1284,16 @@ bool CUIEnchantUI::CanHitTest() { // OFFSET: 0x009F6D40 // FUNCTION: fn_14766 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x009F6F00 // FUNCTION: fn_14767 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -1804,7 +1804,7 @@ bool CUIUpgradePerfect::Slot56() { // OFFSET: 0x009F9FE0 // FUNCTION: fn_14817 void CUIEnchantPage::Slot15(int width, int height) { - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(470, 377); this->background->Move(0, 0); { @@ -1820,7 +1820,7 @@ void CUIEnchantPage::Slot15(int width, int height) { } this->AddChild(this->background); - this->gameItem = new CUIGameItem(*this->m_context); + this->gameItem = new CUIGameItem(); this->gameItem->SetMode(1); this->gameItem->SetScale(100); this->gameItem->Move(112, 5); @@ -1828,31 +1828,31 @@ void CUIEnchantPage::Slot15(int width, int height) { this->gameItem->unknown_0085 = 1; this->AddChild(this->gameItem); - CUISlot* slot = new CUISlot0(*this->m_context); + CUISlot* slot = new CUISlot0(); slot->SetSize(106, 84); slot->Move(6, 20); this->AddChild(slot); this->unknown_0088[0] = slot; - slot = new CUISlot1(*this->m_context); + slot = new CUISlot1(); slot->SetSize(106, 84); slot->Move(29, 105); this->AddChild(slot); this->unknown_0088[1] = slot; - slot = new CUISlot2(*this->m_context); + slot = new CUISlot2(); slot->SetSize(106, 84); slot->Move(164, 105); this->AddChild(slot); this->unknown_0088[2] = slot; - slot = new CUISlot3(*this->m_context); + slot = new CUISlot3(); slot->SetSize(106, 84); slot->Move(187, 20); this->AddChild(slot); this->unknown_0088[3] = slot; - this->enchantList = new CUIListBoxEx(*this->m_context); + this->enchantList = new CUIListBoxEx(); this->enchantList->itemWidth = 150; this->enchantList->rowHeight = 30; this->enchantList->SetSize(169, 377); @@ -1943,7 +1943,7 @@ void CUIEnchantPage::Slot15(int width, int height) { this->enchantList->AddNewItem(); this->AddChild(this->enchantList); - this->unknown_009C = new CUIStaticText(*this->m_context); + this->unknown_009C = new CUIStaticText(); this->unknown_009C->SetSize(100, 15); this->unknown_009C->Move(150, 309); this->unknown_009C->SetText("", 0); @@ -1963,7 +1963,7 @@ void CUIEnchantPage::Slot15(int width, int height) { this->unknown_009C->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_009C); - this->unknown_00A0 = new CUIImageButton(*this->m_context); + this->unknown_00A0 = new CUIImageButton(); this->unknown_00A0->SetSize(140, 40); this->unknown_00A0->Move(80, 330); this->unknown_00A0->SetOnClick([this]() { this->Slot55(); }); @@ -2065,7 +2065,7 @@ void CUIUpgradeRandom::Slot15(int width, int height) { // OFFSET: 0x009F31B0 // FUNCTION: fn_14753 void CUIEnchantUI::Slot15(int width, int height) { - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(690, 470); this->background->Move(0, 0); { @@ -2081,7 +2081,7 @@ void CUIEnchantUI::Slot15(int width, int height) { } this->AddChild(this->background); - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(690, 17); this->titleBar->Move(0, 0); { @@ -2115,7 +2115,7 @@ void CUIEnchantUI::Slot15(int width, int height) { } this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); title->SetText("", 0); @@ -2135,7 +2135,7 @@ void CUIEnchantUI::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(676, 3); closeButton->SetOnClick([this]() { this->OnClickClose(); }); @@ -2180,7 +2180,7 @@ void CUIEnchantUI::Slot15(int width, int height) { } this->titleBar->SetSecondButton(closeButton); - this->targetList = new CUIListBoxEx(*this->m_context); + this->targetList = new CUIListBoxEx(); this->targetList->itemWidth = 200; this->targetList->rowHeight = 50; this->targetList->SetSize(220, 400); @@ -2271,12 +2271,12 @@ void CUIEnchantUI::Slot15(int width, int height) { this->targetList->AddNewItem(); this->AddChild(this->targetList); - this->tab = new CUITab(*this->m_context); + this->tab = new CUITab(); this->tab->SetSize(290, 22); this->tab->Move(225, 18); this->AddChild(this->tab); - CUITabButton* normalButton = new CUITabButton(*this->m_context); + CUITabButton* normalButton = new CUITabButton(); normalButton->SetSize(65, 22); normalButton->Move(48, 0); normalButton->disabled = 0; @@ -2319,7 +2319,7 @@ void CUIEnchantUI::Slot15(int width, int height) { } this->tab->AddChild(normalButton); - CUITabButton* upgradeButton = new CUITabButton(*this->m_context); + CUITabButton* upgradeButton = new CUITabButton(); upgradeButton->SetSize(65, 22); upgradeButton->Move(113, 0); upgradeButton->disabled = 0; @@ -2362,7 +2362,7 @@ void CUIEnchantUI::Slot15(int width, int height) { } this->tab->AddChild(upgradeButton); - CUITabButton* resetButton = new CUITabButton(*this->m_context); + CUITabButton* resetButton = new CUITabButton(); resetButton->SetSize(65, 22); resetButton->Move(178, 0); resetButton->disabled = 0; @@ -2405,7 +2405,7 @@ void CUIEnchantUI::Slot15(int width, int height) { } this->tab->AddChild(resetButton); - this->normalPage = new EnchantUI::CUINormal(*this->m_context); + this->normalPage = new EnchantUI::CUINormal(); this->normalPage->SetSize(470, 377); this->normalPage->Move(220, 40); this->AddChild(this->normalPage); @@ -2432,7 +2432,7 @@ void CUIEnchantUI::Slot15(int width, int height) { this->normalPage->secondPage->background->SetImage(image); } - this->upgradePage = new EnchantUI::CUIUpgrade(*this->m_context); + this->upgradePage = new EnchantUI::CUIUpgrade(); this->upgradePage->SetSize(470, 377); this->upgradePage->Move(220, 40); this->AddChild(this->upgradePage); @@ -2459,12 +2459,12 @@ void CUIEnchantUI::Slot15(int width, int height) { this->upgradePage->secondPage->background->SetImage(image); } - this->resetPage = new EnchantUI::CUIReset(*this->m_context); + this->resetPage = new EnchantUI::CUIReset(); this->resetPage->SetSize(470, 377); this->resetPage->Move(220, 40); this->AddChild(this->resetPage); - this->textViewer = new CUITextViewer(*this->m_context); + this->textViewer = new CUITextViewer(); this->textViewer->SetSize(675, 47); this->textViewer->Move(10, 421); this->textViewer->SetTextOffset(0, 0); diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index 502758fd..d1c62e13 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -32,7 +32,7 @@ // OFFSET: 0x00BA3920 // FUNCTION: fn_19677 -UIEntryQueueHelpWnd::UIEntryQueueHelpWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), m_viewer(nullptr), m_close(nullptr) { +UIEntryQueueHelpWnd::UIEntryQueueHelpWnd() : UIFrameWnd(0), m_viewer(nullptr), m_close(nullptr) { } // OFFSET: 0x00BA4260 @@ -64,7 +64,7 @@ int UIEntryQueueHelpWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, // OFFSET: 0x00BA42E0 // FUNCTION: fn_19684 -UIEntryQueueListBox::UIEntryQueueListBox(UIWindowContext& windows) : UIListBox(windows) { +UIEntryQueueListBox::UIEntryQueueListBox() : UIListBox() { } // OFFSET: 0x00BA43F0 @@ -99,8 +99,8 @@ void UIEntryQueueListBox::Slot31(int x, int y) { // OFFSET: 0x00BA47A0 // FUNCTION: fn_19689 -UIEntryQueueRequestWnd::UIEntryQueueRequestWnd(UIWindowContext& windows, UIEntryQueueContext& entryQueue) - : UIFrameWnd(windows, 0), m_entryQueue(&entryQueue), m_interval(1000), m_elapsed(0), m_delta(0), m_lastTick(0) { +UIEntryQueueRequestWnd::UIEntryQueueRequestWnd(UIEntryQueueContext& entryQueue) + : UIFrameWnd(0), m_entryQueue(&entryQueue), m_interval(1000), m_elapsed(0), m_delta(0), m_lastTick(0) { } // OFFSET: 0x00BA4870 @@ -116,7 +116,7 @@ bool UIEntryQueueRequestWnd::Create() { this->Slot22(300, 250); this->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(10, 22, 280, 305, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -141,7 +141,7 @@ bool UIEntryQueueRequestWnd::Create() { const std::string path = "유저인터페이스\\"; - this->m_ok = new UIBitmapButton(*this->m_context); + this->m_ok = new UIBitmapButton(); this->m_ok->SetBitmap((path + "btn_ok" + ".bmp").c_str(), 0, 0); this->m_ok->SetBitmap((path + "btn_ok_a" + ".bmp").c_str(), 1, 0); this->m_ok->SetBitmap((path + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -150,7 +150,7 @@ bool UIEntryQueueRequestWnd::Create() { this->m_ok->SetId(0); this->AddChild(this->m_ok); - this->m_cancel = new UIBitmapButton(*this->m_context); + this->m_cancel = new UIBitmapButton(); this->m_cancel->SetBitmap((path + "btn_cancel" + ".bmp").c_str(), 0, 0); this->m_cancel->SetBitmap((path + "btn_cancel_a" + ".bmp").c_str(), 1, 0); this->m_cancel->SetBitmap((path + "btn_cancel_b" + ".bmp").c_str(), 2, 0); @@ -159,7 +159,7 @@ bool UIEntryQueueRequestWnd::Create() { this->m_cancel->SetId(1); this->AddChild(this->m_cancel); - this->m_countdown = new UIStaticText(*this->m_context); + this->m_countdown = new UIStaticText(); this->m_countdown->SetSize(150, 20); this->m_countdown->Move(10, this->geometry.height - 20); this->AddChild(this->m_countdown); @@ -226,8 +226,8 @@ int UIEntryQueueRequestWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x00BA5560 // FUNCTION: fn_19696 -UIEntryQueueStandByWnd::UIEntryQueueStandByWnd(UIWindowContext& windows, UIEntryQueueContext& entryQueue) - : UIFrameWnd(windows, 0), m_entryQueue(&entryQueue), m_waiting(0), m_ranking(0), m_viewer(nullptr), m_queueText(), m_waitingText(), +UIEntryQueueStandByWnd::UIEntryQueueStandByWnd(UIEntryQueueContext& entryQueue) + : UIFrameWnd(0), m_entryQueue(&entryQueue), m_waiting(0), m_ranking(0), m_viewer(nullptr), m_queueText(), m_waitingText(), m_rankingText() { } @@ -243,7 +243,7 @@ bool UIEntryQueueStandByWnd::Create() { this->Slot22(280, 120); this->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(10, 22, 260, 65, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -253,7 +253,7 @@ bool UIEntryQueueStandByWnd::Create() { const std::string path = "유저인터페이스\\"; - this->m_cancel = new UIBitmapButton(*this->m_context); + this->m_cancel = new UIBitmapButton(); this->m_cancel->SetBitmap((path + "cancel_waiting" + ".bmp").c_str(), 0, 0); this->m_cancel->SetBitmap((path + "cancel_waiting_a" + ".bmp").c_str(), 1, 0); this->m_cancel->SetBitmap((path + "cancel_waiting_b" + ".bmp").c_str(), 2, 0); @@ -262,7 +262,7 @@ bool UIEntryQueueStandByWnd::Create() { this->m_cancel->SetId(0); this->AddChild(this->m_cancel); - this->m_close = new UIBitmapButton(*this->m_context); + this->m_close = new UIBitmapButton(); this->m_close->SetBitmap((path + "btn_close" + ".bmp").c_str(), 0, 0); this->m_close->SetBitmap((path + "btn_close_a" + ".bmp").c_str(), 1, 0); this->m_close->SetBitmap((path + "btn_close_b" + ".bmp").c_str(), 2, 0); @@ -328,8 +328,8 @@ void UIEntryQueueStandByWnd::SetInfo(const char* queueName, int waiting, int ran // OFFSET: 0x00BA6000 // FUNCTION: fn_19704 -UIEntryQueueWnd::UIEntryQueueWnd(UIWindowContext& windows, UIEntryQueueContext& entryQueue) - : UIFrameWnd(windows, 0), unknown_00BC(), m_labels(), m_values(), m_list(nullptr), saved(nullptr), m_entryQueue(&entryQueue), m_applyButtons(), m_helpButton(nullptr) { +UIEntryQueueWnd::UIEntryQueueWnd(UIEntryQueueContext& entryQueue) + : UIFrameWnd(0), unknown_00BC(), m_labels(), m_values(), m_list(nullptr), saved(nullptr), m_entryQueue(&entryQueue), m_applyButtons(), m_helpButton(nullptr) { } // OFFSET: 0x00BA6110 @@ -348,7 +348,7 @@ void UIEntryQueueWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_list = new UIEntryQueueListBox(*this->m_context); + this->m_list = new UIEntryQueueListBox(); this->m_list->SetSize(130, 270); this->m_list->Move(10, 40); this->m_list->backgroundRed = 240; @@ -369,7 +369,7 @@ void UIEntryQueueWnd::Slot15(int width, int height) { }; int index = 0; for (int y = 165; y < 305; y += 20, ++index) { - this->m_labels[index] = new UIStaticText(*this->m_context); + this->m_labels[index] = new UIStaticText(); if (this->m_labels[index]) { const char* label = labels[index]; this->m_labels[index]->SetSize(this->TextWidth(label, 0, 0, 12, 0, 0), 25); @@ -380,7 +380,7 @@ void UIEntryQueueWnd::Slot15(int width, int height) { } for (int value = 0; value < 7; ++value) { - this->m_values[value] = new UIStaticText(*this->m_context); + this->m_values[value] = new UIStaticText(); if (this->m_labels[value]) { this->m_values[value]->SetSize(157, 25); this->AddChild(this->m_values[value]); @@ -397,7 +397,7 @@ void UIEntryQueueWnd::Slot15(int width, int height) { int id = 0; const char** name = names; for (int x = 8; x < 287; x += 93, name += 3) { - this->m_applyButtons[id] = new UIBitmapButton(*this->m_context); + this->m_applyButtons[id] = new UIBitmapButton(); this->m_applyButtons[id]->SetBitmap((path + name[0] + ".bmp").c_str(), 0, 0); this->m_applyButtons[id]->SetBitmap((path + name[1] + ".bmp").c_str(), 1, 0); this->m_applyButtons[id]->SetBitmap((path + name[2] + ".bmp").c_str(), 2, 0); @@ -408,7 +408,7 @@ void UIEntryQueueWnd::Slot15(int width, int height) { ++id; } - this->m_helpButton = new UIBitmapButton(*this->m_context); + this->m_helpButton = new UIBitmapButton(); this->m_helpButton->SetBitmap((path + "btn_help" + ".bmp").c_str(), 0, 0); this->m_helpButton->SetBitmap((path + "btn_help" + "_a.bmp").c_str(), 1, 0); this->m_helpButton->SetBitmap((path + "btn_help" + "_b.bmp").c_str(), 2, 0); @@ -631,7 +631,7 @@ void UIEntryQueueWnd::Slot11() { void UIEntryQueueHelpWnd::Slot15(int width, int height) { this->Resize(280, 280); - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(10, 22, 270, 225, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); @@ -662,7 +662,7 @@ void UIEntryQueueHelpWnd::Slot15(int width, int height) { const std::string path = "유저인터페이스\\"; - this->m_close = new UIBitmapButton(*this->m_context); + this->m_close = new UIBitmapButton(); this->m_close->SetBitmap((path + "btn_close" + ".bmp").c_str(), 0, 0); this->m_close->SetBitmap((path + "btn_close_a" + ".bmp").c_str(), 1, 0); this->m_close->SetBitmap((path + "btn_close_b" + ".bmp").c_str(), 2, 0); diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.h b/Source/UI/EntryQueue/UIEntryQueueWnd.h index e8496d5b..6aa33084 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.h +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.h @@ -23,7 +23,7 @@ struct UIEntryQueueContext { class UIEntryQueueHelpWnd : public UIFrameWnd { public: - UIEntryQueueHelpWnd(UIWindowContext& windows); + UIEntryQueueHelpWnd(); void Slot15(int width, int height) override; void Slot18() override; void Slot19() override; @@ -40,7 +40,7 @@ public: class UIEntryQueueListBox : public UIListBox { public: - UIEntryQueueListBox(UIWindowContext& windows); + UIEntryQueueListBox(); ~UIEntryQueueListBox() override; void Slot31(int x, int y) override; virtual void AddEntry(const char* name, int value); @@ -51,7 +51,7 @@ public: class UIEntryQueueRequestWnd : public UIFrameWnd { public: - UIEntryQueueRequestWnd(UIWindowContext& windows, UIEntryQueueContext& entryQueue); + UIEntryQueueRequestWnd(UIEntryQueueContext& entryQueue); ~UIEntryQueueRequestWnd() override; void Slot18() override; void Slot19() override; @@ -75,7 +75,7 @@ public: class UIEntryQueueStandByWnd : public UIFrameWnd { public: - UIEntryQueueStandByWnd(UIWindowContext& windows, UIEntryQueueContext& entryQueue); + UIEntryQueueStandByWnd(UIEntryQueueContext& entryQueue); ~UIEntryQueueStandByWnd() override; void Slot18() override; void Slot19() override; @@ -101,7 +101,7 @@ public: class UIEntryQueueWnd : public UIFrameWnd { public: - UIEntryQueueWnd(UIWindowContext& windows, UIEntryQueueContext& entryQueue); + UIEntryQueueWnd(UIEntryQueueContext& entryQueue); ~UIEntryQueueWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Exchange/UIExchangeUI.cpp b/Source/UI/Exchange/UIExchangeUI.cpp index 0e4a42a0..5e0fe75c 100644 --- a/Source/UI/Exchange/UIExchangeUI.cpp +++ b/Source/UI/Exchange/UIExchangeUI.cpp @@ -76,8 +76,8 @@ bool UnusedTrueA0F7B0() { // OFFSET: 0x00A0F840 // FUNCTION: fn_15180 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -114,7 +114,7 @@ void CUIExchangeUI::Slot53() { // FUNCTION: fn_15190 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -622,7 +622,7 @@ private: // OFFSET: 0x00A149B0 // FUNCTION: fn_15192 void ExchangeUI::CUIItem::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticImage(*this->m_context); + this->unknown_00E8 = new CUIStaticImage(); this->unknown_00E8->SetSize(32, 32); this->unknown_00E8->Move(9, 0); const std::uint8_t backgroundSource[] = {0x4F, 0x12, 0x2F, 0x7D, 0xBD, 0x0B, 0x68, 0xB8, 0x49, 0x59, 0x2F, 0x4B, 0xC0, 0x7F, 0xF1, 0x17, @@ -633,7 +633,7 @@ void ExchangeUI::CUIItem::Slot15(int width, int height) { this->unknown_00E8->SetImage(background); this->AddChild(this->unknown_00E8); - this->itemIcon = new CUIGameItem(*this->m_context); + this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); this->itemIcon->Move(13, 1); @@ -641,7 +641,7 @@ void ExchangeUI::CUIItem::Slot15(int width, int height) { this->itemIcon->unknown_0085 = 1; this->AddChild(this->itemIcon); - this->unknown_00F0 = new CUIStaticText(*this->m_context); + this->unknown_00F0 = new CUIStaticText(); this->unknown_00F0->SetSize(100, 13); this->unknown_00F0->Move(25, 15); this->unknown_00F0->SetText("", 0); @@ -657,7 +657,7 @@ void ExchangeUI::CUIItem::Slot15(int width, int height) { this->unknown_00F0->SetOutline(1, 0xFFFFFF); this->AddChild(this->unknown_00F0); - this->unknown_00F4 = new CUIStaticText(*this->m_context); + this->unknown_00F4 = new CUIStaticText(); this->unknown_00F4->SetSize(215, 30); this->unknown_00F4->Move(45, 0); this->unknown_00F4->SetText("", 0); @@ -677,7 +677,7 @@ void ExchangeUI::CUIItem::Slot15(int width, int height) { // OFFSET: 0x00A103F0 // FUNCTION: fn_15191 void CUIExchangeUI::Slot15(int width, int height) { - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(560, 17); this->titleBar->Move(0, 0); { @@ -712,7 +712,7 @@ void CUIExchangeUI::Slot15(int width, int height) { } this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(12, 0); title->SetText("", 0); @@ -734,7 +734,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - this->unknown_00DC = new CUIStaticText(*this->m_context); + this->unknown_00DC = new CUIStaticText(); this->unknown_00DC->SetSize(495, 17); this->unknown_00DC->Move(62, 0); this->unknown_00DC->SetText("", 0); @@ -756,7 +756,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_00DC->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00DC); - this->unknown_00E0 = new CUIStaticImage(*this->m_context); + this->unknown_00E0 = new CUIStaticImage(); this->unknown_00E0->SetSize(560, 360); this->unknown_00E0->Move(0, 17); { @@ -772,7 +772,7 @@ void CUIExchangeUI::Slot15(int width, int height) { } this->AddChild(this->unknown_00E0); - this->firstList = new ExchangeUI::CItemListBox(*this->m_context); + this->firstList = new ExchangeUI::CItemListBox(); this->firstList->itemWidth = 272; this->firstList->rowHeight = 30; this->firstList->SetSize(272, 300); @@ -841,7 +841,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->firstList->AddNewItem(); this->AddChild(this->firstList); - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(150, 18); this->unknown_00E8->Move(69, 330); { @@ -871,7 +871,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_00E8->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E8); - this->unknown_00EC = new CUIStaticText(*this->m_context); + this->unknown_00EC = new CUIStaticText(); this->unknown_00EC->SetSize(150, 18); this->unknown_00EC->Move(70, 330); { @@ -901,7 +901,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_00EC->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00EC); - this->unknown_00F0 = new CUIStaticText(*this->m_context); + this->unknown_00F0 = new CUIStaticText(); this->unknown_00F0->SetSize(150, 18); this->unknown_00F0->Move(70, 331); { @@ -931,7 +931,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_00F0->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00F0); - this->zenyEdit = new CUIEditBoxEx(*this->m_context); + this->zenyEdit = new CUIEditBoxEx(); this->zenyEdit->Create(100, 16, false); this->zenyEdit->Move(140, 330); this->zenyEdit->SetText(std::string("")); @@ -946,7 +946,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->zenyEdit->SetOnSubmit([this]() { this->OnEditSubmit(); }); this->AddChild(this->zenyEdit); - this->secondList = new ExchangeUI::CItemListBox(*this->m_context); + this->secondList = new ExchangeUI::CItemListBox(); this->secondList->itemWidth = 272; this->secondList->rowHeight = 30; this->secondList->SetSize(272, 300); @@ -1015,7 +1015,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->secondList->AddNewItem(); this->AddChild(this->secondList); - this->unknown_00FC = new CUIStaticText(*this->m_context); + this->unknown_00FC = new CUIStaticText(); this->unknown_00FC->SetSize(150, 18); this->unknown_00FC->Move(349, 330); { @@ -1045,7 +1045,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_00FC->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00FC); - this->unknown_0100 = new CUIStaticText(*this->m_context); + this->unknown_0100 = new CUIStaticText(); this->unknown_0100->SetSize(150, 18); this->unknown_0100->Move(350, 330); { @@ -1075,7 +1075,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_0100->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_0100); - this->unknown_0104 = new CUIStaticText(*this->m_context); + this->unknown_0104 = new CUIStaticText(); this->unknown_0104->SetSize(150, 18); this->unknown_0104->Move(350, 331); { @@ -1105,7 +1105,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_0104->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_0104); - this->logCheckBox = new CUICheckBox(*this->m_context); + this->logCheckBox = new CUICheckBox(); this->logCheckBox->SetSize(10, 10); this->logCheckBox->Move(105, 359); this->logCheckBox->SetOnCheck([this](bool checked) { this->OnCheckChanged(checked); }); @@ -1146,7 +1146,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->logCheckBox->Invalidate(); this->AddChild(this->logCheckBox); - this->unknown_010C = new CUIStaticText(*this->m_context); + this->unknown_010C = new CUIStaticText(); this->unknown_010C->SetSize(135, 14); this->unknown_010C->Move(123, 356); this->unknown_010C->SetText("", 0); @@ -1168,7 +1168,7 @@ void CUIExchangeUI::Slot15(int width, int height) { this->unknown_010C->SetOutline(1, 0xFFFFFF); this->AddChild(this->unknown_010C); - this->lockButton = new CUIImageButton(*this->m_context); + this->lockButton = new CUIImageButton(); this->lockButton->SetSize(42, 20); this->lockButton->Move(3, 354); this->lockButton->SetOnClick([this]() { this->SubmitZeny(); }); @@ -1207,7 +1207,7 @@ void CUIExchangeUI::Slot15(int width, int height) { } this->AddChild(this->lockButton); - this->tradeButton = new CUIImageButton(*this->m_context); + this->tradeButton = new CUIImageButton(); this->tradeButton->SetSize(42, 20); this->tradeButton->Move(260, 354); this->tradeButton->SetOnClick([this]() { this->Conclude(); }); @@ -1249,7 +1249,7 @@ void CUIExchangeUI::Slot15(int width, int height) { } this->AddChild(this->tradeButton); - this->unknown_0118 = new CUIImageButton(*this->m_context); + this->unknown_0118 = new CUIImageButton(); this->unknown_0118->SetSize(42, 20); this->unknown_0118->Move(510, 354); this->unknown_0118->SetOnClick([this]() { this->Cancel(); }); diff --git a/Source/UI/FrameSkin.h b/Source/UI/FrameSkin.h index 54bbffa0..2c8a3d26 100644 --- a/Source/UI/FrameSkin.h +++ b/Source/UI/FrameSkin.h @@ -12,7 +12,7 @@ class CUIFrameWnd : public UIFrameWnd { public: // INLINED CUIFrameWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), unknown_00B4(0), m_hasSkinColors(false), + : UIFrameWnd(0), unknown_00B4(0), m_hasSkinColors(false), m_backgroundColor(0xFFFFFF), m_borderColor(0xCECECE), m_backgroundCell{0, 0}, m_borderCell{3, 1}, m_buttonBarStyle(0), m_resolveSkin(true) { } diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index 9a7b7ccf..c70f0357 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -149,7 +149,7 @@ void SetComboItemSkinText(GameSettingsUI::CUIComboItem* item, const std::string& // OFFSET: 0x00A2C3C0 // FUNCTION: fn_15400 void GameSettingsUI::CUIGroupSkin::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(75, 13); this->m_title->Move(19, 12); const std::uint8_t titleSource[] = {0x60, 0xEF, 0xAA, 0x1D, 0xE9}; @@ -168,7 +168,7 @@ void GameSettingsUI::CUIGroupSkin::Slot15(int width, int height) { this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_combo = new CUIComboBox(*this->m_context); + this->m_combo = new CUIComboBox(); this->m_combo->Create(162, 16, 5); CUIComboBox* combo = this->m_combo; const std::uint8_t disabledSource[] = {0x0F, 0x74, 0x11, 0xEF, 0x59, 0xE1, 0xAA, 0xDE, 0x09, 0x3F, 0x11, 0xD9, 0x24, 0x95, 0x33, 0x71, 0xAE, 0xA8, 0xB8, 0x76, 0xC6, 0x46, 0x01, 0x67, 0xAA, 0xA9, 0xB7, 0x74, 0xFA, 0x4A, 0x33, 0x67, 0xB7, 0xAF, 0xB3, 0x7A, 0xE1, 0x70, 0x0D, 0x67, 0xA1, 0x84, 0xB0, 0x3B, 0xFB, 0x42, 0x1F, 0x13}; @@ -190,12 +190,12 @@ void GameSettingsUI::CUIGroupSkin::Slot15(int width, int height) { } if (combo->unknown_0088 == nullptr) { combo->Resize(combo->geometry.width + 18, combo->geometry.height); - combo->unknown_0088 = new CUIImageButton(*this->m_context); + combo->unknown_0088 = new CUIImageButton(); combo->unknown_0088->SetSize(18, 18); combo->unknown_0088->Move(combo->geometry.width - 18, 0); combo->unknown_0088->SetImages(normalName, hoverName, pressedName, disabledName); combo->unknown_0088->SetOnClick([combo]() { - WindowDropDown dropDown{*reinterpret_cast(nullptr), reinterpret_cast(g_windowMgr), reinterpret_cast(g_windowMgr.window_0A30)}; + WindowDropDown dropDown{reinterpret_cast(g_windowMgr), reinterpret_cast(g_windowMgr.window_0A30)}; if (!dropDown.Close()) { int x = 0; int y = combo->geometry.height - 1; @@ -304,12 +304,12 @@ template void CUIComboBox::Create(int width, int itemHe display->Move(1, 1); this->AddChild(display); - this->button = new CUIButton(*this->m_context); + this->button = new CUIButton(); this->button->SetSize(display->geometry.width, display->geometry.height); this->button->Move(display->geometry.x, display->geometry.y); this->button->SetOnClick([this]() { WindowOrdering ordering{g_windowMgr.rendered, *reinterpret_cast(&g_windowMgr), reinterpret_cast(g_windowMgr.modal), g_windowMgr.window_4F174}; - WindowDropDown dropDown{*this->m_context, ordering, reinterpret_cast(g_windowMgr.window_0A30)}; + WindowDropDown dropDown{ordering, reinterpret_cast(g_windowMgr.window_0A30)}; if (!dropDown.Close()) { int x = 0; int y = this->geometry.height - 1; @@ -319,14 +319,14 @@ template void CUIComboBox::Create(int width, int itemHe }); this->AddChild(this->button); - this->listBox = new CUIListBoxEx(*this->m_context); + this->listBox = new CUIListBoxEx(); this->listBox->itemWidth = this->width; this->listBox->rowHeight = this->itemHeight; this->listBox->SetSize(this->width + 13, this->itemHeight); this->listBox->Move(1, 1); this->listBox->SetOnSelect([this, display](T* item, const D& value) { WindowOrdering ordering{g_windowMgr.rendered, *reinterpret_cast(&g_windowMgr), reinterpret_cast(g_windowMgr.modal), g_windowMgr.window_4F174}; - WindowDropDown dropDown{*this->m_context, ordering, reinterpret_cast(g_windowMgr.window_0A30)}; + WindowDropDown dropDown{ordering, reinterpret_cast(g_windowMgr.window_0A30)}; dropDown.Close(); if (this->onChange) { this->onChange(display, value); @@ -382,12 +382,12 @@ void CUIComboBox::SetButton(const std::string& normal, const std::string& } if (this->unknown_0088 == nullptr) { this->Resize(this->geometry.width + 18, this->geometry.height); - this->unknown_0088 = new CUIImageButton(*this->m_context); + this->unknown_0088 = new CUIImageButton(); this->unknown_0088->SetSize(18, 18); this->unknown_0088->Move(this->geometry.width - 18, 0); this->unknown_0088->SetImages(normal, hover, pressed, disabled); this->unknown_0088->SetOnClick([this]() { - WindowDropDown dropDown{*reinterpret_cast(nullptr), reinterpret_cast(g_windowMgr), reinterpret_cast(g_windowMgr.window_0A30)}; + WindowDropDown dropDown{reinterpret_cast(g_windowMgr), reinterpret_cast(g_windowMgr.window_0A30)}; if (!dropDown.Close()) { int x = 0; int y = this->geometry.height - 1; @@ -1145,7 +1145,7 @@ void CUIListBoxEx::OnScroll(int positio // FUNCTION: fn_15384 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -1155,7 +1155,7 @@ void CUIListBoxEx::Slot15(int width // FUNCTION: fn_15385 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -1165,7 +1165,7 @@ void CUIListBoxEx::Slot15(int width, // FUNCTION: fn_15386 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -1175,7 +1175,7 @@ void CUIListBoxEx::Slot15(int width // FUNCTION: fn_15387 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -1185,7 +1185,7 @@ void CUIListBoxEx::Slot15(int width, // FUNCTION: fn_15388 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -2251,40 +2251,40 @@ void GameSettingsUI::CUIGroupTrilinear::Slot16() { // OFFSET: 0x00A193A0 // FUNCTION: fn_15341 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x00A19560 // FUNCTION: fn_15342 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x00A19720 // FUNCTION: fn_15343 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x00A198E0 // FUNCTION: fn_15344 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x00A19AA0 // FUNCTION: fn_15345 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -2327,7 +2327,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot16() { // OFFSET: 0x00A1F890 // FUNCTION: fn_15390 void GameSettingsUI::CUIComboItem::Slot15(int width, int height) { - this->m_text = new CUIStaticText(*this->m_context); + this->m_text = new CUIStaticText(); this->m_text->SetSize(155, 16); this->m_text->Move(3, 0); this->m_text->SetText("", 0); @@ -2395,115 +2395,115 @@ void GameSettingsUI::CUIGroupSound::Apply() { // OFFSET: 0x00A19C60 // FUNCTION: fn_15346 -CUIButton::CUIButton(UIWindowContext& context) : CUIControl(context), state(0), disabled(0), tooltip(), unknown_00C4(nullptr), unknown_00EC(nullptr) { +CUIButton::CUIButton() : CUIControl(), state(0), disabled(0), tooltip(), unknown_00C4(nullptr), unknown_00EC(nullptr) { } // OFFSET: 0x00A19D30 // FUNCTION: fn_15347 -CUIRadioButton::CUIRadioButton(UIWindowContext& context) : CUICheckBox(context), onSelect() { +CUIRadioButton::CUIRadioButton() : CUICheckBox(), onSelect() { } // OFFSET: 0x00A3C390 // FUNCTION: fn_15886 -GameSettingsUI::CUIBasicPage::CUIBasicPage(UIWindowContext& context) : CUIPage(context), m_skin(nullptr), m_sound(nullptr), m_emblem(nullptr), m_rodexSpam(nullptr), m_processPriority(nullptr), m_logInOut(nullptr) { +GameSettingsUI::CUIBasicPage::CUIBasicPage() : CUIPage(), m_skin(nullptr), m_sound(nullptr), m_emblem(nullptr), m_rodexSpam(nullptr), m_processPriority(nullptr), m_logInOut(nullptr) { } // OFFSET: 0x00A3C5D0 // FUNCTION: fn_15889 -GameSettingsUI::CUIGraphicsPage::CUIGraphicsPage(UIWindowContext& context) : CUIPage(context), m_graphicsApi(nullptr), m_graphics(nullptr), m_spriteDetailLevel(nullptr), m_textureDetailLevel(nullptr), m_fullscreen(nullptr), m_trilinear(nullptr) { +GameSettingsUI::CUIGraphicsPage::CUIGraphicsPage() : CUIPage(), m_graphicsApi(nullptr), m_graphics(nullptr), m_spriteDetailLevel(nullptr), m_textureDetailLevel(nullptr), m_fullscreen(nullptr), m_trilinear(nullptr) { } // OFFSET: 0x00A3C680 // FUNCTION: fn_15890 -GameSettingsUI::CUIGroupEmblem::CUIGroupEmblem(UIWindowContext& context) : CUIGroup(context), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { +GameSettingsUI::CUIGroupEmblem::CUIGroupEmblem() : CUIGroup(), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { } // OFFSET: 0x00A3C730 // FUNCTION: fn_15891 -GameSettingsUI::CUIGroupFullscreen::CUIGroupFullscreen(UIWindowContext& context) : CUIGroup(context), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { +GameSettingsUI::CUIGroupFullscreen::CUIGroupFullscreen() : CUIGroup(), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { } // OFFSET: 0x00A3C7E0 // FUNCTION: fn_15892 -GameSettingsUI::CUIGroupGraphics::CUIGroupGraphics(UIWindowContext& context) - : CUIGroup(context), m_adapterCombo(nullptr), m_modeText(nullptr), m_modeCombo(nullptr), +GameSettingsUI::CUIGroupGraphics::CUIGroupGraphics() + : CUIGroup(), m_adapterCombo(nullptr), m_modeText(nullptr), m_modeCombo(nullptr), m_adapter(), m_pendingAdapter(), m_mode(), m_pendingMode() { } // OFFSET: 0x00A3C910 // FUNCTION: fn_15893 -GameSettingsUI::CUIGroupGraphicsAPI::CUIGroupGraphicsAPI(UIWindowContext& context) : CUIGroup(context), m_combo(nullptr), m_backend(-1), m_pendingBackend(-1) { +GameSettingsUI::CUIGroupGraphicsAPI::CUIGroupGraphicsAPI() : CUIGroup(), m_combo(nullptr), m_backend(-1), m_pendingBackend(-1) { } // OFFSET: 0x00A3C9B0 // FUNCTION: fn_15894 -GameSettingsUI::CUIGroupLogInOut::CUIGroupLogInOut(UIWindowContext& context) : CUIGroup(context), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { +GameSettingsUI::CUIGroupLogInOut::CUIGroupLogInOut() : CUIGroup(), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { } // OFFSET: 0x00A3CA60 // FUNCTION: fn_15895 -GameSettingsUI::CUIGroupProcessPriority::CUIGroupProcessPriority(UIWindowContext& context) : CUIGroup(context), m_highButton(nullptr), m_highText(nullptr), m_normalButton(nullptr), m_normalText(nullptr), m_idleButton(nullptr), m_idleText(nullptr) { +GameSettingsUI::CUIGroupProcessPriority::CUIGroupProcessPriority() : CUIGroup(), m_highButton(nullptr), m_highText(nullptr), m_normalButton(nullptr), m_normalText(nullptr), m_idleButton(nullptr), m_idleText(nullptr) { } // OFFSET: 0x00A3CB20 // FUNCTION: fn_15896 -GameSettingsUI::CUIGroupRodexSpam::CUIGroupRodexSpam(UIWindowContext& context) : CUIGroup(context), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { +GameSettingsUI::CUIGroupRodexSpam::CUIGroupRodexSpam() : CUIGroup(), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { } // OFFSET: 0x00A3CBD0 // FUNCTION: fn_15897 -GameSettingsUI::CUIGroupSkin::CUIGroupSkin(UIWindowContext& context) : CUIGroup(context), m_combo(nullptr) { +GameSettingsUI::CUIGroupSkin::CUIGroupSkin() : CUIGroup(), m_combo(nullptr) { } // OFFSET: 0x00A3CC60 // FUNCTION: fn_15898 -GameSettingsUI::CUIGroupSound::CUIGroupSound(UIWindowContext& context) : CUIGroup(context), m_bgmText(nullptr), m_bgmSlider(nullptr), m_bgmMute(nullptr), unknown_0090(nullptr), m_effectText(nullptr), m_effectSlider(nullptr), m_effectMute(nullptr), unknown_00A0(nullptr) { +GameSettingsUI::CUIGroupSound::CUIGroupSound() : CUIGroup(), m_bgmText(nullptr), m_bgmSlider(nullptr), m_bgmMute(nullptr), unknown_0090(nullptr), m_effectText(nullptr), m_effectSlider(nullptr), m_effectMute(nullptr), unknown_00A0(nullptr) { } // OFFSET: 0x00A3CD30 // FUNCTION: fn_15899 -GameSettingsUI::CUIGroupSpriteDetailLevel::CUIGroupSpriteDetailLevel(UIWindowContext& context) : CUIGroup(context), m_slider(nullptr) { +GameSettingsUI::CUIGroupSpriteDetailLevel::CUIGroupSpriteDetailLevel() : CUIGroup(), m_slider(nullptr) { } // OFFSET: 0x00A3CDC0 // FUNCTION: fn_15900 -GameSettingsUI::CUIGroupTextureDetailLevel::CUIGroupTextureDetailLevel(UIWindowContext& context) : CUIGroup(context), m_slider(nullptr) { +GameSettingsUI::CUIGroupTextureDetailLevel::CUIGroupTextureDetailLevel() : CUIGroup(), m_slider(nullptr) { } // OFFSET: 0x00A3CE50 // FUNCTION: fn_15901 -GameSettingsUI::CUIGroupTrilinear::CUIGroupTrilinear(UIWindowContext& context) : CUIGroup(context), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { +GameSettingsUI::CUIGroupTrilinear::CUIGroupTrilinear() : CUIGroup(), m_onButton(nullptr), m_onText(nullptr), m_offButton(nullptr), m_offText(nullptr) { } // OFFSET: 0x00A3CF00 // FUNCTION: fn_15902 -GameSettingsUI::CUIListPage::CUIListPage(UIWindowContext& context) : CUIControl(context), m_optionList(nullptr) { +GameSettingsUI::CUIListPage::CUIListPage() : CUIControl(), m_optionList(nullptr) { } // OFFSET: 0x00A1F620 // FUNCTION: fn_15389 void GameSettingsUI::CUIBasicPage::Slot15(int width, int height) { - this->m_skin = new CUIGroupSkin(*this->m_context); + this->m_skin = new CUIGroupSkin(); this->m_skin->SetSize(400, 36); this->m_skin->Move(0, 0); this->AddChild(this->m_skin); - this->m_sound = new CUIGroupSound(*this->m_context); + this->m_sound = new CUIGroupSound(); this->m_sound->SetSize(400, 60); this->m_sound->Move(0, 36); this->AddChild(this->m_sound); - this->m_emblem = new CUIGroupEmblem(*this->m_context); + this->m_emblem = new CUIGroupEmblem(); this->m_emblem->SetSize(400, 36); this->m_emblem->Move(0, 96); this->AddChild(this->m_emblem); - this->m_rodexSpam = new CUIGroupRodexSpam(*this->m_context); + this->m_rodexSpam = new CUIGroupRodexSpam(); this->m_rodexSpam->SetSize(400, 60); this->m_rodexSpam->Move(0, 132); this->AddChild(this->m_rodexSpam); - this->m_processPriority = new CUIGroupProcessPriority(*this->m_context); + this->m_processPriority = new CUIGroupProcessPriority(); this->m_processPriority->SetSize(400, 36); this->m_processPriority->Move(0, 192); this->AddChild(this->m_processPriority); - this->m_logInOut = new CUIGroupLogInOut(*this->m_context); + this->m_logInOut = new CUIGroupLogInOut(); this->m_logInOut->SetSize(400, 36); this->m_logInOut->Move(0, 228); this->AddChild(this->m_logInOut); @@ -2512,7 +2512,7 @@ void GameSettingsUI::CUIBasicPage::Slot15(int width, int height) { // OFFSET: 0x00A32550 // FUNCTION: fn_15405 void GameSettingsUI::CUIListPage::Slot15(int width, int height) { - this->m_optionList = new CUIListBoxEx(*this->m_context); + this->m_optionList = new CUIListBoxEx(); this->m_optionList->itemWidth = 387; this->m_optionList->rowHeight = 26; this->m_optionList->SetSize(400, 286); @@ -2556,38 +2556,38 @@ void GameSettingsUI::CUIListPage::Slot15(int width, int height) { } // INLINED -inline CUIHScrollBar::CUIHScrollBar(UIWindowContext& context) : CUIVScrollBar(context) { +inline CUIHScrollBar::CUIHScrollBar() : CUIVScrollBar() { } // OFFSET: 0x00A22E00 // FUNCTION: fn_15392 void GameSettingsUI::CUIGraphicsPage::Slot15(int width, int height) { - this->m_graphicsApi = new CUIGroupGraphicsAPI(*this->m_context); + this->m_graphicsApi = new CUIGroupGraphicsAPI(); this->m_graphicsApi->SetSize(400, 32); this->m_graphicsApi->Move(0, 0); this->AddChild(this->m_graphicsApi); - this->m_graphics = new CUIGroupGraphics(*this->m_context); + this->m_graphics = new CUIGroupGraphics(); this->m_graphics->SetSize(400, 64); this->m_graphics->Move(0, 32); this->AddChild(this->m_graphics); - this->m_spriteDetailLevel = new CUIGroupSpriteDetailLevel(*this->m_context); + this->m_spriteDetailLevel = new CUIGroupSpriteDetailLevel(); this->m_spriteDetailLevel->SetSize(400, 32); this->m_spriteDetailLevel->Move(0, 96); this->AddChild(this->m_spriteDetailLevel); - this->m_textureDetailLevel = new CUIGroupTextureDetailLevel(*this->m_context); + this->m_textureDetailLevel = new CUIGroupTextureDetailLevel(); this->m_textureDetailLevel->SetSize(400, 32); this->m_textureDetailLevel->Move(0, 128); this->AddChild(this->m_textureDetailLevel); - this->m_fullscreen = new CUIGroupFullscreen(*this->m_context); + this->m_fullscreen = new CUIGroupFullscreen(); this->m_fullscreen->SetSize(400, 32); this->m_fullscreen->Move(0, 160); this->AddChild(this->m_fullscreen); - this->m_trilinear = new CUIGroupTrilinear(*this->m_context); + this->m_trilinear = new CUIGroupTrilinear(); this->m_trilinear->SetSize(400, 32); this->m_trilinear->Move(0, 192); this->AddChild(this->m_trilinear); @@ -2596,7 +2596,7 @@ void GameSettingsUI::CUIGraphicsPage::Slot15(int width, int height) { // OFFSET: 0x00A23070 // FUNCTION: fn_15393 void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(85, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0x54, 0xFA, 0xB3, 0xDE, 0xC8, 0x1C, 0x11, 0x86, 0x3C, 0xEA, 0xC7, 0x8B, 0xD1, 0xA1}; @@ -2614,7 +2614,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_onButton = new CUIRadioButton(*this->m_context); + this->m_onButton = new CUIRadioButton(); this->m_onButton->SetSize(12, 12); this->m_onButton->Move(110, 12); this->m_onButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -2632,7 +2632,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { this->m_onButton->checked = false; this->m_onButton->Invalidate(); this->AddChild(this->m_onButton); - this->m_onText = new CUIStaticText(*this->m_context); + this->m_onText = new CUIStaticText(); this->m_onText->SetSize(50, 13); this->m_onText->Move(127, 12); const std::uint8_t onLabelNameSource[] = {0x3D, 0xAB, 0xAB, 0xB3, 0x88, 0xEB, 0x71}; @@ -2650,7 +2650,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { this->m_onText->SetShadow(0, 0xFFFFFF); this->m_onText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_onText); - this->m_offButton = new CUIRadioButton(*this->m_context); + this->m_offButton = new CUIRadioButton(); this->m_offButton->SetSize(12, 12); this->m_offButton->Move(205, 12); this->m_offButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -2668,7 +2668,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { this->m_offButton->checked = false; this->m_offButton->Invalidate(); this->AddChild(this->m_offButton); - this->m_offText = new CUIStaticText(*this->m_context); + this->m_offText = new CUIStaticText(); this->m_offText->SetSize(100, 13); this->m_offText->Move(222, 12); const std::uint8_t offLabelNameSource[] = {0xED, 0x70, 0x7C, 0xE3, 0x0A, 0xDF, 0x41}; @@ -2691,7 +2691,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { // OFFSET: 0x00A24510 // FUNCTION: fn_15394 void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xC3, 0x18, 0x31, 0xFC, 0x29, 0x0F, 0x69, 0x76, 0xEE, 0xB5}; @@ -2709,7 +2709,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_onButton = new CUIRadioButton(*this->m_context); + this->m_onButton = new CUIRadioButton(); this->m_onButton->SetSize(12, 12); this->m_onButton->Move(150, 12); this->m_onButton->SetOnSelect([this](CUIRadioButton* button) { sub_A41E50(reinterpret_cast(button)); }); @@ -2727,7 +2727,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { this->m_onButton->checked = false; this->m_onButton->Invalidate(); this->AddChild(this->m_onButton); - this->m_onText = new CUIStaticText(*this->m_context); + this->m_onText = new CUIStaticText(); this->m_onText->SetSize(150, 13); this->m_onText->Move(167, 12); const std::uint8_t onLabelNameSource[] = {0xE7, 0xFD, 0xC4, 0xD1, 0xCB, 0x68, 0x4B, 0xC6, 0x07, 0xB9, 0xF7, 0xD8, 0xE6, 0xC5}; @@ -2745,7 +2745,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { this->m_onText->SetShadow(0, 0xFFFFFF); this->m_onText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_onText); - this->m_offButton = new CUIRadioButton(*this->m_context); + this->m_offButton = new CUIRadioButton(); this->m_offButton->SetSize(12, 12); this->m_offButton->Move(270, 12); this->m_offButton->SetOnSelect([this](CUIRadioButton* button) { sub_A41E50(reinterpret_cast(button)); }); @@ -2763,7 +2763,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { this->m_offButton->checked = false; this->m_offButton->Invalidate(); this->AddChild(this->m_offButton); - this->m_offText = new CUIStaticText(*this->m_context); + this->m_offText = new CUIStaticText(); this->m_offText->SetSize(100, 13); this->m_offText->Move(287, 12); const std::uint8_t offLabelNameSource[] = {0xCA, 0x0B, 0x8F, 0xF2, 0x61, 0xB4, 0x55, 0x6B, 0xF9, 0x1C, 0xA2, 0x5F}; @@ -2786,7 +2786,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { // OFFSET: 0x00A259E0 // FUNCTION: fn_15395 void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); const std::uint8_t titleTextSource[] = {0x92, 0x54, 0x6C, 0x22, 0x86, 0x75, 0x1F, 0x0B, 0xC6, 0x47, 0x7A, 0xA3, 0xFD, 0x0E, 0xFE, 0x6F, 0x23}; @@ -2805,7 +2805,7 @@ void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_adapterCombo = new CUIComboBox(*this->m_context); + this->m_adapterCombo = new CUIComboBox(); this->m_adapterCombo->Create(162, 16, 5); const std::uint8_t adapterDisabledSource[] = {0xAD, 0xF0, 0x39, 0xC9, 0x23, 0xB5, 0x90, 0xF2, 0xAB, 0xBB, 0x39, 0xFF, 0x5E, 0xC1, 0x09, 0x5D, 0x0C, 0x2C, 0x90, 0x50, 0xBC, 0x12, 0x3B, 0x4B, 0x08, 0x2D, 0x9F, 0x52, 0x80, 0x1E, 0x09, 0x4B, 0x15, 0x2B, 0x9B, 0x5C, 0x9B, 0x24, 0x37, 0x4B, 0x03, 0x00, 0x98, 0x1D, 0x81, 0x16, 0x25, 0x3F}; thread_local EncryptedName adapterDisabled(adapterDisabledSource); @@ -2826,7 +2826,7 @@ void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { this->m_adapterCombo->listBox->SetBinder(adapterBinder); this->AddChild(this->m_adapterCombo); - this->m_modeText = new CUIStaticText(*this->m_context); + this->m_modeText = new CUIStaticText(); this->m_modeText->SetSize(130, 13); this->m_modeText->Move(19, 44); const std::uint8_t modeTextSource[] = {0xAA, 0xDA, 0x8E, 0xA8, 0x68, 0x81, 0xAF, 0x9C, 0xC3, 0xB6, 0xCA, 0xBC, 0x1A, 0x69, 0x33, 0xE8, 0xDA, 0xA9, 0x39}; @@ -2845,7 +2845,7 @@ void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { this->m_modeText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_modeText); - this->m_modeCombo = new CUIComboBox(*this->m_context); + this->m_modeCombo = new CUIComboBox(); this->m_modeCombo->Create(162, 16, 5); const std::uint8_t modeDisabledSource[] = {0x1F, 0x76, 0x9D, 0x93, 0xD3, 0x5D, 0x3A, 0xCC, 0x19, 0x3D, 0x9D, 0xA5, 0xAE, 0x29, 0xA3, 0x63, 0xBE, 0xAA, 0x34, 0x0A, 0x4C, 0xFA, 0x91, 0x75, 0xBA, 0xAB, 0x3B, 0x08, 0x70, 0xF6, 0xA3, 0x75, 0xA7, 0xAD, 0x3F, 0x06, 0x6B, 0xCC, 0x9D, 0x75, 0xB1, 0x86, 0x3C, 0x47, 0x71, 0xFE, 0x8F, 0x01}; thread_local EncryptedName modeDisabled(modeDisabledSource); @@ -2870,7 +2870,7 @@ void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { // OFFSET: 0x00A27130 // FUNCTION: fn_15396 void GameSettingsUI::CUIGroupGraphicsAPI::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); const std::uint8_t titleSource[] = {0xEE, 0xE2, 0x18, 0x34, 0x5A, 0x41, 0xD3, 0x8E, 0x0F, 0x7C, 0xAF}; @@ -2889,7 +2889,7 @@ void GameSettingsUI::CUIGroupGraphicsAPI::Slot15(int width, int height) { this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_combo = new CUIComboBox(*this->m_context); + this->m_combo = new CUIComboBox(); this->m_combo->Create(162, 16, 5); const std::uint8_t disabledSource[] = {0x37, 0xBC, 0xEB, 0x55, 0x31, 0xC1, 0xD8, 0x40, 0x31, 0xF7, 0xEB, 0x63, 0x4C, 0xB5, 0x41, 0xEF, 0x96, 0x60, 0x42, 0xCC, 0xAE, 0x66, 0x73, 0xF9, 0x92, 0x61, 0x4D, 0xCE, 0x92, 0x6A, 0x41, 0xF9, 0x8F, 0x67, 0x49, 0xC0, 0x89, 0x50, 0x7F, 0xF9, 0x99, 0x4C, 0x4A, 0x81, 0x93, 0x62, 0x6D, 0x8D}; thread_local EncryptedName disabledImage(disabledSource); @@ -2914,7 +2914,7 @@ void GameSettingsUI::CUIGroupGraphicsAPI::Slot15(int width, int height) { // OFFSET: 0x00A27D00 // FUNCTION: fn_15397 void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(100, 12); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xC8, 0x1B, 0x1E, 0x8C, 0xAB, 0x7F, 0x35, 0xB1, 0xB4, 0x6D, 0x1D, 0x5B}; @@ -2932,7 +2932,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_onButton = new CUIRadioButton(*this->m_context); + this->m_onButton = new CUIRadioButton(); this->m_onButton->SetSize(12, 12); this->m_onButton->Move(110, 12); this->m_onButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -2950,7 +2950,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { this->m_onButton->checked = false; this->m_onButton->Invalidate(); this->AddChild(this->m_onButton); - this->m_onText = new CUIStaticText(*this->m_context); + this->m_onText = new CUIStaticText(); this->m_onText->SetSize(100, 12); this->m_onText->Move(127, 12); const std::uint8_t onLabelNameSource[] = {0xB1, 0xEA, 0xB2, 0xCD, 0x13}; @@ -2968,7 +2968,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { this->m_onText->SetShadow(0, 0xFFFFFF); this->m_onText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_onText); - this->m_offButton = new CUIRadioButton(*this->m_context); + this->m_offButton = new CUIRadioButton(); this->m_offButton->SetSize(12, 12); this->m_offButton->Move(205, 12); this->m_offButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -2986,7 +2986,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { this->m_offButton->checked = false; this->m_offButton->Invalidate(); this->AddChild(this->m_offButton); - this->m_offText = new CUIStaticText(*this->m_context); + this->m_offText = new CUIStaticText(); this->m_offText->SetSize(100, 12); this->m_offText->Move(222, 12); const std::uint8_t offLabelNameSource[] = {0x05, 0xC5, 0x5E, 0x21, 0x03}; @@ -3009,7 +3009,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { // OFFSET: 0x00A29180 // FUNCTION: fn_15398 void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(100, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xCE, 0xF1, 0x65, 0x6A, 0xA5, 0xD8, 0x95, 0x51, 0xCE, 0xAF, 0x27, 0x11, 0x22, 0x67}; @@ -3027,7 +3027,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_highButton = new CUIRadioButton(*this->m_context); + this->m_highButton = new CUIRadioButton(); this->m_highButton->SetSize(12, 12); this->m_highButton->Move(110, 12); this->m_highButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -3045,7 +3045,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { this->m_highButton->checked = true; this->m_highButton->Invalidate(); this->AddChild(this->m_highButton); - this->m_highText = new CUIStaticText(*this->m_context); + this->m_highText = new CUIStaticText(); this->m_highText->SetSize(100, 13); this->m_highText->Move(127, 12); const std::uint8_t highLabelNameSource[] = {0x14, 0x01, 0xBF, 0x84, 0x31}; @@ -3063,7 +3063,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { this->m_highText->SetShadow(0, 0xFFFFFF); this->m_highText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_highText); - this->m_normalButton = new CUIRadioButton(*this->m_context); + this->m_normalButton = new CUIRadioButton(); this->m_normalButton->SetSize(12, 12); this->m_normalButton->Move(205, 12); this->m_normalButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -3081,7 +3081,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { this->m_normalButton->checked = false; this->m_normalButton->Invalidate(); this->AddChild(this->m_normalButton); - this->m_normalText = new CUIStaticText(*this->m_context); + this->m_normalText = new CUIStaticText(); this->m_normalText->SetSize(100, 13); this->m_normalText->Move(222, 12); const std::uint8_t normalLabelNameSource[] = {0xDF, 0x4B, 0x12, 0xB6, 0x8D}; @@ -3099,7 +3099,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { this->m_normalText->SetShadow(0, 0xFFFFFF); this->m_normalText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_normalText); - this->m_idleButton = new CUIRadioButton(*this->m_context); + this->m_idleButton = new CUIRadioButton(); this->m_idleButton->SetSize(12, 12); this->m_idleButton->Move(300, 12); this->m_idleButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -3117,7 +3117,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { this->m_idleButton->checked = false; this->m_idleButton->Invalidate(); this->AddChild(this->m_idleButton); - this->m_idleText = new CUIStaticText(*this->m_context); + this->m_idleText = new CUIStaticText(); this->m_idleText->SetSize(100, 13); this->m_idleText->Move(317, 12); const std::uint8_t idleLabelNameSource[] = {0xAE, 0xB2, 0x53, 0x94, 0x71}; @@ -3140,7 +3140,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { // OFFSET: 0x00A2AEC0 // FUNCTION: fn_15399 void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(70, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xDA, 0xF5, 0x83, 0xE4, 0x2D}; @@ -3158,7 +3158,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_onButton = new CUIRadioButton(*this->m_context); + this->m_onButton = new CUIRadioButton(); this->m_onButton->SetSize(12, 12); this->m_onButton->Move(110, 12); this->m_onButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -3176,7 +3176,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { this->m_onButton->checked = false; this->m_onButton->Invalidate(); this->AddChild(this->m_onButton); - this->m_onText = new CUIStaticText(*this->m_context); + this->m_onText = new CUIStaticText(); this->m_onText->SetSize(100, 13); this->m_onText->Move(127, 12); const std::uint8_t onLabelNameSource[] = {0x37, 0x69, 0x5E, 0xEA, 0x95, 0xBF, 0x50, 0xF9, 0x75, 0xB9, 0x57, 0xFB, 0x08, 0xBA, 0xFF}; @@ -3194,7 +3194,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { this->m_onText->SetShadow(0, 0xFFFFFF); this->m_onText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_onText); - this->m_offButton = new CUIRadioButton(*this->m_context); + this->m_offButton = new CUIRadioButton(); this->m_offButton->SetSize(12, 12); this->m_offButton->Move(110, 36); this->m_offButton->SetOnSelect([this](CUIRadioButton* button) { this->OnSelect(button); }); @@ -3212,7 +3212,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { this->m_offButton->checked = false; this->m_offButton->Invalidate(); this->AddChild(this->m_offButton); - this->m_offText = new CUIStaticText(*this->m_context); + this->m_offText = new CUIStaticText(); this->m_offText->SetSize(130, 13); this->m_offText->Move(127, 36); const std::uint8_t offLabelNameSource[] = {0x3D, 0x04, 0x8D, 0x6E, 0x95, 0x4F, 0x38, 0x27, 0x07, 0xF7, 0xF1, 0x5F, 0x08, 0x4A, 0xB7, 0x57, 0x38, 0x6D, 0x83, 0xA9}; @@ -3235,7 +3235,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { // OFFSET: 0x00A2CF80 // FUNCTION: fn_15401 void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(75, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xEA, 0x4A, 0x42, 0xC5, 0xFA, 0xD6, 0xFF, 0xD7, 0xE2, 0x6C, 0x59, 0x2B}; @@ -3253,7 +3253,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_bgmText = new CUIStaticText(*this->m_context); + this->m_bgmText = new CUIStaticText(); this->m_bgmText->SetSize(50, 13); this->m_bgmText->Move(110, 12); const std::uint8_t bgmLabelNameSource[] = {0xFA, 0xD1, 0xEB, 0x8D, 0xA7, 0x90, 0x71}; @@ -3271,7 +3271,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { this->m_bgmText->SetShadow(0, 0xFFFFFF); this->m_bgmText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_bgmText); - this->m_bgmSlider = new CUIHScrollBar(*this->m_context); + this->m_bgmSlider = new CUIHScrollBar(); this->m_bgmSlider->SetSize(174, 13); this->m_bgmSlider->Move(152, 11); this->m_bgmSlider->SetOnChange([this](int position) { this->OnBgmScroll(position); }); @@ -3294,7 +3294,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { thread_local EncryptedName bgmSliderThumbRight(bgmSliderThumbRightSource); static_cast(this->m_bgmSlider)->SetThumbImages(std::string(bgmSliderThumbLeft.Text()), std::string(bgmSliderThumbMiddle.Text()), std::string(bgmSliderThumbRight.Text())); this->AddChild(this->m_bgmSlider); - this->m_bgmMute = new CUICheckBox(*this->m_context); + this->m_bgmMute = new CUICheckBox(); this->m_bgmMute->SetSize(10, 10); this->m_bgmMute->Move(334, 13); this->m_bgmMute->SetOnCheck([this](bool checked) { this->OnBgmMute(checked); }); @@ -3312,7 +3312,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { this->m_bgmMute->checked = false; this->m_bgmMute->Invalidate(); this->AddChild(this->m_bgmMute); - this->unknown_0090 = new CUIStaticText(*this->m_context); + this->unknown_0090 = new CUIStaticText(); this->unknown_0090->SetSize(50, 13); this->unknown_0090->Move(348, 12); const std::uint8_t bgmMuteLabelNameSource[] = {0xE9, 0x43, 0xD0, 0xBB, 0x4F}; @@ -3330,7 +3330,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { this->unknown_0090->SetShadow(0, 0xFFFFFF); this->unknown_0090->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_0090); - this->m_effectText = new CUIStaticText(*this->m_context); + this->m_effectText = new CUIStaticText(); this->m_effectText->SetSize(50, 13); this->m_effectText->Move(110, 36); const std::uint8_t effectLabelNameSource[] = {0x1B, 0x86, 0xDF, 0xEB, 0x69, 0xA2, 0x9D}; @@ -3348,7 +3348,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { this->m_effectText->SetShadow(0, 0xFFFFFF); this->m_effectText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_effectText); - this->m_effectSlider = new CUIHScrollBar(*this->m_context); + this->m_effectSlider = new CUIHScrollBar(); this->m_effectSlider->SetSize(174, 13); this->m_effectSlider->Move(152, 35); this->m_effectSlider->SetOnChange([this](int position) { this->OnEffectScroll(position); }); @@ -3371,7 +3371,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { thread_local EncryptedName effectSliderThumbRight(effectSliderThumbRightSource); static_cast(this->m_effectSlider)->SetThumbImages(std::string(effectSliderThumbLeft.Text()), std::string(effectSliderThumbMiddle.Text()), std::string(effectSliderThumbRight.Text())); this->AddChild(this->m_effectSlider); - this->m_effectMute = new CUICheckBox(*this->m_context); + this->m_effectMute = new CUICheckBox(); this->m_effectMute->SetSize(10, 10); this->m_effectMute->Move(334, 37); this->m_effectMute->SetOnCheck([this](bool checked) { this->OnEffectMute(checked); }); @@ -3389,7 +3389,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { this->m_effectMute->checked = false; this->m_effectMute->Invalidate(); this->AddChild(this->m_effectMute); - this->unknown_00A0 = new CUIStaticText(*this->m_context); + this->unknown_00A0 = new CUIStaticText(); this->unknown_00A0->SetSize(50, 13); this->unknown_00A0->Move(348, 36); const std::uint8_t effectMuteLabelNameSource[] = {0xB3, 0xF9, 0xF6, 0xBF, 0xED}; @@ -3412,7 +3412,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { // OFFSET: 0x00A2F880 // FUNCTION: fn_15402 void GameSettingsUI::CUIGroupSpriteDetailLevel::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xAE, 0x7D, 0xC4, 0xD4, 0x4D, 0x62, 0xD7, 0x83, 0xD5, 0x69, 0x23, 0xD2, 0x23, 0x2A, 0xE4, 0xFA, 0xA6, 0xC7}; @@ -3430,7 +3430,7 @@ void GameSettingsUI::CUIGroupSpriteDetailLevel::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_slider = new CUIHScrollBar(*this->m_context); + this->m_slider = new CUIHScrollBar(); this->m_slider->SetSize(175, 13); this->m_slider->Move(153, 11); this->m_slider->SetOnChange([this](int position) { sub_A43000(position); }); @@ -3458,7 +3458,7 @@ void GameSettingsUI::CUIGroupSpriteDetailLevel::Slot15(int width, int height) { // OFFSET: 0x00A30490 // FUNCTION: fn_15403 void GameSettingsUI::CUIGroupTextureDetailLevel::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0x34, 0x1B, 0x54, 0x07, 0x6E, 0xC9, 0x55, 0xBA, 0x29, 0x78, 0x1A, 0x08, 0x18, 0x0D}; @@ -3476,7 +3476,7 @@ void GameSettingsUI::CUIGroupTextureDetailLevel::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_slider = new CUIHScrollBar(*this->m_context); + this->m_slider = new CUIHScrollBar(); this->m_slider->SetSize(175, 13); this->m_slider->Move(153, 11); this->m_slider->SetOnChange([this](int position) { sub_A43040(position); }); @@ -3504,7 +3504,7 @@ void GameSettingsUI::CUIGroupTextureDetailLevel::Slot15(int width, int height) { // OFFSET: 0x00A31070 // FUNCTION: fn_15404 void GameSettingsUI::CUIGroupTrilinear::Slot15(int width, int height) { - this->m_title = new CUIStaticText(*this->m_context); + this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); const std::uint8_t titleNameSource[] = {0xAB, 0xCD, 0x83, 0xDE, 0x65, 0xCF, 0x3B, 0x16, 0xD3, 0x8D, 0x15, 0xEA, 0x6F, 0xC6, 0x42, 0x61, 0xD8, 0x63}; @@ -3522,7 +3522,7 @@ void GameSettingsUI::CUIGroupTrilinear::Slot15(int width, int height) { this->m_title->SetShadow(0, 0xFFFFFF); this->m_title->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_title); - this->m_onButton = new CUIRadioButton(*this->m_context); + this->m_onButton = new CUIRadioButton(); this->m_onButton->SetSize(12, 12); this->m_onButton->Move(150, 12); this->m_onButton->SetOnSelect([this](CUIRadioButton* button) { sub_A41FA0(reinterpret_cast(button)); }); @@ -3540,7 +3540,7 @@ void GameSettingsUI::CUIGroupTrilinear::Slot15(int width, int height) { this->m_onButton->checked = false; this->m_onButton->Invalidate(); this->AddChild(this->m_onButton); - this->m_onText = new CUIStaticText(*this->m_context); + this->m_onText = new CUIStaticText(); this->m_onText->SetSize(150, 13); this->m_onText->Move(167, 12); const std::uint8_t onLabelNameSource[] = {0xF7, 0xF6, 0x82, 0xED, 0xBD}; @@ -3558,7 +3558,7 @@ void GameSettingsUI::CUIGroupTrilinear::Slot15(int width, int height) { this->m_onText->SetShadow(0, 0xFFFFFF); this->m_onText->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_onText); - this->m_offButton = new CUIRadioButton(*this->m_context); + this->m_offButton = new CUIRadioButton(); this->m_offButton->SetSize(12, 12); this->m_offButton->Move(270, 12); this->m_offButton->SetOnSelect([this](CUIRadioButton* button) { sub_A41FA0(reinterpret_cast(button)); }); @@ -3576,7 +3576,7 @@ void GameSettingsUI::CUIGroupTrilinear::Slot15(int width, int height) { this->m_offButton->checked = false; this->m_offButton->Invalidate(); this->AddChild(this->m_offButton); - this->m_offText = new CUIStaticText(*this->m_context); + this->m_offText = new CUIStaticText(); this->m_offText->SetSize(100, 13); this->m_offText->Move(287, 12); const std::uint8_t offLabelNameSource[] = {0xC3, 0xEF, 0x42, 0x1D, 0x87}; @@ -3886,7 +3886,7 @@ void GameSettingsUI::CUIGraphicsPage::ApplySettings() { // OFFSET: 0x00A1FB10 // FUNCTION: fn_15391 void CUIGameSettingsUI::Slot15(int width, int height) { - this->m_titleBar = new CUITitleBar(*this->m_context); + this->m_titleBar = new CUITitleBar(); this->m_titleBar->SetSize(400, 17); this->m_titleBar->Move(0, 0); { @@ -3912,7 +3912,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { } this->AddChild(this->m_titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); { @@ -3936,7 +3936,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { this->m_titleBar->titleText = title; this->m_titleBar->AddChild(title); - CUIImageButton* baseButton = new CUIImageButton(*this->m_context); + CUIImageButton* baseButton = new CUIImageButton(); baseButton->SetSize(11, 11); baseButton->Move(3, 3); baseButton->SetOnClick([this]() { this->sub_A3F0F0(); }); @@ -3967,7 +3967,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { } this->m_titleBar->AddChild(baseButton); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(386, 3); closeButton->SetOnClick([this]() { this->OnTitleClose(); }); @@ -4000,18 +4000,18 @@ void CUIGameSettingsUI::Slot15(int width, int height) { } this->m_titleBar->SetSecondButton(closeButton); - this->m_currentPage = new GameSettingsUI::CUIBasicPage(*this->m_context); + this->m_currentPage = new GameSettingsUI::CUIBasicPage(); this->m_currentPage->SetSize(400, 288); this->m_currentPage->Move(0, 34); this->AddChild(this->m_currentPage); - this->m_graphicsPage = new GameSettingsUI::CUIGraphicsPage(*this->m_context); + this->m_graphicsPage = new GameSettingsUI::CUIGraphicsPage(); this->m_graphicsPage->SetSize(400, 288); this->m_graphicsPage->Move(0, 34); this->AddChild(this->m_graphicsPage); for (int index = 0; index < 3; ++index) { - GameSettingsUI::CUIListPage* page = new GameSettingsUI::CUIListPage(*this->m_context); + GameSettingsUI::CUIListPage* page = new GameSettingsUI::CUIListPage(); page->SetSize(400, 288); this->AddChild(page); this->m_pages.push_back(page); @@ -4020,13 +4020,13 @@ void CUIGameSettingsUI::Slot15(int width, int height) { this->m_pages[1]->Move(0, 34); this->m_pages[2]->Move(0, 34); - this->m_tab = new CUITab(*this->m_context); + this->m_tab = new CUITab(); this->m_tab->SetSize(400, 18); this->m_tab->Move(0, 17); this->m_tab->SetOnChange([this](CUITabButton* button) { this->sub_A433D0(button); }); this->AddChild(this->m_tab); - CUITabButton* basicButton = new CUITabButton(*this->m_context); + CUITabButton* basicButton = new CUITabButton(); basicButton->SetSize(72, 18); basicButton->Move(0, 0); basicButton->SetOnClick([this]() { this->sub_A43380(); }); @@ -4053,7 +4053,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { basicButton->SetSkinColors(0, 0, 0, 0, 3, 1); this->m_tab->AddChild(basicButton); - CUITabButton* effectButton = new CUITabButton(*this->m_context); + CUITabButton* effectButton = new CUITabButton(); effectButton->SetSize(72, 18); effectButton->Move(71, 0); effectButton->SetOnClick([this]() { this->sub_A433A0(); }); @@ -4080,7 +4080,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { effectButton->useSkinColors = 1; this->m_tab->AddChild(effectButton); - CUITabButton* controlButton = new CUITabButton(*this->m_context); + CUITabButton* controlButton = new CUITabButton(); controlButton->SetSize(72, 18); controlButton->Move(142, 0); controlButton->SetOnClick([this]() { this->sub_A43390(); }); @@ -4107,7 +4107,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { controlButton->SetSkinColors(0, 0, 0, 0, 3, 1); this->m_tab->AddChild(controlButton); - CUITabButton* graphicsButton = new CUITabButton(*this->m_context); + CUITabButton* graphicsButton = new CUITabButton(); graphicsButton->SetSize(72, 18); graphicsButton->Move(213, 0); graphicsButton->SetOnClick([this]() { this->sub_A433C0(); }); @@ -4134,7 +4134,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { graphicsButton->SetSkinColors(0, 0, 0, 0, 3, 1); this->m_tab->AddChild(graphicsButton); - CUITabButton* etcButton = new CUITabButton(*this->m_context); + CUITabButton* etcButton = new CUITabButton(); etcButton->SetSize(72, 18); etcButton->Move(284, 0); etcButton->SetOnClick([this]() { this->sub_A433B0(); }); @@ -4161,7 +4161,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { etcButton->SetSkinColors(0, 0, 0, 0, 3, 1); this->m_tab->AddChild(etcButton); - this->m_pageContainer = new CUIImageButton(*this->m_context); + this->m_pageContainer = new CUIImageButton(); this->m_pageContainer->SetSize(42, 20); this->m_pageContainer->Move(5, 326); this->m_pageContainer->SetOnClick([this]() { this->ResetToDefaults(); }); @@ -4193,7 +4193,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { } this->AddChild(this->m_pageContainer); - this->m_applyButton = new CUIImageButton(*this->m_context); + this->m_applyButton = new CUIImageButton(); this->m_applyButton->SetSize(42, 20); this->m_applyButton->Move(301, 326); this->m_applyButton->SetOnClick([this]() { this->OnApply(); }); @@ -4225,7 +4225,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { } this->AddChild(this->m_applyButton); - this->m_closeButton = new CUIImageButton(*this->m_context); + this->m_closeButton = new CUIImageButton(); this->m_closeButton->SetSize(42, 20); this->m_closeButton->Move(348, 326); this->m_closeButton->SetOnClick([this]() { this->OnCloseButton(); }); @@ -4291,7 +4291,7 @@ void CUIGameSettingsUI::Slot16() { // OFFSET: 0x00A33250 // FUNCTION: fn_15406 void GameSettingsUI::CUIOptionItem::Slot15(int width, int height) { - this->m_check = new CUICheckBox(*this->m_context); + this->m_check = new CUICheckBox(); this->m_check->SetSize(34, 15); this->m_check->Move(8, 5); this->m_check->SetOnCheck([this](bool checked) { this->OnCheck(checked); }); @@ -4310,7 +4310,7 @@ void GameSettingsUI::CUIOptionItem::Slot15(int width, int height) { this->m_check->Invalidate(); this->AddChild(this->m_check); - CUIImageButton* runButton = new CUIImageButton(*this->m_context); + CUIImageButton* runButton = new CUIImageButton(); this->unknown_00EC = runButton; runButton->SetSize(34, 15); runButton->Move(7, 5); @@ -4328,7 +4328,7 @@ void GameSettingsUI::CUIOptionItem::Slot15(int width, int height) { runButton->SetImages(std::string(applyNormal.Text()), std::string(applyPressed.Text()), std::string(applyOver.Text()), std::string(applyDisabled.Text())); this->AddChild(this->unknown_00EC); - this->m_label = new CUITextButton(*this->m_context); + this->m_label = new CUITextButton(); this->m_label->SetSize(85, 13); this->m_label->Move(47, 6); this->m_label->SetOnClick([this]() { @@ -4353,7 +4353,7 @@ void GameSettingsUI::CUIOptionItem::Slot15(int width, int height) { this->m_label->SetOutline(false, 0xFFFFFF); this->AddChild(this->m_label); - this->m_description = new CUIStaticText(*this->m_context); + this->m_description = new CUIStaticText(); this->m_description->SetSize(252, 13); this->m_description->Move(138, 6); this->m_description->SetText("", 0); diff --git a/Source/UI/GameSettings/GameSettingsUI.h b/Source/UI/GameSettings/GameSettingsUI.h index bae6ba7f..a6e3e092 100644 --- a/Source/UI/GameSettings/GameSettingsUI.h +++ b/Source/UI/GameSettings/GameSettingsUI.h @@ -33,8 +33,8 @@ extern std::map g_optionHotkeys; template class CUIComboBox : public CUIControl { public: - explicit CUIComboBox(UIWindowContext& context) - : CUIControl(context), button(), unknown_0088(), listBox(nullptr), width(), itemHeight(0), visibleItems(1), onSelect(), onChange() { + explicit CUIComboBox() + : CUIControl(), button(), unknown_0088(), listBox(nullptr), width(), itemHeight(0), visibleItems(1), onSelect(), onChange() { } void Paint() override; @@ -62,7 +62,7 @@ class CUIOptionItem; class CUIGroup : public CUIControl { public: // INLINED - explicit CUIGroup(UIWindowContext& context) : CUIControl(context), m_title(nullptr) { + explicit CUIGroup() : CUIControl(), m_title(nullptr) { } virtual void Apply(); @@ -73,7 +73,7 @@ public: class CUIGroupEmblem : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupEmblem(UIWindowContext& context); + __declspec(noinline) CUIGroupEmblem(); void Slot15(int width, int height) override; void Slot16() override; void Apply() override; @@ -89,7 +89,7 @@ public: class CUIGroupFullscreen : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupFullscreen(UIWindowContext& context); + __declspec(noinline) CUIGroupFullscreen(); void Slot15(int width, int height) override; void Slot16() override; void Refresh() override; @@ -102,7 +102,7 @@ public: class CUIGroupGraphics : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupGraphics(UIWindowContext& context); + __declspec(noinline) CUIGroupGraphics(); void Slot15(int width, int height) override; void Slot16() override; void Refresh() override; @@ -123,7 +123,7 @@ public: class CUIGroupGraphicsAPI : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupGraphicsAPI(UIWindowContext& context); + __declspec(noinline) CUIGroupGraphicsAPI(); void Slot15(int width, int height) override; void Slot16() override; void Apply() override; @@ -138,7 +138,7 @@ public: class CUIGroupLogInOut : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupLogInOut(UIWindowContext& context); + __declspec(noinline) CUIGroupLogInOut(); void Slot15(int width, int height) override; void Slot16() override; void Apply() override; @@ -154,7 +154,7 @@ public: class CUIGroupProcessPriority : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupProcessPriority(UIWindowContext& context); + __declspec(noinline) CUIGroupProcessPriority(); void Slot15(int width, int height) override; void Slot16() override; void Refresh() override; @@ -170,7 +170,7 @@ public: class CUIGroupRodexSpam : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupRodexSpam(UIWindowContext& context); + __declspec(noinline) CUIGroupRodexSpam(); void Slot15(int width, int height) override; void Slot16() override; void Apply() override; @@ -185,7 +185,7 @@ public: class CUIGroupSkin : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupSkin(UIWindowContext& context); + __declspec(noinline) CUIGroupSkin(); void Slot15(int width, int height) override; void Slot16() override; void Apply() override; @@ -197,7 +197,7 @@ public: class CUIGroupSound : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupSound(UIWindowContext& context); + __declspec(noinline) CUIGroupSound(); void Slot15(int width, int height) override; void Slot16() override; void Apply() override; @@ -223,7 +223,7 @@ public: class CUIGroupSpriteDetailLevel : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupSpriteDetailLevel(UIWindowContext& context); + __declspec(noinline) CUIGroupSpriteDetailLevel(); void Slot15(int width, int height) override; void Slot16() override; void Paint() override; @@ -234,7 +234,7 @@ public: class CUIGroupTextureDetailLevel : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupTextureDetailLevel(UIWindowContext& context); + __declspec(noinline) CUIGroupTextureDetailLevel(); void Slot15(int width, int height) override; void Slot16() override; void Paint() override; @@ -245,7 +245,7 @@ public: class CUIGroupTrilinear : public CUIGroup { public: - __declspec(noinline) explicit CUIGroupTrilinear(UIWindowContext& context); + __declspec(noinline) CUIGroupTrilinear(); void Slot15(int width, int height) override; void Slot16() override; void Refresh() override; @@ -259,7 +259,7 @@ public: class CUIPage : public CUIControl { public: // INLINED - explicit CUIPage(UIWindowContext& context) : CUIControl(context) { + explicit CUIPage() : CUIControl() { } void Slot16() override; @@ -270,7 +270,7 @@ public: class CUIBasicPage : public CUIPage { public: - __declspec(noinline) explicit CUIBasicPage(UIWindowContext& context); + __declspec(noinline) CUIBasicPage(); void Slot15(int width, int height) override; /* 0080 */ CUIGroupSkin* m_skin; @@ -283,7 +283,7 @@ public: class CUIGraphicsPage : public CUIPage { public: - __declspec(noinline) explicit CUIGraphicsPage(UIWindowContext& context); + __declspec(noinline) CUIGraphicsPage(); void Slot15(int width, int height) override; __declspec(noinline) bool IsModified(); void ApplySettings(); @@ -300,7 +300,7 @@ public: class CUIListPage : public CUIControl { public: - __declspec(noinline) explicit CUIListPage(UIWindowContext& context); + __declspec(noinline) CUIListPage(); void Slot15(int width, int height) override; void Slot16() override; void Paint() override; diff --git a/Source/UI/Gauges/UIPetInfoBarGraph.cpp b/Source/UI/Gauges/UIPetInfoBarGraph.cpp index 60e33f95..61c3009a 100644 --- a/Source/UI/Gauges/UIPetInfoBarGraph.cpp +++ b/Source/UI/Gauges/UIPetInfoBarGraph.cpp @@ -73,10 +73,10 @@ void UIPetInfoBarGraph::Paint() { // OFFSET: 0x0086D380 // FUNCTION: fn_11045 -UIINT64BarGraph::UIINT64BarGraph(UIWindowContext& context) : UIWindow(context, 0), m_current(0), m_maximum(0) { +UIINT64BarGraph::UIINT64BarGraph() : UIWindow(0), m_current(0), m_maximum(0) { } // OFFSET: 0x0086E1B0 // FUNCTION: fn_11066 -UIPetInfoBarGraph::UIPetInfoBarGraph(UIWindowContext& context) : UIWindow(context, 0), unknown_007C(0) { +UIPetInfoBarGraph::UIPetInfoBarGraph() : UIWindow(0), unknown_007C(0) { } diff --git a/Source/UI/Gauges/UIPlayerGage.cpp b/Source/UI/Gauges/UIPlayerGage.cpp index d9ce6c32..c2b34585 100644 --- a/Source/UI/Gauges/UIPlayerGage.cpp +++ b/Source/UI/Gauges/UIPlayerGage.cpp @@ -2,7 +2,7 @@ // OFFSET: 0x0086D2D0 // FUNCTION: fn_11044 -UIGage::UIGage() : UIWindow(*reinterpret_cast(nullptr), 0) { +UIGage::UIGage() : UIWindow(0) { this->m_context = reinterpret_cast(0x009B1914); this->colors[0] = 0x00444444; this->colors[1] = 0x0025EA16; diff --git a/Source/UI/Guild/UIAgitWnd.cpp b/Source/UI/Guild/UIAgitWnd.cpp index 9cb0a572..16f3c529 100644 --- a/Source/UI/Guild/UIAgitWnd.cpp +++ b/Source/UI/Guild/UIAgitWnd.cpp @@ -23,7 +23,7 @@ // OFFSET: 0x009537B0 // FUNCTION: fn_12992 UIAgitMessageBox::UIAgitMessageBox() - : UIFrameWnd(*reinterpret_cast(0), 0), m_agitId(0) { + : UIFrameWnd(0), m_agitId(0) { } // OFFSET: 0x0095D580 diff --git a/Source/UI/Guild/UIGuildHelperWnd.cpp b/Source/UI/Guild/UIGuildHelperWnd.cpp index 25d6ba20..31fa7a29 100644 --- a/Source/UI/Guild/UIGuildHelperWnd.cpp +++ b/Source/UI/Guild/UIGuildHelperWnd.cpp @@ -31,7 +31,7 @@ CGuildTip g_guildTip; // OFFSET: 0x00953960 // FUNCTION: fn_12996 -UIGuildHelperWnd::UIGuildHelperWnd() : UIFrameWnd(*reinterpret_cast(0), 0) { +UIGuildHelperWnd::UIGuildHelperWnd() : UIFrameWnd(0) { } // OFFSET: 0x00953810 @@ -42,7 +42,7 @@ UICreateGuildWnd::UICreateGuildWnd(int mode) : m_mode(mode) { // OFFSET: 0x00953A90 // FUNCTION: fn_12998 UIGuildLeaveReasonDescWnd::UIGuildLeaveReasonDescWnd() - : UIFrameWnd(*reinterpret_cast(0), 0), m_reasonEdit(nullptr), m_reasonText(nullptr) { + : UIFrameWnd(0), m_reasonEdit(nullptr), m_reasonText(nullptr) { } // OFFSET: 0x00953880 @@ -271,7 +271,7 @@ int UIGuildTipWnd::SendMsg(UIWindow*, int message, std::intptr_t a1, std::intptr // OFFSET: 0x00958070 // FUNCTION: fn_13055 void UICreateGuildWnd::Slot15(int, int) { - this->m_nameEdit = new UIEditCtrl(*this->m_context); + this->m_nameEdit = new UIEditCtrl(); this->m_nameEdit->SetSize(124, 20); this->m_nameEdit->Move(13, 42); this->m_nameEdit->maximum = 23; @@ -285,7 +285,7 @@ void UICreateGuildWnd::Slot15(int, int) { int ids[2] = {184, 185}; for (unsigned int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -309,7 +309,7 @@ void UIGuildHelperWnd::Slot15(int width, int height) { int x = 8; for (int i = 0; i < 3; ++i) { - this->m_button = new UIBitmapButton(*this->m_context); + this->m_button = new UIBitmapButton(); this->m_button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); this->m_button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); this->m_button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); diff --git a/Source/UI/Guild/UIGuild_Storage_Log.cpp b/Source/UI/Guild/UIGuild_Storage_Log.cpp index 30f5607d..3d66e2b5 100644 --- a/Source/UI/Guild/UIGuild_Storage_Log.cpp +++ b/Source/UI/Guild/UIGuild_Storage_Log.cpp @@ -16,7 +16,7 @@ std::vector g_guildStorageLogs[3]; // OFFSET: 0x009469D0 // FUNCTION: fn_12849 -UIGuild_Storage_Log::UIGuild_Storage_Log(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIGuild_Storage_Log::UIGuild_Storage_Log() : UIFrameWnd(0) { this->unknown_0184 = 0; this->unknown_0188 = 0; this->unknown_018C = 0; diff --git a/Source/UI/Guild/UIGuild_Storage_Log.h b/Source/UI/Guild/UIGuild_Storage_Log.h index 53d160c6..b6a8cf12 100644 --- a/Source/UI/Guild/UIGuild_Storage_Log.h +++ b/Source/UI/Guild/UIGuild_Storage_Log.h @@ -29,7 +29,7 @@ extern std::vector g_guildStorageLogs[3]; class UIGuild_Storage_Log : public UIFrameWnd { public: - UIGuild_Storage_Log(UIWindowContext& windows); + UIGuild_Storage_Log(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp index 5c636b81..f8928c09 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp @@ -42,8 +42,8 @@ void CUIListItem::SetImageResources(CBitmapRes* normal, CBitmapRes* hover, CBitm // OFFSET: 0x00A0EBF0 // FUNCTION: fn_15152 -EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::CUIItemEquipmentPropertiesLine(UIWindowContext& context) - : CUIListItem(context), unknown_00E8(nullptr), unknown_00EC(nullptr), evenRowColor(0), oddRowColor(0) { +EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::CUIItemEquipmentPropertiesLine() + : CUIListItem(), unknown_00E8(nullptr), unknown_00EC(nullptr), evenRowColor(0), oddRowColor(0) { } template <> @@ -95,7 +95,7 @@ void CUIListBoxExitems.resize(count, nullptr); for (EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine*& slot : this->items) { EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine* item = - new EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine(*this->m_context); + new EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -222,8 +222,8 @@ bool CUIEquipmentPropertiesWnd::Slot08() { // OFFSET: 0x00A084C0 // FUNCTION: fn_15025 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), unknown_00C5{}, items(), data(), selected(static_cast(-1)), unknown_00E0(1), rebind(0), unknown_00E2{}, onSelect(), binder() { } @@ -251,7 +251,7 @@ void CUIEquipmentPropertiesWnd::Slot53() { // FUNCTION: fn_15034 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -293,7 +293,7 @@ private: // OFFSET: 0x00A09130 // FUNCTION: fn_15035 void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(300, 17); this->titleBar->Move(0, 0); { @@ -327,7 +327,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { } this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 18); title->Move(18, 0); const char* titleText = LookupMessage(4029); @@ -348,7 +348,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* baseButton = new CUIImageButton(*this->m_context); + CUIImageButton* baseButton = new CUIImageButton(); baseButton->SetSize(11, 11); baseButton->Move(3, 3); baseButton->SetOnClick([this]() { this->OnClickButton1(); }); @@ -391,7 +391,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { } this->titleBar->AddChild(baseButton); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(286, 3); closeButton->SetOnClick([this]() { this->OnClickClose(); }); @@ -436,7 +436,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { } this->titleBar->SetSecondButton(closeButton); - this->list = new CUIListBoxEx(*this->m_context); + this->list = new CUIListBoxEx(); this->list->itemWidth = 265; this->list->rowHeight = 18; this->list->SetSize(278, 270); @@ -505,13 +505,13 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { this->list->AddNewItem(); this->AddChild(this->list); - this->tabs = new CUITab(*this->m_context); + this->tabs = new CUITab(); this->tabs->SetSize(18, 265); this->tabs->Move(3, 18); this->tabs->SetOnChange([this](CUITabButton* button) { this->OnChangeTab(button); }); this->AddChild(this->tabs); - CUITabButton* allButton = new CUITabButton(*this->m_context); + CUITabButton* allButton = new CUITabButton(); allButton->SetSize(18, 34); allButton->Move(0, 0); allButton->SetOnClick([this]() { this->OnClickButton2(); }); @@ -541,7 +541,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { allButton->SetOrientation(1); this->tabs->AddChild(allButton); - CUITabButton* statButton = new CUITabButton(*this->m_context); + CUITabButton* statButton = new CUITabButton(); statButton->SetSize(18, 34); statButton->Move(0, 33); statButton->SetOnClick([this]() { this->OnClickButton3(); }); @@ -571,7 +571,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { statButton->SetOrientation(1); this->tabs->AddChild(statButton); - CUITabButton* abilityButton = new CUITabButton(*this->m_context); + CUITabButton* abilityButton = new CUITabButton(); abilityButton->SetSize(18, 34); abilityButton->Move(0, 66); abilityButton->SetOnClick([this]() { this->OnClickButton4(); }); @@ -601,7 +601,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { abilityButton->SetOrientation(1); this->tabs->AddChild(abilityButton); - CUITabButton* battleButton = new CUITabButton(*this->m_context); + CUITabButton* battleButton = new CUITabButton(); battleButton->SetSize(18, 34); battleButton->Move(0, 99); battleButton->SetOnClick([this]() { this->OnClickButton5(); }); @@ -631,7 +631,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { battleButton->SetOrientation(1); this->tabs->AddChild(battleButton); - CUITabButton* elementButton = new CUITabButton(*this->m_context); + CUITabButton* elementButton = new CUITabButton(); elementButton->SetSize(18, 34); elementButton->Move(0, 132); elementButton->SetOnClick([this]() { this->OnClickButton6(); }); @@ -661,7 +661,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { elementButton->SetOrientation(1); this->tabs->AddChild(elementButton); - CUITabButton* raceButton = new CUITabButton(*this->m_context); + CUITabButton* raceButton = new CUITabButton(); raceButton->SetSize(18, 34); raceButton->Move(0, 165); raceButton->SetOnClick([this]() { this->OnClickButton7(); }); @@ -691,7 +691,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { raceButton->SetOrientation(1); this->tabs->AddChild(raceButton); - CUITabButton* skillButton = new CUITabButton(*this->m_context); + CUITabButton* skillButton = new CUITabButton(); skillButton->SetSize(18, 34); skillButton->Move(0, 198); skillButton->SetOnClick([this]() { this->OnClickButton8(); }); @@ -721,7 +721,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { skillButton->SetOrientation(1); this->tabs->AddChild(skillButton); - CUITabButton* specialButton = new CUITabButton(*this->m_context); + CUITabButton* specialButton = new CUITabButton(); specialButton->SetSize(18, 34); specialButton->Move(0, 231); specialButton->SetOnClick([this]() { this->OnClickButton9(); }); @@ -751,7 +751,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { specialButton->SetOrientation(1); this->tabs->AddChild(specialButton); - this->resizer = new CUIResizer(*this->m_context); + this->resizer = new CUIResizer(); this->resizer->SetSize(13, 13); this->resizer->Move(286, 294); { @@ -777,7 +777,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { // OFFSET: 0x00A0C9C0 // FUNCTION: fn_15036 void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(44, 12); this->unknown_00E8->Move(0, 4); this->unknown_00E8->SetText("", 0); @@ -794,7 +794,7 @@ void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Slot15(int width, i this->unknown_00E8->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E8); - this->unknown_00EC = new CUIStaticText(*this->m_context); + this->unknown_00EC = new CUIStaticText(); this->unknown_00EC->SetSize(216, 12); this->unknown_00EC->Move(49, 4); this->unknown_00EC->SetText("", 0); diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.h b/Source/UI/Item/UIEquipmentPropertiesWnd.h index 96ee3aae..cecce92d 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.h +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.h @@ -11,7 +11,7 @@ namespace EquipmentPropertiesWnd { class CUIItemEquipmentPropertiesLine : public CUIListItem { public: - explicit CUIItemEquipmentPropertiesLine(UIWindowContext& context); + CUIItemEquipmentPropertiesLine(); /* 00E8 */ CUIStaticText* unknown_00E8; /* 00EC */ CUIStaticText* unknown_00EC; @@ -60,7 +60,7 @@ public: }; template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context); +CUIListBoxEx::CUIListBoxEx(); template <> CUIListBoxEx::~CUIListBoxEx(); template <> diff --git a/Source/UI/Item/UIItemBaseWnd.h b/Source/UI/Item/UIItemBaseWnd.h index 58827b42..ebf432d1 100644 --- a/Source/UI/Item/UIItemBaseWnd.h +++ b/Source/UI/Item/UIItemBaseWnd.h @@ -11,7 +11,6 @@ class UIItemBaseWnd : public UIFrameWnd { public: UIItemBaseWnd(); - UIItemBaseWnd(UIWindowContext& windowContext); void Slot10(int x, int y, std::intptr_t value) override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Item/UIItemPurchaseWnd.h b/Source/UI/Item/UIItemPurchaseWnd.h index 0097f2ac..2c31055b 100644 --- a/Source/UI/Item/UIItemPurchaseWnd.h +++ b/Source/UI/Item/UIItemPurchaseWnd.h @@ -12,7 +12,6 @@ class UIStaticText; class UIItemPurchaseWnd : public UIItemBaseWnd { public: UIItemPurchaseWnd(); - UIItemPurchaseWnd(UIWindowContext& windows); void Slot10(int x, int y, std::intptr_t value) override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Item/UIItemSellWnd.h b/Source/UI/Item/UIItemSellWnd.h index 14de4b88..611cb8a0 100644 --- a/Source/UI/Item/UIItemSellWnd.h +++ b/Source/UI/Item/UIItemSellWnd.h @@ -11,7 +11,7 @@ class UIStaticText; class UIItemSellWnd : public UIItemBaseWnd { public: - UIItemSellWnd(UIWindowContext& windows); + UIItemSellWnd(); void Slot11() override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; diff --git a/Source/UI/Item/UIItemSellWnd2.h b/Source/UI/Item/UIItemSellWnd2.h index 201b591f..9bd5d111 100644 --- a/Source/UI/Item/UIItemSellWnd2.h +++ b/Source/UI/Item/UIItemSellWnd2.h @@ -12,7 +12,7 @@ class UIStaticText; class UIItemSellWnd2 : public UIItemBaseWnd { public: - UIItemSellWnd2(UIWindowContext& windows); + UIItemSellWnd2(); std::vector BuildReplayRecords(); void Slot10(int x, int y, std::intptr_t value) override; void Slot11() override; diff --git a/Source/UI/Item/UIItemShopWnd.h b/Source/UI/Item/UIItemShopWnd.h index 453717b0..904f7cb6 100644 --- a/Source/UI/Item/UIItemShopWnd.h +++ b/Source/UI/Item/UIItemShopWnd.h @@ -15,7 +15,6 @@ class UIStaticText; class UIItemShopWnd : public UIItemBaseWnd { public: UIItemShopWnd(); - UIItemShopWnd(UIWindowContext& windows); std::vector BuildReplayRecords(); void Slot11() override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Item/UIItemShopWnd2.h b/Source/UI/Item/UIItemShopWnd2.h index d6757eb5..a260ffda 100644 --- a/Source/UI/Item/UIItemShopWnd2.h +++ b/Source/UI/Item/UIItemShopWnd2.h @@ -13,7 +13,7 @@ class UIStaticText; class UIItemShopWnd2 : public UIItemBaseWnd { public: - UIItemShopWnd2(UIWindowContext& windows); + UIItemShopWnd2(); void Slot11() override; void Paint() override; void Slot28(int x, int y) override; diff --git a/Source/UI/Item/UIItemStoreFindWnd.h b/Source/UI/Item/UIItemStoreFindWnd.h index 2dc13103..c95e5b0e 100644 --- a/Source/UI/Item/UIItemStoreFindWnd.h +++ b/Source/UI/Item/UIItemStoreFindWnd.h @@ -13,7 +13,7 @@ class UIStaticText; class UIItemStoreFindWnd : public UIItemBaseWnd { public: - UIItemStoreFindWnd(UIWindowContext& windows); + UIItemStoreFindWnd(); void Slot28(int x, int y) override; void Slot32(int x, int y) override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Item/UIItemStoreSubWnd.h b/Source/UI/Item/UIItemStoreSubWnd.h index b136f5bb..d877be72 100644 --- a/Source/UI/Item/UIItemStoreSubWnd.h +++ b/Source/UI/Item/UIItemStoreSubWnd.h @@ -12,7 +12,7 @@ class UIStaticText; class UIItemStoreSubWnd : public UIItemBaseWnd { public: - UIItemStoreSubWnd(UIWindowContext& windows); + UIItemStoreSubWnd(); void Slot28(int x, int y) override; void Slot32(int x, int y) override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Item/UIItemStoreWnd.h b/Source/UI/Item/UIItemStoreWnd.h index 82253b46..5bc22413 100644 --- a/Source/UI/Item/UIItemStoreWnd.h +++ b/Source/UI/Item/UIItemStoreWnd.h @@ -12,7 +12,7 @@ class UIStaticText; class UIItemStoreWnd : public UIItemBaseWnd { public: - UIItemStoreWnd(UIWindowContext& windows); + UIItemStoreWnd(); __declspec(noinline) ~UIItemStoreWnd() override; void Slot10(int x, int y, std::intptr_t value) override; void Slot28(int x, int y) override; diff --git a/Source/UI/Item/UIItemWnd.h b/Source/UI/Item/UIItemWnd.h index 091cf298..fe5e1d32 100644 --- a/Source/UI/Item/UIItemWnd.h +++ b/Source/UI/Item/UIItemWnd.h @@ -15,7 +15,6 @@ class UITabControl; class UIItemWnd : public UIItemBaseWnd { public: UIItemWnd(); - UIItemWnd(UIWindowContext& windows); __declspec(noinline) ~UIItemWnd() override; void Slot11() override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Item/UIMerchantItemLogWnd.cpp b/Source/UI/Item/UIMerchantItemLogWnd.cpp index ad33a9bf..7372359f 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.cpp +++ b/Source/UI/Item/UIMerchantItemLogWnd.cpp @@ -31,21 +31,21 @@ // OFFSET: 0x0099E0E0 // FUNCTION: fn_13571 -UIMerchantItemLogWnd::UIMerchantItemLogWnd(UIWindowContext& windows, int mode) : UIItemBaseWnd(windows) { +UIMerchantItemLogWnd::UIMerchantItemLogWnd(int mode) : UIItemBaseWnd() { this->unknown_00FC = mode; } // OFFSET: 0x0099E510 // FUNCTION: fn_13575 void UIMerchantItemLogWnd::Slot15(int width, int height) { - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize(160, 15); title->SetText(LookupMessage(2559 + (this->unknown_00FC != 0)), 0); title->Move(16, 2); title->shadow = 1; this->AddChild(title); - UIResizer* resizer = new UIResizer(*this->m_context); + UIResizer* resizer = new UIResizer(); this->resizer = resizer; resizer->SetSize(16, 16); resizer->SetDirection(3); @@ -54,12 +54,12 @@ void UIMerchantItemLogWnd::Slot15(int width, int height) { resizer->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(scrollBar); - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->buttons[0] = button; button->SetBitmap("유저인터페이스\\btn_close.bmp", 0, 0); button->SetBitmap("유저인터페이스\\btn_close_a.bmp", 1, 0); diff --git a/Source/UI/Item/UIMerchantItemLogWnd.h b/Source/UI/Item/UIMerchantItemLogWnd.h index 6574bd39..66ec1312 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.h +++ b/Source/UI/Item/UIMerchantItemLogWnd.h @@ -23,7 +23,7 @@ public: /* 0038 */ std::uint32_t characterId; }; - UIMerchantItemLogWnd(UIWindowContext& windows, int mode); + UIMerchantItemLogWnd(int mode); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Item/UIParaItemShopWnd.cpp index c92ead5f..77a0f632 100644 --- a/Source/UI/Item/UIParaItemShopWnd.cpp +++ b/Source/UI/Item/UIParaItemShopWnd.cpp @@ -227,19 +227,19 @@ void __stdcall Nullsub344(int, int) { // OFFSET: 0x009A83C0 // FUNCTION: fn_13750 void UIParaResultWnd::Slot15(int width, int height) { - this->total = new UIStaticText(*this->m_context); + this->total = new UIStaticText(); this->total->SetSize(160, 15); this->total->Move(12, this->geometry.height - 21); this->AddChild(this->total); - this->title = new UIStaticText(*this->m_context); + this->title = new UIStaticText(); this->title->SetSize(70, 15); this->title->SetText(LookupMessage(2530), 0); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); - UIResizer* resizer = new UIResizer(*this->m_context); + UIResizer* resizer = new UIResizer(); this->resizer = resizer; resizer->SetSize(16, 16); resizer->SetDirection(7); @@ -248,7 +248,7 @@ void UIParaResultWnd::Slot15(int width, int height) { resizer->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - this->unknown_0100 - this->unknown_00FC - 17); this->AddChild(scrollBar); @@ -257,7 +257,7 @@ void UIParaResultWnd::Slot15(int width, int height) { const std::string prefix = "유저인터페이스\\"; const int x = this->geometry.width - 61; const int y = this->geometry.height - 24; - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->buttons[0] = button; button->SetBitmap((prefix + "btn_ok.bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a.bmp").c_str(), 1, 0); diff --git a/Source/UI/Items/MergeItemWnd.cpp b/Source/UI/Items/MergeItemWnd.cpp index 1a097df8..0b0ac35d 100644 --- a/Source/UI/Items/MergeItemWnd.cpp +++ b/Source/UI/Items/MergeItemWnd.cpp @@ -44,8 +44,8 @@ struct ClientItemLists { // OFFSET: 0x007DEC20 // FUNCTION: fn_09659 -CMergeItemWnd::CMergeItemWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_cellSize(35), m_gridTop(20), m_gridLeft(10), +CMergeItemWnd::CMergeItemWnd() + : UIFrameWnd(0), m_cellSize(35), m_gridTop(20), m_gridLeft(10), m_marginRight(10), m_marginBottom(30), m_slotOffsetX(5), m_slotOffsetY(2), m_checkOffsetX(0), m_checkOffsetY(20), m_slotRadius(10), m_minSelection(2), m_mergeButton(nullptr), m_cancelButton(nullptr), m_closeButton(nullptr), m_items(), m_resizer(nullptr), m_scrollBar(nullptr), m_itemCount(0), m_columns(0), m_rows(0), m_visibleCount(0), m_scrollRow(0), m_scrollable(0) {} @@ -91,7 +91,7 @@ int CMergeItemWnd::ItemIdOf(int id) { // OFFSET: 0x007DF580 // FUNCTION: fn_09664 void CMergeItemWnd::CreateControls() { - this->m_mergeButton = new UIBitmapButton(*this->m_context); + this->m_mergeButton = new UIBitmapButton(); this->m_mergeButton->SetBitmap("유저인터페이스\\btn_ok.bmp", 0, 0); this->m_mergeButton->SetBitmap("유저인터페이스\\btn_ok_a.bmp", 1, 0); this->m_mergeButton->SetBitmap("유저인터페이스\\btn_ok_b.bmp", 2, 0); @@ -99,7 +99,7 @@ void CMergeItemWnd::CreateControls() { this->m_mergeButton->SetId(184); this->AddChild(this->m_mergeButton); - this->m_cancelButton = new UIBitmapButton(*this->m_context); + this->m_cancelButton = new UIBitmapButton(); this->m_cancelButton->SetBitmap("유저인터페이스\\btn_cancel.bmp", 0, 0); this->m_cancelButton->SetBitmap("유저인터페이스\\btn_cancel_a.bmp", 1, 0); this->m_cancelButton->SetBitmap("유저인터페이스\\btn_cancel_b.bmp", 2, 0); @@ -109,14 +109,14 @@ void CMergeItemWnd::CreateControls() { this->m_closeButton = this->AddCloseButton("", 240); - this->m_resizer = new UIResizer(*this->m_context); + this->m_resizer = new UIResizer(); this->m_resizer->SetSize(16, 16); this->m_resizer->SetDirection(7); this->m_resizer->SetBitmapName("유저인터페이스\\btn_resize.bmp"); this->m_resizer->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->m_resizer); - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(1, 1, 1, 1); this->AddChild(this->m_scrollBar); } @@ -355,7 +355,7 @@ int CMergeItemWnd::SendMsg(UIWindow*, int message, std::intptr_t argument1, std: this->m_itemCount = argument2; const std::int16_t* ids = reinterpret_cast(argument1); for (int index = 0; index < this->m_itemCount; ++index) { - UICheckBox* box = new UICheckBox(*this->m_context); + UICheckBox* box = new UICheckBox(); box->SetSize(120, 12); box->SetBitmaps("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp"); box->m_message = ids[index]; diff --git a/Source/UI/Items/MergeItemWnd.h b/Source/UI/Items/MergeItemWnd.h index 0c052752..71e7111f 100644 --- a/Source/UI/Items/MergeItemWnd.h +++ b/Source/UI/Items/MergeItemWnd.h @@ -13,7 +13,7 @@ class UIScrollBar; class CMergeItemWnd : public UIFrameWnd { public: - CMergeItemWnd(UIWindowContext& windows); + CMergeItemWnd(); ~CMergeItemWnd() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Items/UICardItemIllustWnd.h b/Source/UI/Items/UICardItemIllustWnd.h index 24e21664..bf234b25 100644 --- a/Source/UI/Items/UICardItemIllustWnd.h +++ b/Source/UI/Items/UICardItemIllustWnd.h @@ -8,7 +8,7 @@ class UICardItemIllustWnd : public UIFrameWnd { public: - UICardItemIllustWnd(UIWindowContext& windows); + UICardItemIllustWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Items/UIEquipWnd.h b/Source/UI/Items/UIEquipWnd.h index 4df2bbd5..b59bc5fc 100644 --- a/Source/UI/Items/UIEquipWnd.h +++ b/Source/UI/Items/UIEquipWnd.h @@ -12,7 +12,7 @@ class UICheckBox; class UIEquipWnd : public UIFrameWnd { public: - UIEquipWnd(UIWindowContext& windows); + UIEquipWnd(); bool Slot03() override; void Move(int x, int y) override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Items/UIGameItem.cpp b/Source/UI/Items/UIGameItem.cpp index 1df27fb9..8bff3290 100644 --- a/Source/UI/Items/UIGameItem.cpp +++ b/Source/UI/Items/UIGameItem.cpp @@ -21,8 +21,8 @@ // OFFSET: 0x009F71F0 // FUNCTION: fn_14769 -CUIGameItem::CUIGameItem(UIWindowContext& context) - : CUIControl(context), mode(0), unknown_0084(1), unknown_0085(1), transparent(0), scale(100), itemInfo(), name(), image(nullptr), showOverlay(0), +CUIGameItem::CUIGameItem() + : CUIControl(), mode(0), unknown_0084(1), unknown_0085(1), transparent(0), scale(100), itemInfo(), name(), image(nullptr), showOverlay(0), overlay(nullptr), onClick() { } diff --git a/Source/UI/Items/UIGameItem.h b/Source/UI/Items/UIGameItem.h index d43be700..87f77feb 100644 --- a/Source/UI/Items/UIGameItem.h +++ b/Source/UI/Items/UIGameItem.h @@ -9,7 +9,7 @@ class CUIGameItem : public CUIControl { public: - explicit CUIGameItem(UIWindowContext& context); + CUIGameItem(); /* 0080 */ int mode; /* 0084 */ unsigned char unknown_0084; diff --git a/Source/UI/Items/UIIllustWnd.cpp b/Source/UI/Items/UIIllustWnd.cpp index fbb65a3a..03bca39f 100644 --- a/Source/UI/Items/UIIllustWnd.cpp +++ b/Source/UI/Items/UIIllustWnd.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0096C8D0 // FUNCTION: fn_13177 -UIIllustWnd::UIIllustWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIIllustWnd::UIIllustWnd() : UIFrameWnd(0) { this->m_titled = 0; this->m_closable = 0; this->geometry.currentAlpha = 32; @@ -19,7 +19,7 @@ UIIllustWnd::UIIllustWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { // OFFSET: 0x0096C970 // FUNCTION: fn_13178 -UIMultiIllustWnd::UIMultiIllustWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIMultiIllustWnd::UIMultiIllustWnd() : UIFrameWnd(0) { this->m_titled = 0; this->m_closable = 0; this->geometry.currentAlpha = 32; diff --git a/Source/UI/Items/UIIllustWnd.h b/Source/UI/Items/UIIllustWnd.h index b6178b7c..81a02e4b 100644 --- a/Source/UI/Items/UIIllustWnd.h +++ b/Source/UI/Items/UIIllustWnd.h @@ -8,7 +8,7 @@ class UIIllustWnd : public UIFrameWnd { public: - UIIllustWnd(UIWindowContext& windows); + UIIllustWnd(); bool CanHitTest() override; void Slot15(int width, int height) override; void Slot18() override; @@ -25,7 +25,7 @@ protected: class UIMultiIllustWnd : public UIFrameWnd { public: - UIMultiIllustWnd(UIWindowContext& windows); + UIMultiIllustWnd(); bool CanHitTest() override; void Slot15(int width, int height) override; void Slot18() override; diff --git a/Source/UI/Items/UIItemCollectionWnd.h b/Source/UI/Items/UIItemCollectionWnd.h index 897c7482..725372e3 100644 --- a/Source/UI/Items/UIItemCollectionWnd.h +++ b/Source/UI/Items/UIItemCollectionWnd.h @@ -17,7 +17,7 @@ struct CombinedCardItemCollectionWndInfo; class UIItemCollectionWnd : public UIFrameWnd { public: - UIItemCollectionWnd(UIWindowContext& windows); + UIItemCollectionWnd(); ~UIItemCollectionWnd() override; void Slot11() override; void Slot15(int width, int height) override; @@ -72,7 +72,7 @@ public: class UICombinedCardItemCollectionWnd : public UIItemCollectionWnd { public: - UICombinedCardItemCollectionWnd(UIWindowContext& windows); + UICombinedCardItemCollectionWnd(); void Slot15(int width, int height) override; void Move(int x, int y) override; void Slot11() override; @@ -84,7 +84,7 @@ public: class UIItemCollection_ComparisonWnd : public UIItemCollectionWnd { public: - UIItemCollection_ComparisonWnd(UIWindowContext& windows); + UIItemCollection_ComparisonWnd(); void Slot15(int width, int height) override; void Move(int x, int y) override; void Slot25(int x, int y) override; @@ -95,7 +95,7 @@ public: class UICombinedCardItemCollection_ComparisonWnd : public UIItemCollectionWnd { public: - UICombinedCardItemCollection_ComparisonWnd(UIWindowContext& windows); + UICombinedCardItemCollection_ComparisonWnd(); void Slot15(int width, int height) override; void Slot25(int x, int y) override; void Slot31(int x, int y) override; diff --git a/Source/UI/Items/UIItemIdentifyWnd.h b/Source/UI/Items/UIItemIdentifyWnd.h index 81882c85..524ff750 100644 --- a/Source/UI/Items/UIItemIdentifyWnd.h +++ b/Source/UI/Items/UIItemIdentifyWnd.h @@ -21,7 +21,7 @@ public: /* 00D4 */ std::string m_title; /* 00EC */ WindowPlacement* m_placement; - UIItemIdentifyWnd(UIWindowContext& windows); + UIItemIdentifyWnd(); void Slot11() override; void Paint() override; void Slot15(int width, int height) override; @@ -38,7 +38,7 @@ public: class UIMakingArrowListWnd : public UIItemIdentifyWnd { public: - UIMakingArrowListWnd(UIWindowContext& windows); + UIMakingArrowListWnd(); void Paint() override; std::vector Slot44() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -48,14 +48,14 @@ public: class UIPetEggListWnd : public UIItemIdentifyWnd { public: - UIPetEggListWnd(UIWindowContext& windows); + UIPetEggListWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; class UIItemCompositionWnd : public UIItemIdentifyWnd { public: - UIItemCompositionWnd(UIWindowContext& windows); + UIItemCompositionWnd(); void Slot11() override; void Slot15(int width, int height) override; std::vector Slot44() override; diff --git a/Source/UI/Items/UIItemParamChangeDisplayWnd.cpp b/Source/UI/Items/UIItemParamChangeDisplayWnd.cpp index 23046e28..48d23994 100644 --- a/Source/UI/Items/UIItemParamChangeDisplayWnd.cpp +++ b/Source/UI/Items/UIItemParamChangeDisplayWnd.cpp @@ -3,7 +3,7 @@ // OFFSET: 0x008C7FC0 // FUNCTION: fn_11947 UIItemParamChangeDisplayWnd::UIItemParamChangeDisplayWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), + : UIFrameWnd(0), m_before(0), m_after(0), m_beforeSecond(0), diff --git a/Source/UI/Items/UINotifyItemObtainWnd.h b/Source/UI/Items/UINotifyItemObtainWnd.h index 48041688..8d3c8531 100644 --- a/Source/UI/Items/UINotifyItemObtainWnd.h +++ b/Source/UI/Items/UINotifyItemObtainWnd.h @@ -8,7 +8,7 @@ class UINotifyItemObtainWnd : public UIFrameWnd { public: - UINotifyItemObtainWnd(UIWindowContext& windows); + UINotifyItemObtainWnd(); /* 00B4 */ std::string m_itemId; /* 00CC */ std::string m_message; diff --git a/Source/UI/Items/UISpellListWnd.h b/Source/UI/Items/UISpellListWnd.h index 42de3d8c..a2996e3b 100644 --- a/Source/UI/Items/UISpellListWnd.h +++ b/Source/UI/Items/UISpellListWnd.h @@ -9,7 +9,7 @@ class UISpellListWnd : public UIItemIdentifyWnd { public: - UISpellListWnd(UIWindowContext& windows); + UISpellListWnd(); ~UISpellListWnd() override; /* 00F0 */ std::vector m_skills; /* 00FC */ std::int16_t unknown_00FC; diff --git a/Source/UI/Items/UISwapEquipmentWnd.cpp b/Source/UI/Items/UISwapEquipmentWnd.cpp index 512fd983..527d4107 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.cpp +++ b/Source/UI/Items/UISwapEquipmentWnd.cpp @@ -41,8 +41,8 @@ unsigned long g_swapEquipmentTick; // OFFSET: 0x0082F560 // FUNCTION: fn_10387 -UISwapEquipmentWnd::UISwapEquipmentWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_swapButton(nullptr), unknown_00BC(0), unknown_00C0(timeGetTime()), unknown_00D4(-1), unknown_00D8(-1), +UISwapEquipmentWnd::UISwapEquipmentWnd() + : UIFrameWnd(0), m_swapButton(nullptr), unknown_00BC(0), unknown_00C0(timeGetTime()), unknown_00D4(-1), unknown_00D8(-1), unknown_00DC(-1) { this->geometry.unknown_0030 = 0; } @@ -288,7 +288,7 @@ ITEM_INFO UISwapEquipmentWnd::GetSlotItem(int slot) { // OFFSET: 0x00830760 // FUNCTION: fn_10394 void UISwapEquipmentWnd::Slot15(int width, int height) { - this->m_swapButton = new (std::nothrow) UISwapBitmapButton(*this->m_context); + this->m_swapButton = new (std::nothrow) UISwapBitmapButton(); this->m_swapButton->SetBitmap("유저인터페이스\\swap_equipment\\btn_change2_normal.bmp", 0, 0); this->m_swapButton->SetBitmap("유저인터페이스\\swap_equipment\\btn_change2_over.bmp", 1, 0); this->m_swapButton->SetBitmap("유저인터페이스\\swap_equipment\\btn_change2_press.bmp", 2, 0); @@ -301,7 +301,7 @@ void UISwapEquipmentWnd::Slot15(int width, int height) { this->m_swapButton->SetId(0x1FC); this->AddChild(this->m_swapButton); - UIBasicButton* close = new (std::nothrow) UIBasicButton(*this->m_context); + UIBasicButton* close = new (std::nothrow) UIBasicButton(); close->Configure(0x32, LookupMessage(0xDA)); close->Move(0xE0, 0x9B); close->SetId(0xB9); diff --git a/Source/UI/Items/UISwapEquipmentWnd.h b/Source/UI/Items/UISwapEquipmentWnd.h index 87244d27..0fc86886 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.h +++ b/Source/UI/Items/UISwapEquipmentWnd.h @@ -22,7 +22,7 @@ class UISwapEquipmentWnd : public UIFrameWnd { friend class UIEquipWnd; public: - UISwapEquipmentWnd(UIWindowContext& windows); + UISwapEquipmentWnd(); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Lists/TableBox.cpp b/Source/UI/Lists/TableBox.cpp index 748ab418..5ae39c38 100644 --- a/Source/UI/Lists/TableBox.cpp +++ b/Source/UI/Lists/TableBox.cpp @@ -2,10 +2,10 @@ // OFFSET: 0x0086C120 // FUNCTION: fn_11021 -TableBox::TableBox(UIWindowContext& windows) : UIWindow(windows, 0), unknown_007C(), borderColor(0xFFFFFF) { +TableBox::TableBox() : UIWindow(0), unknown_007C(), borderColor(0xFFFFFF) { } // OFFSET: 0x0086EE30 // FUNCTION: fn_11084 -UITableBox::UITableBox(UIWindowContext& windows) : UIWindow(windows, 0), unknown_007C(0), unknown_0080(0), unknown_0084(0) { +UITableBox::UITableBox() : UIWindow(0), unknown_007C(0), unknown_0080(0), unknown_0084(0) { } diff --git a/Source/UI/Lists/TableBox.h b/Source/UI/Lists/TableBox.h index a709fcd1..3bbd3540 100644 --- a/Source/UI/Lists/TableBox.h +++ b/Source/UI/Lists/TableBox.h @@ -5,7 +5,7 @@ class TableBox : public UIWindow { public: - explicit TableBox(UIWindowContext& windows); + TableBox(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -16,7 +16,7 @@ public: class UITableBox : public UIWindow { public: - explicit UITableBox(UIWindowContext& windows); + UITableBox(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Lists/UIChatHisBox.cpp b/Source/UI/Lists/UIChatHisBox.cpp index 0988b6d8..e19cf334 100644 --- a/Source/UI/Lists/UIChatHisBox.cpp +++ b/Source/UI/Lists/UIChatHisBox.cpp @@ -86,7 +86,7 @@ void UIChatHisBox::sub_89C080() { // OFFSET: 0x0086C8D0 // FUNCTION: fn_11032 -UIChatHisBox::UIChatHisBox(UIWindowContext& windows) : UIListBox(windows) { +UIChatHisBox::UIChatHisBox() : UIListBox() { new (&this->ItemTags()) std::list>(); this->maxLines = 240; this->lineHeight = 14; diff --git a/Source/UI/Lists/UIChatHisBox.h b/Source/UI/Lists/UIChatHisBox.h index 510ef60d..9effbada 100644 --- a/Source/UI/Lists/UIChatHisBox.h +++ b/Source/UI/Lists/UIChatHisBox.h @@ -12,7 +12,7 @@ class UINaviLinkButton; class UIChatHisBox : public UIListBox { public: - UIChatHisBox(UIWindowContext& windows); + UIChatHisBox(); ~UIChatHisBox() override; bool Slot08() override; void Resize(int width, int height) override; diff --git a/Source/UI/Lists/UIComboBox.cpp b/Source/UI/Lists/UIComboBox.cpp index 9c15908a..9521bdc6 100644 --- a/Source/UI/Lists/UIComboBox.cpp +++ b/Source/UI/Lists/UIComboBox.cpp @@ -297,5 +297,5 @@ int UIListBoxID::sub_8991B0(UIWindow* sender, int message, std::intptr_t argumen // OFFSET: 0x0086CB40 // FUNCTION: fn_11033 -UIComboBox::UIComboBox(UIWindowContext& windows) : UIListBox(windows), targetId(10041) { +UIComboBox::UIComboBox() : UIListBox(), targetId(10041) { } diff --git a/Source/UI/Lists/UIComboBox.h b/Source/UI/Lists/UIComboBox.h index 9b2e29f6..280dbdf3 100644 --- a/Source/UI/Lists/UIComboBox.h +++ b/Source/UI/Lists/UIComboBox.h @@ -8,7 +8,6 @@ class UIComboBox : public UIListBox { public: UIComboBox(); - UIComboBox(UIWindowContext& windows); void Resize(int width, int height) override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index 50447529..dceb0c4b 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -35,8 +35,8 @@ namespace { // OFFSET: 0x0086CC20 // FUNCTION: fn_11035 -UIComboBoxDefWnd::UIComboBoxDefWnd(UIWindowContext& windows) - : UIWindow(windows, 0), button(nullptr), list(nullptr), label(nullptr), borderless(0), expanded(0), red(255), green(255), blue(255), borderRed(0), +UIComboBoxDefWnd::UIComboBoxDefWnd() + : UIWindow(0), button(nullptr), list(nullptr), label(nullptr), borderless(0), expanded(0), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0), dropdownHeight(40) { } @@ -47,7 +47,7 @@ UIComboBoxDefWnd::~UIComboBoxDefWnd() = default; // OFFSET: 0x00885920 // FUNCTION: fn_11319 void UIComboBoxDefWnd::Slot15(int, int) { - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); const char* names[] = {"txtbox_btn_a.bmp", "txtbox_btn_b.bmp", "txtbox_btn_c.bmp"}; for (int state = 0; state < 3; ++state) { @@ -59,12 +59,12 @@ void UIComboBoxDefWnd::Slot15(int, int) { this->button->SetId(273); this->AddChild(this->button); - this->list = new UIComboBoxEx(*this->m_context); + this->list = new UIComboBoxEx(); this->list->SetSize(this->geometry.width, this->dropdownHeight); this->list->Move(0, this->button->BitmapHeight()); this->AddChild(this->list); - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize((this->geometry.width - this->button->BitmapWidth()), this->button->BitmapHeight()); this->label->SetText("(NO SELECT)", 0); this->label->Move(2, 3); @@ -79,7 +79,7 @@ void UIComboBox_BmpWnd::Create(int width, int height, const char* path, const ch this->name = name; const std::string base(path); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((base + "_out.bmp").c_str(), 0, 0); this->button->SetBitmap((base + "_over.bmp").c_str(), 1, 0); this->button->SetBitmap((base + "_press.bmp").c_str(), 2, 0); @@ -88,14 +88,14 @@ void UIComboBox_BmpWnd::Create(int width, int height, const char* path, const ch this->button->SetId(273); this->AddChild(this->button); - this->list = new UIComboBoxEx(*this->m_context); + this->list = new UIComboBoxEx(); this->list->SetSize(this->geometry.width, this->dropdownHeight); this->list->Move(0, this->button->BitmapHeight()); this->AddChild(this->list); char text[12] = {}; std::sprintf(text, "(NO SELECT)"); - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize((this->geometry.width - this->button->BitmapWidth()), this->button->BitmapHeight()); this->label->SetText(text, 0); this->label->Move(2, 3); @@ -256,8 +256,8 @@ int UIItemStoreComboBoxWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x0086CBA0 // FUNCTION: fn_11034 -UIComboBoxDef2Wnd::UIComboBoxDef2Wnd(UIWindowContext& windows) - : UIComboBoxDefWnd(windows), skin(0), alignment(0), textOffset(0), previousTextX(0) { +UIComboBoxDef2Wnd::UIComboBoxDef2Wnd() + : UIComboBoxDefWnd(), skin(0), alignment(0), textOffset(0), previousTextX(0) { } // OFFSET: 0x00872A70 @@ -269,7 +269,7 @@ UIComboBoxDef2Wnd::~UIComboBoxDef2Wnd() = default; void UIComboBoxDef2Wnd::Slot15(int width, int) { const std::string path = std::string(prefix) + (this->skin == 1 ? "login_interface\\" : "UIadventurerAgency\\"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); const char* names[] = {"btn_dropdown_out.bmp", "btn_dropdown_over.bmp", "btn_dropdown_press.bmp"}; for (int state = 0; state < 3; ++state) { @@ -281,14 +281,14 @@ void UIComboBoxDef2Wnd::Slot15(int width, int) { this->button->SetId(273); this->AddChild(this->button); - auto* list = new UIComboBoxEx2(*this->m_context); + auto* list = new UIComboBoxEx2(); this->list = list; list->alignment = this->alignment; list->SetSize(width, (this->dropdownHeight + 2)); list->Move(0, this->button->BitmapHeight()); this->AddChild(list); - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize((this->geometry.width - this->button->BitmapWidth()), (this->button->BitmapHeight() - 6)); this->label->SetText("", 0); int x = 0; @@ -330,7 +330,7 @@ void UIComboBoxDef2Wnd::Paint() { // FUNCTION: fn_11329 void UINewComboBoxCtrl::Slot15(int, int) { const std::string base = "유저인터페이스\\basic_interface\\txtbox_btn_"; - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((base + "a.bmp").c_str(), 0, 0); this->button->SetBitmap((base + "b.bmp").c_str(), 1, 0); this->button->SetBitmap((base + "c.bmp").c_str(), 2, 0); @@ -339,7 +339,7 @@ void UINewComboBoxCtrl::Slot15(int, int) { this->button->SetId(273); this->AddChild(this->button); - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize((this->geometry.width - this->button->BitmapWidth()), this->button->BitmapHeight()); this->label->SetText("(No Select)", 0); this->label->Move(2, 3); @@ -504,7 +504,6 @@ void UIString::ParseTags(std::string text) { // OFFSET: 0x008A0B10 // FUNCTION: fn_11630 void UIDescriptRace::sub_8A0B10() { - UIWindowContext& context = *this->m_context; if (this->m_race == 1) { if (!g_doramCreationEnabled) { return; @@ -667,7 +666,7 @@ void UITextViewEX::SetText(std::string text) { const std::size_t close = text.find("<\\end>", tag); segment = text.substr(tag, close - tag); - UIString* link = new UIString(*this->m_context); + UIString* link = new UIString(); link->SetText(100, 100, segment); link->Show(0); this->AddChild(link); @@ -719,7 +718,7 @@ int UITextViewEX::AddWords(std::string text, int attached, int red, int green, i break; } - UIString* label = new UIString(*this->m_context); + UIString* label = new UIString(); label->SetText(100, 100, word); label->Show(0); label->unknown_0080 = attached; diff --git a/Source/UI/Lists/UIComboBoxDefWnd.h b/Source/UI/Lists/UIComboBoxDefWnd.h index 203e7074..99f08d6b 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.h +++ b/Source/UI/Lists/UIComboBoxDefWnd.h @@ -10,7 +10,8 @@ class UIStaticText; class UIComboBoxDefWnd : public UIWindow { public: UIComboBoxDefWnd(); - UIComboBoxDefWnd(UIWindowContext& windows); + UIComboBoxDefWnd(UIWindowContext&) : UIComboBoxDefWnd() { + } ~UIComboBoxDefWnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -65,7 +66,6 @@ public: class UIComboBoxDef2Wnd : public UIComboBoxDefWnd { public: UIComboBoxDef2Wnd(); - UIComboBoxDef2Wnd(UIWindowContext& windows); ~UIComboBoxDef2Wnd() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Lists/UIComboBoxEx.cpp b/Source/UI/Lists/UIComboBoxEx.cpp index 51560887..24110ee9 100644 --- a/Source/UI/Lists/UIComboBoxEx.cpp +++ b/Source/UI/Lists/UIComboBoxEx.cpp @@ -26,7 +26,7 @@ namespace { // OFFSET: 0x0086CD40 // FUNCTION: fn_11037 -UIComboBoxEx::UIComboBoxEx(UIWindowContext& windows) : UIListBoxEx(windows), targetId(10041) { +UIComboBoxEx::UIComboBoxEx() : UIListBoxEx(), targetId(10041) { } // OFFSET: 0x00872C00 @@ -266,7 +266,7 @@ void UIComboBoxEx::Paint() { // OFFSET: 0x0086CCE0 // FUNCTION: fn_11036 -UIComboBoxEx2::UIComboBoxEx2(UIWindowContext& windows) : UIComboBoxEx(windows), alignment(0) { +UIComboBoxEx2::UIComboBoxEx2() : UIComboBoxEx(), alignment(0) { } // OFFSET: 0x008706D0 @@ -276,7 +276,7 @@ UIComboBoxEx2::~UIComboBoxEx2() = default; // OFFSET: 0x00885EE0 // FUNCTION: fn_11320 void UIComboBoxEx2::Slot15(int width, int height) { - auto* vertical = new UIScrollBar_Navi(*this->m_context); + auto* vertical = new UIScrollBar_Navi(); this->verticalBar = vertical; vertical->vertical = 1; vertical->UIWindow::Resize(vertical->thickness, height); @@ -285,7 +285,7 @@ void UIComboBoxEx2::Slot15(int width, int height) { vertical->Slot22(vertical->thickness, height); this->AddChild(vertical); - auto* horizontal = new UIScrollBar(*this->m_context); + auto* horizontal = new UIScrollBar(); this->horizontalBar = horizontal; horizontal->vertical = 0; horizontal->UIWindow::Resize((width - 7), horizontal->thickness); diff --git a/Source/UI/Lists/UIComboBoxEx.h b/Source/UI/Lists/UIComboBoxEx.h index 6249f06e..dfd26d48 100644 --- a/Source/UI/Lists/UIComboBoxEx.h +++ b/Source/UI/Lists/UIComboBoxEx.h @@ -5,7 +5,7 @@ class UIComboBoxEx : public UIListBoxEx { public: - UIComboBoxEx(UIWindowContext& windows); + UIComboBoxEx(); ~UIComboBoxEx() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; @@ -26,7 +26,7 @@ protected: class UIComboBoxEx2 : public UIComboBoxEx { public: - UIComboBoxEx2(UIWindowContext& windows); + UIComboBoxEx2(); ~UIComboBoxEx2() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Lists/UIComboBoxV2Wnd.cpp b/Source/UI/Lists/UIComboBoxV2Wnd.cpp index ab8cff70..63bd95a6 100644 --- a/Source/UI/Lists/UIComboBoxV2Wnd.cpp +++ b/Source/UI/Lists/UIComboBoxV2Wnd.cpp @@ -2,5 +2,5 @@ // OFFSET: 0x0086CF40 // FUNCTION: fn_11039 -UIComboBoxV2Wnd::UIComboBoxV2Wnd(UIWindowContext& windows) : UIWindow(windows, 0), selected(-1), unknown_0098(nullptr), list(nullptr) { +UIComboBoxV2Wnd::UIComboBoxV2Wnd() : UIWindow(0), selected(-1), unknown_0098(nullptr), list(nullptr) { } diff --git a/Source/UI/Lists/UIComboBoxV2Wnd.h b/Source/UI/Lists/UIComboBoxV2Wnd.h index 7e461eb7..c02cba58 100644 --- a/Source/UI/Lists/UIComboBoxV2Wnd.h +++ b/Source/UI/Lists/UIComboBoxV2Wnd.h @@ -9,7 +9,7 @@ class UIListBoxEx; class UIComboBoxV2Wnd : public UIWindow { public: - explicit UIComboBoxV2Wnd(UIWindowContext& windows); + UIComboBoxV2Wnd(); void Paint() override; void Slot31(int x, int y) override; void Slot35(int value) override; diff --git a/Source/UI/Lists/UIComboBoxWnd.h b/Source/UI/Lists/UIComboBoxWnd.h index 0505a6df..cfbd535b 100644 --- a/Source/UI/Lists/UIComboBoxWnd.h +++ b/Source/UI/Lists/UIComboBoxWnd.h @@ -8,7 +8,7 @@ class UIListBoxID; class UIComboBoxWnd : public UIFrameWnd { public: - UIComboBoxWnd(UIWindowContext& windows); + UIComboBoxWnd(); /* 00B4 */ UIListBox* m_list; /* 00B8 */ UIWindow* m_owner; @@ -22,7 +22,7 @@ public: class UIComboBoxIDWnd : public UIFrameWnd { public: - UIComboBoxIDWnd(UIWindowContext& windows); + UIComboBoxIDWnd(); /* 00B4 */ UIListBoxID* m_list; /* 00B8 */ UIWindow* m_owner; diff --git a/Source/UI/Lists/UIDropDownBox.cpp b/Source/UI/Lists/UIDropDownBox.cpp index f560e086..fb1122c2 100644 --- a/Source/UI/Lists/UIDropDownBox.cpp +++ b/Source/UI/Lists/UIDropDownBox.cpp @@ -6,7 +6,7 @@ #include // INLINED -CUIDropDownBox::CUIDropDownBox(UIWindowContext& context) : CUIControl(context), owner(nullptr) { +CUIDropDownBox::CUIDropDownBox() : CUIControl(), owner(nullptr) { } // OFFSET: 0x009E3300 @@ -70,7 +70,7 @@ void WindowDropDown::Show(UIWindow* owner, UIWindow* child, int x, int y) { } if (!this->popup) { - this->popup = new CUIDropDownBox(this->windows); + this->popup = new CUIDropDownBox(); } this->popup->Attach(owner, child); diff --git a/Source/UI/Lists/UIDropDownBox.h b/Source/UI/Lists/UIDropDownBox.h index 046fe046..02a83d24 100644 --- a/Source/UI/Lists/UIDropDownBox.h +++ b/Source/UI/Lists/UIDropDownBox.h @@ -7,7 +7,7 @@ struct WindowOrdering; class CUIDropDownBox : public CUIControl { public: - explicit CUIDropDownBox(UIWindowContext& context); + CUIDropDownBox(); ~CUIDropDownBox() override; void Paint() override; void Detach(); @@ -19,7 +19,6 @@ public: }; struct WindowDropDown { - UIWindowContext& windows; WindowOrdering& ordering; CUIDropDownBox*& popup; diff --git a/Source/UI/Lists/UIItemStoreComboBox.cpp b/Source/UI/Lists/UIItemStoreComboBox.cpp index 7f5303b0..a25f6ee7 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.cpp +++ b/Source/UI/Lists/UIItemStoreComboBox.cpp @@ -9,7 +9,7 @@ // OFFSET: 0x0086D530 // FUNCTION: fn_11047 UIItemStoreComboBox::UIItemStoreComboBox() - : UIComboBoxEx(*reinterpret_cast(nullptr)), pink(false) { + : UIComboBoxEx(), pink(false) { } // OFFSET: 0x00886200 @@ -19,7 +19,7 @@ void UIItemStoreComboBoxWnd::Slot15(int, int) { const char* pressed = this->pink == 1 ? "combo_btn_pink_b" : "combo_btn_b"; const char* disabled = this->pink == 1 ? "combo_btn_pink_c" : "combo_btn_c"; - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((path + "combo_btn_a" + ".bmp").c_str(), 0, 0); this->button->SetBitmap((path + pressed + ".bmp").c_str(), 1, 0); this->button->SetBitmap((path + disabled + ".bmp").c_str(), 2, 0); @@ -28,7 +28,7 @@ void UIItemStoreComboBoxWnd::Slot15(int, int) { this->button->SetId(273); this->AddChild(this->button); - UIItemStoreComboBox* items = new UIItemStoreComboBox(*this->m_context); + UIItemStoreComboBox* items = new UIItemStoreComboBox(); this->list = items; items->pink = this->pink != 0; this->list->SetSize(62, 45); @@ -38,7 +38,7 @@ void UIItemStoreComboBoxWnd::Slot15(int, int) { char text[12] = {}; std::sprintf(text, "(NO SELECT)"); - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize(this->geometry.width - this->button->BitmapWidth(), this->button->BitmapHeight()); this->label->SetText(text, 0); this->label->Move(2, 3); @@ -48,5 +48,5 @@ void UIItemStoreComboBoxWnd::Slot15(int, int) { // OFFSET: 0x0086D590 // FUNCTION: fn_11048 -UIItemStoreComboBoxWnd::UIItemStoreComboBoxWnd(UIWindowContext& windows) : UIComboBoxDefWnd(windows), pink(0) { +UIItemStoreComboBoxWnd::UIItemStoreComboBoxWnd() : UIComboBoxDefWnd(), pink(0) { } diff --git a/Source/UI/Lists/UIItemStoreComboBox.h b/Source/UI/Lists/UIItemStoreComboBox.h index 6fcb7a53..5d0dd349 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.h +++ b/Source/UI/Lists/UIItemStoreComboBox.h @@ -7,7 +7,6 @@ class UIItemStoreComboBox : public UIComboBoxEx { public: UIItemStoreComboBox(); - UIItemStoreComboBox(UIWindowContext& windows) : UIComboBoxEx(windows), pink(false) {} void Slot15(int width, int height) override; void Paint() override; void Slot27(int x, int y) override; @@ -18,7 +17,7 @@ public: class UIItemStoreComboBoxWnd : public UIComboBoxDefWnd { public: - UIItemStoreComboBoxWnd(UIWindowContext& windows); + UIItemStoreComboBoxWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index caab5c22..06697fdf 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -27,7 +27,7 @@ namespace {} // OFFSET: 0x0086D940 // FUNCTION: fn_11055 UIListBox::UIListBox() - : UIWindow(*reinterpret_cast(nullptr), 0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), + : UIWindow(0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), verticalOverflow(0), bottomMargin(0), verticalBar(nullptr), horizontalBar(nullptr), transparent(0), lineHeight(16), textColor(0), textInset(3) { const SkinPaletteCell cell = {3, 2}; @@ -44,21 +44,6 @@ UIServerListBox::UIServerListBox() : UIListBox() { this->unknown_00E0 = 0; } -UIListBox::UIListBox(UIWindowContext& windows) - : UIWindow(windows, 0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), - verticalOverflow(0), bottomMargin(0), verticalBar(nullptr), horizontalBar(nullptr), transparent(0), lineHeight(16), selectable(1), textColor(0), - centerVertically(0), textInset(3) { - constexpr char path[] = "유저인터페이스\\colorchip.bmp"; - const auto* chip = static_cast(ResourceMgr::Instance().Load(path)); - this->selectionColor = 0; - - if (chip) { - const auto& image = chip->image; - const std::uint32_t pixel = image.width > 14 && image.height > 10 ? image.pixels[14 + 10 * image.width] : 0x00FF0000u; - this->selectionColor = ((pixel & 255) << 16) | (pixel & 0xFF00) | ((pixel >> 16) & 255); - } -} - // OFFSET: 0x00873690 // FUNCTION: fn_11105 UIListBox::~UIListBox() = default; @@ -103,7 +88,7 @@ void UIListBox::Configure(int x, int y, int width, int height, unsigned char val // OFFSET: 0x00886840 // FUNCTION: fn_11326 void UIListBox::Slot15(int width, int height) { - auto* vertical = new UIScrollBar(*this->m_context); + auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -113,7 +98,7 @@ void UIListBox::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(vertical); - auto* horizontal = new UIScrollBar(*this->m_context); + auto* horizontal = new UIScrollBar(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; @@ -556,5 +541,5 @@ void UIListBoxID::AddLine(const char* text, int id) { // OFFSET: 0x0086D8C0 // FUNCTION: fn_11054 -UIListBox2::UIListBox2(UIWindowContext& windows) : UIListBox(windows), fontFamily(0), fontHeight(12), bold(0), italic(0) { +UIListBox2::UIListBox2() : UIListBox(), fontFamily(0), fontHeight(12), bold(0), italic(0) { } diff --git a/Source/UI/Lists/UIListBox.h b/Source/UI/Lists/UIListBox.h index 15fb6de5..6d67ac02 100644 --- a/Source/UI/Lists/UIListBox.h +++ b/Source/UI/Lists/UIListBox.h @@ -14,7 +14,8 @@ class UIScrollBar; class UIListBox : public UIWindow { public: __declspec(noinline) UIListBox(); - __declspec(noinline) UIListBox(UIWindowContext& windows); + UIListBox(UIWindowContext&) : UIListBox() { + } ~UIListBox() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; @@ -70,7 +71,7 @@ public: class UIListBox2 : public UIListBox { public: - UIListBox2(UIWindowContext& windows); + UIListBox2(); void Paint() override; /* 00D4 */ int fontFamily; diff --git a/Source/UI/Lists/UIListBoxEx.cpp b/Source/UI/Lists/UIListBoxEx.cpp index f86acfab..8f8df4ef 100644 --- a/Source/UI/Lists/UIListBoxEx.cpp +++ b/Source/UI/Lists/UIListBoxEx.cpp @@ -10,8 +10,8 @@ // OFFSET: 0x0086DA90 // FUNCTION: fn_11056 -UIListBoxEx::UIListBoxEx(UIWindowContext& windows) - : UIWindow(windows, 0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), +UIListBoxEx::UIListBoxEx() + : UIWindow(0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), verticalOverflow(0), bottomMargin(0), verticalBar(nullptr), horizontalBar(nullptr), transparent(0), lineHeight(16), selectionColor(0) { constexpr char path[] = "유저인터페이스\\colorchip.bmp"; const auto* chip = static_cast(ResourceMgr::Instance().Load(path)); @@ -40,7 +40,7 @@ void UIListBoxEx::Configure(int x, int y, int width, int height, unsigned char v // OFFSET: 0x00886990 // FUNCTION: fn_11327 void UIListBoxEx::Slot15(int width, int height) { - auto* vertical = new UIScrollBar(*this->m_context); + auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int thickness = vertical->thickness; vertical->vertical = 1; @@ -50,7 +50,7 @@ void UIListBoxEx::Slot15(int width, int height) { vertical->Slot22(thickness, height); this->AddChild(vertical); - auto* horizontal = new UIScrollBar(*this->m_context); + auto* horizontal = new UIScrollBar(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; diff --git a/Source/UI/Lists/UIListBoxEx.h b/Source/UI/Lists/UIListBoxEx.h index 18ed4b98..640f8bf9 100644 --- a/Source/UI/Lists/UIListBoxEx.h +++ b/Source/UI/Lists/UIListBoxEx.h @@ -15,7 +15,7 @@ struct ExtendedListLine { class UIListBoxEx : public UIWindow { public: - UIListBoxEx(UIWindowContext& windows); + UIListBoxEx(); ~UIListBoxEx() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Lists/UIListBoxID.cpp b/Source/UI/Lists/UIListBoxID.cpp index 5434fb0b..d8c35fad 100644 --- a/Source/UI/Lists/UIListBoxID.cpp +++ b/Source/UI/Lists/UIListBoxID.cpp @@ -36,7 +36,7 @@ void UIListBoxID::Configure(int x, int y, int width, int height, unsigned char t // OFFSET: 0x00886070 // FUNCTION: fn_11322 void UIComboBoxID::Slot15(int width, int height) { - auto* vertical = new UIScrollBar(*this->m_context); + auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; @@ -46,7 +46,7 @@ void UIComboBoxID::Slot15(int width, int height) { vertical->Slot22(verticalWidth, height); this->AddChild(this->verticalBar); - auto* horizontal = new UIScrollBar(*this->m_context); + auto* horizontal = new UIScrollBar(); this->horizontalBar = horizontal; const int horizontalHeight = horizontal->thickness; horizontal->vertical = 0; diff --git a/Source/UI/Lists/UIListBoxNavi.cpp b/Source/UI/Lists/UIListBoxNavi.cpp index 38cb6bc3..b04eadb5 100644 --- a/Source/UI/Lists/UIListBoxNavi.cpp +++ b/Source/UI/Lists/UIListBoxNavi.cpp @@ -2,7 +2,7 @@ // OFFSET: 0x0086DD10 // FUNCTION: fn_11058 -UIListBoxNavi::UIListBoxNavi(UIWindowContext& windows) : UIListBox(windows), lineColors(), lineOffset(-1) { +UIListBoxNavi::UIListBoxNavi() : UIListBox(), lineColors(), lineOffset(-1) { this->defaultLineColor = 0xD2D2D2; } diff --git a/Source/UI/Lists/UIListBoxNavi.h b/Source/UI/Lists/UIListBoxNavi.h index 72d9a131..81bfe8ef 100644 --- a/Source/UI/Lists/UIListBoxNavi.h +++ b/Source/UI/Lists/UIListBoxNavi.h @@ -8,7 +8,9 @@ class UIListBoxNavi : public UIListBox { public: - UIListBoxNavi(UIWindowContext& windows); + UIListBoxNavi(); + UIListBoxNavi(UIWindowContext&) : UIListBoxNavi() { + } void Paint() override; void Slot25(int x, int y) override; void Clear() override; diff --git a/Source/UI/Lists/UIListBoxNaviSearch.h b/Source/UI/Lists/UIListBoxNaviSearch.h index 3393883c..7ca443ec 100644 --- a/Source/UI/Lists/UIListBoxNaviSearch.h +++ b/Source/UI/Lists/UIListBoxNaviSearch.h @@ -7,7 +7,7 @@ class UIListBox_NaviSearch : public UIListBox { public: - UIListBox_NaviSearch(UIWindowContext& windows); + UIListBox_NaviSearch(); void Resize(int width, int height) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Lists/UIListBoxTemplate.h b/Source/UI/Lists/UIListBoxTemplate.h index 57798e54..9231fe0e 100644 --- a/Source/UI/Lists/UIListBoxTemplate.h +++ b/Source/UI/Lists/UIListBoxTemplate.h @@ -15,8 +15,7 @@ class CUIListItem : public CUIControl { public: - CUIListItem(); - __declspec(noinline) explicit CUIListItem(UIWindowContext& context); + __declspec(noinline) CUIListItem(); ~CUIListItem() override; void Slot25(int x, int y) override; @@ -53,7 +52,7 @@ class CUIPage; class CUISubTab : public CUIListItem { public: - explicit CUISubTab(UIWindowContext& context); + CUISubTab(); void Slot15(int width, int height) override; void Slot16() override; @@ -65,10 +64,7 @@ public: class CUITab : public CUIListItem { public: - // INLINED - CUITab() : CUIListItem(), unknown_00E8(nullptr), subTabs(nullptr), unknown_00F0(), type(7), page(nullptr), unknown_0110(0) { - } - explicit CUITab(UIWindowContext& context); + CUITab(); void Slot15(int width, int height) override; void Slot16() override; void SetSelected(bool selected) override; @@ -86,7 +82,7 @@ public: class CUIItemInfo : public CUIListItem { public: - explicit CUIItemInfo(UIWindowContext& context); + CUIItemInfo(); void Slot15(int width, int height) override; void Slot16() override; void Slot32(int x, int y) override; @@ -111,7 +107,7 @@ public: class CUIMonsterInfo : public CUIListItem { public: - explicit CUIMonsterInfo(UIWindowContext& context); + CUIMonsterInfo(); void Slot15(int width, int height) override; void Slot16() override; void Paint() override; @@ -126,7 +122,7 @@ public: class CUIQuestInfo : public CUIListItem { public: - explicit CUIQuestInfo(UIWindowContext& context); + CUIQuestInfo(); void Slot15(int width, int height) override; void Slot16() override; void SetTitle(int id); @@ -144,7 +140,7 @@ public: class CUITabInfo : public CUIListItem { public: - explicit CUITabInfo(UIWindowContext& context); + CUITabInfo(); void Slot15(int width, int height) override; void Slot16() override; @@ -196,8 +192,8 @@ struct Contents { template class CUIListBox : public CUIControl { public: // INLINED - explicit CUIListBox(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), selected(nullptr), locked(0) { + explicit CUIListBox() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), selected(nullptr), locked(0) { } ~CUIListBox() override; @@ -295,7 +291,7 @@ public: template class CUIListBoxEx : public CUIControl { public: - explicit CUIListBoxEx(UIWindowContext& context); + CUIListBoxEx(); ~CUIListBoxEx() override; void Slot15(int width, int height) override; // OFFSET: 0x00A01E70 diff --git a/Source/UI/Lists/UIMemberListBox.h b/Source/UI/Lists/UIMemberListBox.h index 26099178..8b66e645 100644 --- a/Source/UI/Lists/UIMemberListBox.h +++ b/Source/UI/Lists/UIMemberListBox.h @@ -7,7 +7,6 @@ class UIChatHisBox2 : public UIChatHisBox { public: UIChatHisBox2(); - UIChatHisBox2(UIWindowContext& windows); bool Slot08() override; void Paint() override; void Slot15(int width, int height) override; @@ -21,7 +20,7 @@ public: class UIChatHisBox3 : public UIChatHisBox2 { public: - UIChatHisBox3(UIWindowContext& windows); + UIChatHisBox3(); void Paint() override; void Slot15(int width, int height) override; void Resize(int width, int height) override; @@ -33,7 +32,7 @@ public: class UIMemberListBox : public UIChatHisBox2 { public: - UIMemberListBox(UIWindowContext& windows); + UIMemberListBox(); void Paint() override; void Slot25(int x, int y) override; void Slot28(int x, int y) override; diff --git a/Source/UI/Lists/UINewComboBoxCtrl.cpp b/Source/UI/Lists/UINewComboBoxCtrl.cpp index 18bf3804..8b1e648c 100644 --- a/Source/UI/Lists/UINewComboBoxCtrl.cpp +++ b/Source/UI/Lists/UINewComboBoxCtrl.cpp @@ -3,7 +3,7 @@ // OFFSET: 0x0086DFE0 // FUNCTION: fn_11063 UINewComboBoxCtrl::UINewComboBoxCtrl() - : UIWindow(*reinterpret_cast(nullptr), 0), button(nullptr), label(nullptr), borderless(0), dropped(false), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0), selected(0), items() { + : UIWindow(0), button(nullptr), label(nullptr), borderless(0), dropped(false), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0), selected(0), items() { } // OFFSET: 0x0087A180 diff --git a/Source/UI/Lists/UIPackageBoxNameList.cpp b/Source/UI/Lists/UIPackageBoxNameList.cpp index 17a45544..7400c825 100644 --- a/Source/UI/Lists/UIPackageBoxNameList.cpp +++ b/Source/UI/Lists/UIPackageBoxNameList.cpp @@ -2,5 +2,5 @@ // OFFSET: 0x0086E0C0 // FUNCTION: fn_11064 -UIPackageBoxNameList::UIPackageBoxNameList(UIWindowContext& windows) : UIListBox(windows) { +UIPackageBoxNameList::UIPackageBoxNameList() : UIListBox() { } diff --git a/Source/UI/Lists/UIPackageBoxNameList.h b/Source/UI/Lists/UIPackageBoxNameList.h index cc9a8f54..3190f194 100644 --- a/Source/UI/Lists/UIPackageBoxNameList.h +++ b/Source/UI/Lists/UIPackageBoxNameList.h @@ -5,7 +5,7 @@ class UIPackageBoxNameList : public UIListBox { public: - UIPackageBoxNameList(UIWindowContext& windows); + UIPackageBoxNameList(); void Slot25(int x, int y) override; }; diff --git a/Source/UI/Lists/UIReplayListBox.h b/Source/UI/Lists/UIReplayListBox.h index ad86b3fc..954e94d9 100644 --- a/Source/UI/Lists/UIReplayListBox.h +++ b/Source/UI/Lists/UIReplayListBox.h @@ -6,7 +6,7 @@ class UIReplayListBox : public UIListBox { public: // INLINED - UIReplayListBox(UIWindowContext& windows) : UIListBox(windows) { + UIReplayListBox() : UIListBox() { } void Slot25(int x, int y) override; diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index bc4d3f2b..c495eddb 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -57,20 +57,20 @@ UIListBoxTitle::UIListBoxTitle() : titleColor(0x92C0FA) { // OFFSET: 0x0086E410 // FUNCTION: fn_11070 -UIScrollBar2::UIScrollBar2() : UIScrollBar(*reinterpret_cast(nullptr)) { +UIScrollBar2::UIScrollBar2() : UIScrollBar() { this->arrowLength = 10; } // OFFSET: 0x0086E470 // FUNCTION: fn_11071 -UIScrollBar3::UIScrollBar3() : UIScrollBar(*reinterpret_cast(nullptr)) { +UIScrollBar3::UIScrollBar3() : UIScrollBar() { this->arrowLength = 9; } // OFFSET: 0x0086E550 // FUNCTION: fn_11073 -UIScrollBar::UIScrollBar(UIWindowContext& windows) - : UIWindow(windows, 0), state(0), maximum(0), position(0), vertical(1), pressX(0), pressY(0), dragAmount(0), total(0), visible(0), arrowLength(13), +UIScrollBar::UIScrollBar() + : UIWindow(0), state(0), maximum(0), position(0), vertical(1), pressX(0), pressY(0), dragAmount(0), total(0), visible(0), arrowLength(13), thickness(13), minimumThumb(1), horizontalStep(1), verticalStep(1) { } @@ -79,7 +79,7 @@ UIScrollBar::~UIScrollBar() = default; // OFFSET: 0x0086E4D0 // FUNCTION: fn_11072 -UIScrollBar4::UIScrollBar4(UIWindowContext& windows) : UIScrollBar(windows) { +UIScrollBar4::UIScrollBar4() : UIScrollBar() { this->thickness = 6; this->arrowLength = 0; this->m_thumbLength = 12; @@ -87,14 +87,14 @@ UIScrollBar4::UIScrollBar4(UIWindowContext& windows) : UIScrollBar(windows) { // OFFSET: 0x0086E630 // FUNCTION: fn_11074 -UIScrollBar_Custom::UIScrollBar_Custom(UIWindowContext& windows) - : UIScrollBar(windows), m_trackTop(nullptr), m_trackMiddle(nullptr), m_trackBottom(nullptr), m_arrowUp(nullptr), m_arrowDown(nullptr), +UIScrollBar_Custom::UIScrollBar_Custom() + : UIScrollBar(), m_trackTop(nullptr), m_trackMiddle(nullptr), m_trackBottom(nullptr), m_arrowUp(nullptr), m_arrowDown(nullptr), m_thumbTop(nullptr), m_thumbMiddle(nullptr), m_thumbBottom(nullptr) { } // OFFSET: 0x0086F240 // FUNCTION: fn_11088 -UIZeroQuestScrollBar::UIZeroQuestScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UIZeroQuestScrollBar::UIZeroQuestScrollBar() : UIScrollBar() { this->arrowLength = 12; this->thickness = 9; } @@ -439,8 +439,8 @@ int UIImgMenu::ItemAt(int x, int y) { // OFFSET: 0x0086ECF0 // FUNCTION: fn_11083 -UITabControl::UITabControl(UIWindowContext& windows) - : UIWindow(windows, 0), unknown_00E8(12), flags() { +UITabControl::UITabControl() + : UIWindow(0), unknown_00E8(12), flags() { this->unknown_007C = -1; this->dragX = 0; this->dragY = 0; @@ -1698,7 +1698,7 @@ void UITabControl::Configure( this->inactiveTextColor = inactiveTextColor; this->ClearTabs(); - this->edit = new UIEditCtrl2(*this->m_context); + this->edit = new UIEditCtrl2(); this->edit->SetSize(100, 19); this->edit->Move(-100, -100); this->AddChild(this->edit); @@ -1857,7 +1857,7 @@ std::string UIChatHisBox::RenderItemLinks(const char* lineText, std::string& sou break; } - UIItemTagButton* button = new (std::nothrow) UIItemTagButton(*this->m_context); + UIItemTagButton* button = new (std::nothrow) UIItemTagButton(); if (button) { std::memcpy(button->unknown_00F8, &item, sizeof(item)); button->Configure(label.c_str(), 0x82F2E1, 0, 12, 0, 0); @@ -1951,7 +1951,7 @@ std::string UIChatHisBox::RenderNavigationLinks(const char* text, std::string& s tail = line.substr(position + label.size()); } - UINaviLinkButton* button = new (std::nothrow) UINaviLinkButton(*this->m_context); + UINaviLinkButton* button = new (std::nothrow) UINaviLinkButton(); if (button) { button->link = link; button->Configure(label.c_str(), 0x82F2E1, 0, 12, 0, 0); @@ -2101,7 +2101,7 @@ void UIChatHisBox::sub_89E0F0(const char* text, int& color, int& mode) { // OFFSET: 0x0086DBD0 // FUNCTION: fn_11057 UIListBoxID::UIListBoxID() - : UIWindow(*reinterpret_cast(nullptr), 0), lines(), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), verticalOverflow(0), + : UIWindow(0), lines(), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), verticalOverflow(0), bottomMargin(0), verticalBar(nullptr), horizontalBar(nullptr), transparent(0), lineHeight(16) { int* background = reinterpret_cast(this->unknown_007C); background[0] = 255; diff --git a/Source/UI/Lists/UIScrollBar.h b/Source/UI/Lists/UIScrollBar.h index 804ed261..04357b9f 100644 --- a/Source/UI/Lists/UIScrollBar.h +++ b/Source/UI/Lists/UIScrollBar.h @@ -5,7 +5,9 @@ class UIScrollBar : public UIWindow { public: - explicit UIScrollBar(UIWindowContext& windows); + UIScrollBar(); + UIScrollBar(UIWindowContext&) : UIScrollBar() { + } ~UIScrollBar() override; void Resize(int width, int height) override; bool Slot08() override; diff --git a/Source/UI/Lists/UIScrollBarNavi.cpp b/Source/UI/Lists/UIScrollBarNavi.cpp index 27160812..3cbbf797 100644 --- a/Source/UI/Lists/UIScrollBarNavi.cpp +++ b/Source/UI/Lists/UIScrollBarNavi.cpp @@ -5,12 +5,7 @@ // OFFSET: 0x0086E6E0 // FUNCTION: fn_11075 -UIScrollBar_Navi::UIScrollBar_Navi() : UIScrollBar(*reinterpret_cast(nullptr)) { - this->arrowLength = 7; - this->thickness = 7; -} - -UIScrollBar_Navi::UIScrollBar_Navi(UIWindowContext& windows) : UIScrollBar(windows) { +UIScrollBar_Navi::UIScrollBar_Navi() : UIScrollBar() { this->arrowLength = 7; this->thickness = 7; } diff --git a/Source/UI/Lists/UIScrollBarNavi.h b/Source/UI/Lists/UIScrollBarNavi.h index 50501b59..a4be51ca 100644 --- a/Source/UI/Lists/UIScrollBarNavi.h +++ b/Source/UI/Lists/UIScrollBarNavi.h @@ -6,7 +6,6 @@ class UIScrollBar_Navi : public UIScrollBar { public: UIScrollBar_Navi(); - explicit UIScrollBar_Navi(UIWindowContext& windows); ~UIScrollBar_Navi() override; void Paint() override; }; diff --git a/Source/UI/Lists/UIScrollBarVariants.h b/Source/UI/Lists/UIScrollBarVariants.h index 37416ffb..de272dbb 100644 --- a/Source/UI/Lists/UIScrollBarVariants.h +++ b/Source/UI/Lists/UIScrollBarVariants.h @@ -15,9 +15,6 @@ class CBitmapRes; class UIScrollBar2 : public UIScrollBar { public: UIScrollBar2(); - explicit UIScrollBar2(UIWindowContext& windows) : UIScrollBar(windows) { - this->arrowLength = 10; - } void Paint() override; }; @@ -25,16 +22,13 @@ public: class UIScrollBar3 : public UIScrollBar { public: UIScrollBar3(); - explicit UIScrollBar3(UIWindowContext& windows) : UIScrollBar(windows) { - this->arrowLength = 9; - } void Paint() override; }; class UIScrollBar4 : public UIScrollBar { public: - explicit UIScrollBar4(UIWindowContext& windows); + UIScrollBar4(); void Paint() override; @@ -43,7 +37,7 @@ public: class UIScrollBar_Custom : public UIScrollBar { public: - explicit UIScrollBar_Custom(UIWindowContext& windows); + UIScrollBar_Custom(); /* 00B4 */ CBitmapRes* m_trackTop; /* 00B8 */ CBitmapRes* m_trackMiddle; @@ -61,7 +55,7 @@ public: class UIZeroQuestScrollBar : public UIScrollBar { public: - explicit UIZeroQuestScrollBar(UIWindowContext& windows); + UIZeroQuestScrollBar(); void Paint() override; }; diff --git a/Source/UI/Lists/UITabControl.h b/Source/UI/Lists/UITabControl.h index 89317859..29ae3141 100644 --- a/Source/UI/Lists/UITabControl.h +++ b/Source/UI/Lists/UITabControl.h @@ -10,7 +10,9 @@ class UIEditCtrl; class UITabControl : public UIWindow { public: - UITabControl(UIWindowContext& windows); + UITabControl(); + UITabControl(UIWindowContext&) : UITabControl() { + } int TabCount(); int TabAt(int x, int y); void FillTab(int index, int x, int y, int width, int height, std::uint32_t color); diff --git a/Source/UI/Lists/UITagListBox.cpp b/Source/UI/Lists/UITagListBox.cpp index 21acd3b7..9078b24d 100644 --- a/Source/UI/Lists/UITagListBox.cpp +++ b/Source/UI/Lists/UITagListBox.cpp @@ -634,7 +634,7 @@ void UITagListBox::AddTagButton(STagInfoV2 tag, int lineCount) { return; } - UITagButton* button = new UITagButton(*this->m_context); + UITagButton* button = new UITagButton(); button->Configure(tag.unknown_0010.c_str(), 0x00F4934A, 0, 12, 0, 1); const int height = button->geometry.height; button->ResizeToTextClipped( diff --git a/Source/UI/Lists/UIThumb.h b/Source/UI/Lists/UIThumb.h index 22386d3b..0cc8fdcc 100644 --- a/Source/UI/Lists/UIThumb.h +++ b/Source/UI/Lists/UIThumb.h @@ -9,7 +9,7 @@ class CUIThumb : public CUIControl { public: - explicit CUIThumb(UIWindowContext& context); + CUIThumb(); ~CUIThumb() override; void ResetCursor(int x, int y) override; void Slot28(int x, int y) override; @@ -33,7 +33,7 @@ public: class CUIVThumb : public CUIThumb { public: - explicit CUIVThumb(UIWindowContext& context); + CUIVThumb(); void Paint() override; void Slot25(int x, int y) override; void Slot27(int x, int y) override; @@ -42,7 +42,7 @@ public: class CUIHThumb : public CUIVThumb { public: - explicit CUIHThumb(UIWindowContext& context); + CUIHThumb(); void Paint() override; void Slot25(int x, int y) override; void Slot27(int x, int y) override; diff --git a/Source/UI/Lists/UITreeView.cpp b/Source/UI/Lists/UITreeView.cpp index d6ee8ad3..21eb7f73 100644 --- a/Source/UI/Lists/UITreeView.cpp +++ b/Source/UI/Lists/UITreeView.cpp @@ -2,7 +2,7 @@ // OFFSET: 0x0086F180 // FUNCTION: fn_11087 -UITreeView::UITreeView(UIWindowContext& windows) : UIWindow(windows, 0) { +UITreeView::UITreeView() : UIWindow(0) { this->itemPadding = 5; this->itemHeight = 20; this->itemCount = 0; diff --git a/Source/UI/Lists/UITreeView.h b/Source/UI/Lists/UITreeView.h index 310cc015..e9619e2b 100644 --- a/Source/UI/Lists/UITreeView.h +++ b/Source/UI/Lists/UITreeView.h @@ -36,7 +36,7 @@ static_assert(offsetof(UITreeNode, children) == 0x180); class UITreeView : public UIWindow { public: - UITreeView(UIWindowContext& windows); + UITreeView(); void Resize(int width, int height) override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Lists/UIVScrollBar.h b/Source/UI/Lists/UIVScrollBar.h index 6ba1a101..b5efffe6 100644 --- a/Source/UI/Lists/UIVScrollBar.h +++ b/Source/UI/Lists/UIVScrollBar.h @@ -11,7 +11,6 @@ class CUIVScrollBar : public CUIControl { public: CUIVScrollBar(); - explicit CUIVScrollBar(UIWindowContext& context); ~CUIVScrollBar() override; void Resize(int width, int height) override; void Show(int visible) override; @@ -58,7 +57,7 @@ public: class CUIHScrollBar : public CUIVScrollBar { public: - explicit CUIHScrollBar(UIWindowContext& context); + CUIHScrollBar(); void Resize(int width, int height) override; void Slot15(int width, int height) override; void Paint() override; @@ -77,12 +76,4 @@ static_assert(offsetof(CUIVScrollBar, backgroundName) == 0xAC); static_assert(offsetof(CUIVScrollBar, onChange) == 0xC8); #endif -inline CUIVScrollBar::CUIVScrollBar() - : CUIControl(*static_cast(nullptr)), total(0), visible(0), step(0), position(0), maximum(0), - trackLength(0), dragging(0), hidden(0), transparent(0), unknown_00C4(0) { - this->upButton = nullptr; - this->downButton = nullptr; - this->thumb = nullptr; -} - #endif diff --git a/Source/UI/Menu/UIMenuIconWnd.cpp b/Source/UI/Menu/UIMenuIconWnd.cpp index 167413aa..d5364aa9 100644 --- a/Source/UI/Menu/UIMenuIconWnd.cpp +++ b/Source/UI/Menu/UIMenuIconWnd.cpp @@ -48,8 +48,8 @@ UIMenuIcon::UIMenuIcon() {} // OFFSET: 0x0084A240 // FUNCTION: fn_10607 -UIMenuIconWnd::UIMenuIconWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 1), unknown_00CC(nullptr), unknown_00D0(nullptr), unknown_00D4(nullptr) {} +UIMenuIconWnd::UIMenuIconWnd() + : UIFrameWnd(1), unknown_00CC(nullptr), unknown_00D0(nullptr), unknown_00D4(nullptr) {} // OFFSET: 0x0084A850 // FUNCTION: fn_10612 diff --git a/Source/UI/Menu/UIMenuIconWnd.h b/Source/UI/Menu/UIMenuIconWnd.h index 1a36a757..a522fcc3 100644 --- a/Source/UI/Menu/UIMenuIconWnd.h +++ b/Source/UI/Menu/UIMenuIconWnd.h @@ -16,7 +16,7 @@ public: class UIMenuIconWnd : public UIFrameWnd { public: - UIMenuIconWnd(UIWindowContext& windowContext); + UIMenuIconWnd(); /* 00B4 */ std::map unknown_00B4; /* 00BC */ std::map unknown_00BC; diff --git a/Source/UI/MiniPartyManager.cpp b/Source/UI/MiniPartyManager.cpp index de39597a..a528bf4c 100644 --- a/Source/UI/MiniPartyManager.cpp +++ b/Source/UI/MiniPartyManager.cpp @@ -137,7 +137,7 @@ void UIWindowMgr::RebuildMiniPartyWindows() { continue; } - UIMiniPartyWnd* window = new UIMiniPartyWnd(dialogs.windows); + UIMiniPartyWnd* window = new UIMiniPartyWnd(); window->SetSize(174, 52); window->m_cell = record.unknown_0008; this->AddMiniPartyWindow(window); diff --git a/Source/UI/Navigation/UINavigationV4Wnd.cpp b/Source/UI/Navigation/UINavigationV4Wnd.cpp index 8a1f4eb1..6cf5ce28 100644 --- a/Source/UI/Navigation/UINavigationV4Wnd.cpp +++ b/Source/UI/Navigation/UINavigationV4Wnd.cpp @@ -2,13 +2,13 @@ // OFFSET: 0x005C2860 // FUNCTION: fn_03536 -UINavigationRuideWnd::UINavigationRuideWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UINavigationRuideWnd::UINavigationRuideWnd() + : UIFrameWnd(0) { } // OFFSET: 0x005C28C0 // FUNCTION: fn_03537 -UINavigationV4Wnd::UINavigationV4Wnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UINavigationV4Wnd::UINavigationV4Wnd() : UIFrameWnd(0) { this->unknown_0118 = 0; this->unknown_0100 = nullptr; this->unknown_011C = 2000; @@ -16,6 +16,6 @@ UINavigationV4Wnd::UINavigationV4Wnd(UIWindowContext& windows) : UIFrameWnd(wind // OFFSET: 0x005C2960 // FUNCTION: fn_03538 -UINavigationroadiconWnd::UINavigationroadiconWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UINavigationroadiconWnd::UINavigationroadiconWnd() + : UIFrameWnd(0) { } diff --git a/Source/UI/Navigation/UINavigationV4Wnd.h b/Source/UI/Navigation/UINavigationV4Wnd.h index 31c5addb..f5269bfa 100644 --- a/Source/UI/Navigation/UINavigationV4Wnd.h +++ b/Source/UI/Navigation/UINavigationV4Wnd.h @@ -24,7 +24,7 @@ struct NavigationWindowInfo { class UINavigationV4Wnd : public UIFrameWnd { public: - UINavigationV4Wnd(UIWindowContext& windows); + UINavigationV4Wnd(); void Slot11() override; void Slot15(int width, int height) override; void Slot19() override; @@ -81,7 +81,7 @@ class UIStaticBitmap; class UINavigationroadiconWnd : public UIFrameWnd { public: - UINavigationroadiconWnd(UIWindowContext& windows); + UINavigationroadiconWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot31(int x, int y) override; @@ -95,7 +95,7 @@ protected: class UINavigationRuideWnd : public UIFrameWnd { public: - UINavigationRuideWnd(UIWindowContext& windows); + UINavigationRuideWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Navigation/UIPrivateAirplaneWnd.h b/Source/UI/Navigation/UIPrivateAirplaneWnd.h index 03f36399..50b363fe 100644 --- a/Source/UI/Navigation/UIPrivateAirplaneWnd.h +++ b/Source/UI/Navigation/UIPrivateAirplaneWnd.h @@ -11,7 +11,7 @@ class UIBasicButton; class UIPrivateAirplaneWnd : public UIFrameWnd { public: // INLINED - UIPrivateAirplaneWnd() : UIFrameWnd(*reinterpret_cast(nullptr), 0) {} + UIPrivateAirplaneWnd() : UIFrameWnd(0) {} void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index 42337ae0..7e0449e1 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -31,8 +31,8 @@ namespace { // OFFSET: 0x007BAC40 // FUNCTION: fn_09274 -UIAdvenPartyBoardWnd::UIAdvenPartyBoardWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_0104(0), unknown_0108(0), page(1), totalPages(1), unknown_0114(1), unknown_0118(0), selectedType(0) { +UIAdvenPartyBoardWnd::UIAdvenPartyBoardWnd() + : UIFrameWnd(0), unknown_0104(0), unknown_0108(0), page(1), totalPages(1), unknown_0114(1), unknown_0118(0), selectedType(0) { } // OFFSET: 0x007BB590 @@ -52,7 +52,7 @@ void UIAdvenPartyBoardWnd::Slot11() { // OFFSET: 0x007BC220 // FUNCTION: fn_09298 void UIAdvenPartyBoardWnd::Slot15(int, int) { - this->minimum = new UIEditCtrl2(*this->m_context); + this->minimum = new UIEditCtrl2(); this->minimum->SetSize(25, 14); this->minimum->invalidatesParent = 1; this->minimum->maximum = 3; @@ -65,7 +65,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->minimum->Show(1); this->AddChild(this->minimum); - this->maximum = new UIEditCtrl2(*this->m_context); + this->maximum = new UIEditCtrl2(); this->maximum->SetSize(25, 14); this->maximum->invalidatesParent = 1; this->maximum->maximum = 3; @@ -80,7 +80,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { const int tooltips[] = {3420, 3491, 3444, 3508}; for (int index = 0; index < 4; ++index) { - auto* job = new UIJobSlotButton(*this->m_context); + auto* job = new UIJobSlotButton(); this->jobs[index] = job; job->SetSize(16, 16); job->Move(160 + index * 18, 23); @@ -91,7 +91,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->AddChild(job); } - auto* memo = new UIEditCtrl5(*this->m_context); + auto* memo = new UIEditCtrl5(); this->memo = memo; memo->SetSize(116, 14); memo->maximum = 150; @@ -112,28 +112,28 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { button->SetSize(button->BitmapWidth(), button->BitmapHeight()); }; - auto* search = new UIBmpTextButton(*this->m_context); + auto* search = new UIBmpTextButton(); artwork(search, "btn_search"); search->Move(354, 22); search->SetId(365); search->SetText(LookupMessage(3366)); this->AddChild(search); - auto* reset = new UIBmpTextButton(*this->m_context); + auto* reset = new UIBmpTextButton(); artwork(reset, "btn_initialize"); reset->Move(401, 22); reset->SetId(363); reset->SetText(LookupMessage(3367)); this->AddChild(reset); - this->refresh = new UIBitmapButton(*this->m_context); + this->refresh = new UIBitmapButton(); artwork(this->refresh, "btn_refresh"); this->refresh->Move(452, 22); this->refresh->SetId(415); this->AddChild(this->refresh); const auto arrow = [&](const char* name, int id, int x) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); for (int state = 0; state < 4; ++state) { button->SetBitmap((std::string(prefix) + name + (state == 3 ? "_disable.bmp" : ".bmp")).c_str(), state, 0); @@ -150,7 +150,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->next = arrow("btn_list_right", 218, 265); for (int index = 0; index < 10; ++index) { - auto* row = new UIPartyInfoWnd(*this->m_context); + auto* row = new UIPartyInfoWnd(); this->rows[index] = row; artwork(row, "btn_list"); row->Move(1, 73 + index * 24); @@ -162,7 +162,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->AddChild(row); } - this->ownParty = new UIPartyInfoWnd(*this->m_context); + this->ownParty = new UIPartyInfoWnd(); const char* ownImages[] = {"btn_recruit_on.bmp", "btn_recruit_on.bmp", "btn_recruiting_press.bmp", "btn_recruiting_disable.bmp"}; for (int state = 0; state < 4; ++state) { @@ -175,7 +175,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->ownParty->Enable(0); this->AddChild(this->ownParty); - auto* recruit = new UIBmpTextButton(*this->m_context); + auto* recruit = new UIBmpTextButton(); this->recruit = recruit; artwork(recruit, "btn_recruit"); recruit->Move(1, 49); @@ -183,7 +183,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { recruit->Enable(0); this->AddChild(recruit); - this->types = new UIComboBoxDef2Wnd(*this->m_context); + this->types = new UIComboBoxDef2Wnd(); this->types->dropdownHeight = 126; this->types->SetSize(76, 18); this->types->Move(76, 22); @@ -194,7 +194,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { } this->types->Select(0); - this->pageText = new UIStaticText(*this->m_context); + this->pageText = new UIStaticText(); this->pageText->SetSize(this->geometry.width, 18); const int textWidth = this->TextWidth("1/1", 0, 0, 12, 0, 0); this->pageText->Resize((textWidth + 1), 16); @@ -204,13 +204,13 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->LoadPage(1); this->m_message0 = 365; - auto* close = new UIBasicButton(*this->m_context); + auto* close = new UIBasicButton(); close->Configure(42, LookupMessage(3045)); close->Move(this->geometry.width - close->geometry.width - 10, 317); close->SetId(201); this->AddChild(close); - this->stop = new UIBasicButton(*this->m_context); + this->stop = new UIBasicButton(); const char* stopText = LookupMessage(3375); this->stop->Configure((this->TextWidth(stopText, 0, 0, 12, 0, 0) + 10), stopText); this->stop->Move(close->geometry.x - this->stop->geometry.width - 5, 317); @@ -218,7 +218,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->AddChild(this->stop); this->stop->Enable(0); - auto* titleClose = new UIBitmapButton(*this->m_context); + auto* titleClose = new UIBitmapButton(); const std::string basic = std::string("유저인터페이스\\basic_interface\\"); titleClose->SetBitmap((basic + "sys_close_off.bmp").c_str(), 0, 0); titleClose->SetBitmap((basic + "sys_close_on.bmp").c_str(), 1, 0); diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.h b/Source/UI/Party/UIAdvenPartyBoardWnd.h index 96db7b20..c3df5c86 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.h +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.h @@ -24,7 +24,7 @@ struct PartyBoardPlacement { class UIAdvenPartyBoardWnd : public UIFrameWnd { public: - UIAdvenPartyBoardWnd(UIWindowContext& windows); + UIAdvenPartyBoardWnd(); ~UIAdvenPartyBoardWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Party/UIApplyForPartyWnd.cpp b/Source/UI/Party/UIApplyForPartyWnd.cpp index 28356ca6..90897003 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.cpp +++ b/Source/UI/Party/UIApplyForPartyWnd.cpp @@ -27,8 +27,8 @@ namespace { // OFFSET: 0x007BAD00 // FUNCTION: fn_09275 -UIApplyForPartyWnd::UIApplyForPartyWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIApplyForPartyWnd::UIApplyForPartyWnd() + : UIFrameWnd(0) { } // OFFSET: 0x007BB610 @@ -53,7 +53,7 @@ void UIApplyForPartyWnd::Slot15(int, int) { const int positions[] = {51, 108, 173}; for (int index = 0; index < 3; ++index) { - auto* button = new UIBasicButton(*this->m_context); + auto* button = new UIBasicButton(); const char* label = LookupMessage(messages[index]); const int width = this->TextWidth(label, 0, 0, 12, 0, 0); button->Configure(width + 10, label); @@ -67,7 +67,7 @@ void UIApplyForPartyWnd::Slot15(int, int) { int y = 136; for (const auto& line : lines) { - auto* label = new UIStaticText(*this->m_context); + auto* label = new UIStaticText(); label->SetSize(this->geometry.width - 18, 15); label->Move(9, y); label->SetText(line.c_str(), 0); @@ -79,7 +79,7 @@ void UIApplyForPartyWnd::Slot15(int, int) { y += 12; } - auto* close = new UIBitmapButton(*this->m_context); + auto* close = new UIBitmapButton(); const std::string off = std::string(prefix) + "basic_interface\\big_sys_close_off.bmp"; const std::string on = std::string(prefix) + "basic_interface\\big_sys_close_on.bmp"; close->SetBitmap(off.c_str(), 0, 0); diff --git a/Source/UI/Party/UIApplyForPartyWnd.h b/Source/UI/Party/UIApplyForPartyWnd.h index 46e3b0c1..d639bbaf 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.h +++ b/Source/UI/Party/UIApplyForPartyWnd.h @@ -6,7 +6,7 @@ class UIApplyForPartyWnd : public UIFrameWnd { public: - UIApplyForPartyWnd(UIWindowContext& windows); + UIApplyForPartyWnd(); ~UIApplyForPartyWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Party/UIMiniPartyWnd.cpp b/Source/UI/Party/UIMiniPartyWnd.cpp index 20c9dbe7..6ef73178 100644 --- a/Source/UI/Party/UIMiniPartyWnd.cpp +++ b/Source/UI/Party/UIMiniPartyWnd.cpp @@ -29,8 +29,8 @@ // OFFSET: 0x007426F0 // FUNCTION: fn_07737 -UIMiniPartyWnd::UIMiniPartyWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 1), m_cell(-1), m_infoWnd(nullptr), m_background(nullptr), m_sizeMode(0) { +UIMiniPartyWnd::UIMiniPartyWnd() + : UIFrameWnd(1), m_cell(-1), m_infoWnd(nullptr), m_background(nullptr), m_sizeMode(0) { this->m_imageName = "유저인터페이스\\renewalparty\\img_partymini_bg.tga"; this->geometry.id = 301; } @@ -45,7 +45,7 @@ void UIMiniPartyWnd::Move(int x, int y) { // OFFSET: 0x00742AC0 // FUNCTION: fn_07740 void UIMiniPartyWnd::Slot15(int, int) { - UIMiniPartyInfoWnd* info = new UIMiniPartyInfoWnd(*this->m_context); + UIMiniPartyInfoWnd* info = new UIMiniPartyInfoWnd(); this->m_infoWnd = info; info->m_owner = this; info->SetSize(174, 52); diff --git a/Source/UI/Party/UIMiniPartyWnd.h b/Source/UI/Party/UIMiniPartyWnd.h index 327f22a4..bcbff042 100644 --- a/Source/UI/Party/UIMiniPartyWnd.h +++ b/Source/UI/Party/UIMiniPartyWnd.h @@ -19,7 +19,7 @@ struct MiniPartyInfoEntry { class UIMiniPartyInfoWnd : public UIFrameWnd { public: - UIMiniPartyInfoWnd(UIWindowContext& windowContext); + UIMiniPartyInfoWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; @@ -35,7 +35,7 @@ public: class UIMiniPartyWnd : public UIFrameWnd { public: - UIMiniPartyWnd(UIWindowContext& windowContext); + UIMiniPartyWnd(); void Slot15(int width, int height) override; void Move(int x, int y) override; void Paint() override; diff --git a/Source/UI/Party/UIPartyInfoWnd.cpp b/Source/UI/Party/UIPartyInfoWnd.cpp index 5b23927a..204383d8 100644 --- a/Source/UI/Party/UIPartyInfoWnd.cpp +++ b/Source/UI/Party/UIPartyInfoWnd.cpp @@ -12,8 +12,8 @@ // OFFSET: 0x007BAE20 // FUNCTION: fn_09277 -UIPartyInfoWnd::UIPartyInfoWnd(UIWindowContext& windows) - : UIBitmapButton(windows), tanker(0), dealer(0), healer(0), assist(0) { +UIPartyInfoWnd::UIPartyInfoWnd() + : UIBitmapButton(), tanker(0), dealer(0), healer(0), assist(0) { this->m_drawLabel = 0; } diff --git a/Source/UI/Party/UIPartyInfoWnd.h b/Source/UI/Party/UIPartyInfoWnd.h index 92f5141a..c8819b11 100644 --- a/Source/UI/Party/UIPartyInfoWnd.h +++ b/Source/UI/Party/UIPartyInfoWnd.h @@ -6,7 +6,7 @@ class UIPartyInfoWnd : public UIBitmapButton { public: - UIPartyInfoWnd(UIWindowContext& windows); + UIPartyInfoWnd(); ~UIPartyInfoWnd() override; void Paint() override; void Slot31(int x, int y) override; diff --git a/Source/UI/Party/UIPartySettingWnd.h b/Source/UI/Party/UIPartySettingWnd.h index b610ed77..06b41e58 100644 --- a/Source/UI/Party/UIPartySettingWnd.h +++ b/Source/UI/Party/UIPartySettingWnd.h @@ -9,7 +9,7 @@ struct WindowPlacement; class UIPartySettingWnd : public UIFrameWnd { public: - UIPartySettingWnd(UIWindowContext& windows); + UIPartySettingWnd(); void Slot11() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00B4 */ UIRadioBtn* m_expShareButtons[2]; @@ -37,7 +37,7 @@ protected: class UIPartyInvitationToWnd : public UIPartySettingWnd { public: - UIPartyInvitationToWnd(UIWindowContext& windows); + UIPartyInvitationToWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index 69e2a6f1..e9f9db2f 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -48,8 +48,8 @@ namespace { // OFFSET: 0x007BAF30 // FUNCTION: fn_09278 -UIRegisterPartyWnd::UIRegisterPartyWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), selectedType(0) { +UIRegisterPartyWnd::UIRegisterPartyWnd() + : UIFrameWnd(0), selectedType(0) { } // OFFSET: 0x007BB810 @@ -70,7 +70,7 @@ void UIRegisterPartyWnd::Slot11() { // FUNCTION: fn_09300 void UIRegisterPartyWnd::Slot15(int, int) { const auto label = [&](const char* text, int x, int y, int width) { - auto* value = new UIStaticText(*this->m_context); + auto* value = new UIStaticText(); value->SetSize(width, 15); value->Move(x, y); value->SetText(text, 0); @@ -89,7 +89,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { const int level = g_session.m_level; const auto edit = [&](int x, int value) { - auto* control = new UIEditCtrl(*this->m_context); + auto* control = new UIEditCtrl(); control->SetSize(25, 16); control->Move(x, 47); control->invalidatesParent = 1; @@ -111,7 +111,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { const int tooltips[] = {3420, 3491, 3444, 3508}; for (int index = 0; index < 4; ++index) { - auto* job = new UIJobSlotButton(*this->m_context); + auto* job = new UIJobSlotButton(); this->jobs[index] = job; job->SetSize(16, 16); job->Move(60 + index * 18, 95); @@ -123,7 +123,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { } label(LookupMessage(3359), 10, 121, this->geometry.width - 32); - this->memo = new UIEditCtrl(*this->m_context); + this->memo = new UIEditCtrl(); this->memo->SetSize(139, 14); this->memo->maximum = 24; this->memo->TextColor(0, 0xFFFFFFFFu); @@ -131,7 +131,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { this->memo->Background(232, 232, 232); this->AddChild(this->memo); - auto* submit = new UIBasicButton(*this->m_context); + auto* submit = new UIBasicButton(); const bool registered = g_adventurerAgencyMgr->registered; const char* title = LookupMessage(registered ? 3376 : 3371); submit->Configure(this->TextWidth(title, 0, 0, 12, 0, 0) + 10, title); @@ -157,7 +157,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { y += 12; } - auto* close = new UIBitmapButton(*this->m_context); + auto* close = new UIBitmapButton(); const char* suffixes[] = {"", "_a", "_b"}; for (int state = 0; state < 3; ++state) { @@ -170,7 +170,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { close->SetId(201); this->AddChild(close); - this->types = new UIComboBoxDef2Wnd(*this->m_context); + this->types = new UIComboBoxDef2Wnd(); this->types->dropdownHeight = 126; this->types->SetSize(63, 18); this->types->Move(60, 70); @@ -182,7 +182,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { } this->types->Select(0); - auto* titleClose = new UIBitmapButton(*this->m_context); + auto* titleClose = new UIBitmapButton(); const std::string off = std::string(prefix) + "basic_interface\\big_sys_close_off.bmp"; const std::string on = std::string(prefix) + "basic_interface\\big_sys_close_on.bmp"; titleClose->SetBitmap(off.c_str(), 0, 0); diff --git a/Source/UI/Party/UIRegisterPartyWnd.h b/Source/UI/Party/UIRegisterPartyWnd.h index fe097b26..96d79ac8 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.h +++ b/Source/UI/Party/UIRegisterPartyWnd.h @@ -12,7 +12,7 @@ class UIBasicButton; class UIRegisterPartyWnd : public UIFrameWnd { public: - UIRegisterPartyWnd(UIWindowContext& windows); + UIRegisterPartyWnd(); ~UIRegisterPartyWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp index e27dbec2..b15b8a20 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp +++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp @@ -24,8 +24,8 @@ namespace { // OFFSET: 0x007BB030 // FUNCTION: fn_09280 -UIRequestJoinPartyWnd::UIRequestJoinPartyWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIRequestJoinPartyWnd::UIRequestJoinPartyWnd() + : UIFrameWnd(0) { } // OFFSET: 0x007BB960 @@ -34,7 +34,7 @@ UIRequestJoinPartyWnd::~UIRequestJoinPartyWnd() = default; // OFFSET: 0x007BEFD0 // FUNCTION: fn_09301 void UIRequestJoinPartyWnd::Slot15(int, int) { - this->icon = new UIBitmapButton(*this->m_context); + this->icon = new UIBitmapButton(); this->icon->SetSize(25, 25); const std::string initial = std::string(prefix) + "renewalparty\\icon_jobs_4046.bmp"; @@ -45,7 +45,7 @@ void UIRequestJoinPartyWnd::Slot15(int, int) { this->icon->Move(12, 29); this->AddChild(this->icon); - this->levelText = new UIStaticText(*this->m_context); + this->levelText = new UIStaticText(); this->levelText->SetSize(25, 14); this->levelText->Move(16, 56); this->levelText->SetText("1", 0); @@ -58,7 +58,7 @@ void UIRequestJoinPartyWnd::Slot15(int, int) { const int x[] = {122, 169}; for (int index = 0; index < 2; ++index) { - auto* button = new UIBasicButton(*this->m_context); + auto* button = new UIBasicButton(); const char* label = LookupMessage(messages[index]); button->Configure(this->TextWidth(label, 0, 0, 12, 0, 0) + 10, label); button->Move(x[index], 136); @@ -67,13 +67,13 @@ void UIRequestJoinPartyWnd::Slot15(int, int) { } this->m_message0 = 541; - this->details = new UITextViewer(*this->m_context); + this->details = new UITextViewer(); this->details->Configure(43, 20, 167, 60, 0); this->details->textColor = 0xFFFFFFFFu; this->details->Invalidate(); this->AddChild(this->details); - this->block = new UICheckBox(*this->m_context); + this->block = new UICheckBox(); this->block->SetSize(24, 47); const std::string checked = std::string(prefix) + "uiadventureragency\\btn_block_on.bmp"; const std::string unchecked = std::string(prefix) + "uiadventureragency\\btn_block_off.bmp"; @@ -85,7 +85,7 @@ void UIRequestJoinPartyWnd::Slot15(int, int) { std::vector unused; WrapPlainText(LookupMessage(3518), unused, 30); - this->blockText = new UITextViewer(*this->m_context); + this->blockText = new UITextViewer(); this->blockText->Configure(31, 81, 182, 47, 0); this->blockText->textColor = 0xFFD7C53Cu; this->blockText->Invalidate(); @@ -93,7 +93,7 @@ void UIRequestJoinPartyWnd::Slot15(int, int) { this->blockText->lineHeight = 15; this->blockText->SendMsg(nullptr, 29, reinterpret_cast(LookupMessage(3518)), 30, 0, 0); - auto* close = new UIBitmapButton(*this->m_context); + auto* close = new UIBitmapButton(); const std::string off = std::string(prefix) + "basic_interface\\big_sys_close_off.bmp"; const std::string on = std::string(prefix) + "basic_interface\\big_sys_close_on.bmp"; close->SetBitmap(off.c_str(), 0, 0); diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.h b/Source/UI/Party/UIRequestJoinPartyWnd.h index 73389444..b8dd6dde 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.h +++ b/Source/UI/Party/UIRequestJoinPartyWnd.h @@ -14,7 +14,7 @@ struct PartyJoinRequest; class UIRequestJoinPartyWnd : public UIFrameWnd { public: - UIRequestJoinPartyWnd(UIWindowContext& windows); + UIRequestJoinPartyWnd(); ~UIRequestJoinPartyWnd() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp index 25dfe04d..65493be7 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp @@ -158,8 +158,8 @@ bool UnusedTrueA47F10() { // OFFSET: 0x00A47FA0 // FUNCTION: fn_16108 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -201,7 +201,7 @@ void CUIProbabilityTable::Slot53() { // FUNCTION: fn_16117 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->onChange = [this](int position) { this->OnScroll(position); }; this->AddChild(this->scrollBar); @@ -217,7 +217,7 @@ CUIItem::CUIItem() : CUIListItem(), nameText(nullptr), probabilityText(nullptr), // OFFSET: 0x00A48A70 // FUNCTION: fn_16118 void CUIItem::Slot15(int width, int height) { - this->nameText = new CUITextViewer(*this->m_context); + this->nameText = new CUITextViewer(); this->nameText->SetSize(231, 29); this->nameText->Move(1, 0); this->nameText->SetTextOffset(0, 6); @@ -238,7 +238,7 @@ void CUIItem::Slot15(int width, int height) { this->nameText->SetScrollBarThumbImage(std::string()); this->AddChild(this->nameText); - this->probabilityText = new CUITextViewer(*this->m_context); + this->probabilityText = new CUITextViewer(); this->probabilityText->SetSize(78, 29); this->probabilityText->Move(233, 0); this->probabilityText->SetTextOffset(2, 6); @@ -550,7 +550,7 @@ void BindItem(ProbabilityTable::CUIItem* item, const ProbabilityTable::CItemData // OFFSET: 0x00A493D0 // FUNCTION: fn_16119 void CUIProbabilityTable::Slot15(int width, int height) { - this->m_titleBar = new CUITitleBar(*this->m_context); + this->m_titleBar = new CUITitleBar(); this->m_titleBar->SetSize(345, 17); this->m_titleBar->Move(0, 0); const std::uint8_t titleRight[] = { @@ -573,7 +573,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { this->m_titleBar->SetImages(std::string(DecryptName<0x0B7109397F6B1387ULL>(titleLeft)), std::string(DecryptName<0x23BBD58F8B5FF5C9ULL>(titleMiddle)), std::string(DecryptName<0xC517FB932D95BB6DULL>(titleRight))); this->AddChild(this->m_titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(310, 17); title->Move(18, 0); const std::uint8_t titleTextSource[] = {0x8B, 0x87, 0xE4, 0xDB, 0xF5, 0x0F, 0xB1, 0x29, 0xF0, 0x29}; @@ -591,7 +591,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { this->m_titleBar->titleText = title; this->m_titleBar->AddChild(title); - CUIImageButton* systemButton = new CUIImageButton(*this->m_context); + CUIImageButton* systemButton = new CUIImageButton(); systemButton->SetSize(11, 11); systemButton->Move(3, 3); systemButton->SetOnClick([this]() { this->OnButtonClick(); }); @@ -623,7 +623,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { ); this->m_titleBar->AddChild(systemButton); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(331, 3); closeButton->SetOnClick([this]() { this->OnClose(); }); @@ -657,7 +657,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { ); this->m_titleBar->SetSecondButton(closeButton); - this->m_nameHeader = new CUIStaticText(*this->m_context); + this->m_nameHeader = new CUIStaticText(); this->m_nameHeader->SetSize(160, 18); this->m_nameHeader->Move(10, 30); const std::uint8_t nameHeaderSource[] = {0x50, 0xC3, 0x45, 0x6D, 0x12, 0xA3, 0x19, 0x6D, 0x2A, 0xC0, 0x0F, 0xD7}; @@ -674,7 +674,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { this->m_nameHeader->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_nameHeader); - this->m_searchEdit = new CUIEditBoxEx(*this->m_context); + this->m_searchEdit = new CUIEditBoxEx(); this->m_searchEdit->Create(130, 18, false); this->m_searchEdit->Move(180, 30); this->m_searchEdit->SetText(""); @@ -689,7 +689,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { this->m_searchEdit->SetOnSubmit([this]() { this->Search(); }); this->AddChild(this->m_searchEdit); - this->m_searchButton = new CUIImageButton(*this->m_context); + this->m_searchButton = new CUIImageButton(); this->m_searchButton->SetSize(25, 18); this->m_searchButton->Move(310, 30); this->m_searchButton->SetOnClick([this]() { this->Search(); }); @@ -725,7 +725,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { ); this->AddChild(this->m_searchButton); - this->m_itemName = new CUIStaticText(*this->m_context); + this->m_itemName = new CUIStaticText(); this->m_itemName->SetSize(220, 24); this->m_itemName->Move(16, 61); this->m_itemName->SetText("", 0); @@ -740,7 +740,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { this->m_itemName->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_itemName); - this->m_probabilityHeader = new CUIStaticText(*this->m_context); + this->m_probabilityHeader = new CUIStaticText(); this->m_probabilityHeader->SetSize(68, 24); this->m_probabilityHeader->Move(248, 61); const std::uint8_t probabilityHeaderSource[] = {0x35, 0x79, 0xFA, 0x55, 0xB5}; @@ -757,7 +757,7 @@ void CUIProbabilityTable::Slot15(int width, int height) { this->m_probabilityHeader->SetOutline(0, 0xFFFFFF); this->AddChild(this->m_probabilityHeader); - this->m_list = new CUIListBoxEx(*this->m_context); + this->m_list = new CUIListBoxEx(); this->m_list->itemWidth = 312; this->m_list->rowHeight = 30; this->m_list->SetSize(325, 360); diff --git a/Source/UI/Quest/UIOngoingQuestInfo.cpp b/Source/UI/Quest/UIOngoingQuestInfo.cpp index 4f043254..d8730459 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.cpp +++ b/Source/UI/Quest/UIOngoingQuestInfo.cpp @@ -47,8 +47,8 @@ bool UnusedTrueA4F5A0() { // OFFSET: 0x00A4F630 // FUNCTION: fn_16217 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -91,7 +91,7 @@ void CUIOngoingQuestInfo::Slot53() { // FUNCTION: fn_16225 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -341,7 +341,7 @@ void CUIRewards::Slot16() { this->thirdLabel->SetText(third, std::strlen(third)); this->rewardList->unknown_00C4 = 1; this->rewardList->Invalidate(); - this->npcSprite = new UINpcSprWnd(*this->m_context); + this->npcSprite = new UINpcSprWnd(); this->npcSprite->SetSize(75, 145); this->npcSprite->Show(0); this->AddChild(this->npcSprite); @@ -440,7 +440,7 @@ void CUIScrollWindow::SetQuest(unsigned int id) { // OFFSET: 0x00A50970 // FUNCTION: fn_16227 void CUIOngoingQuestInfo::Slot15(int width, int height) { - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(342, 17); this->titleBar->Move(0, 0); this->titleBar->SetImages( @@ -449,7 +449,7 @@ void CUIOngoingQuestInfo::Slot15(int width, int height) { ); this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); title->SetText("QUEST", 5); @@ -464,7 +464,7 @@ void CUIOngoingQuestInfo::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* menuButton = new CUIImageButton(*this->m_context); + CUIImageButton* menuButton = new CUIImageButton(); menuButton->SetSize(11, 11); menuButton->Move(3, 3); menuButton->SetOnClick([this]() { this->OnFirstAction(); }); @@ -476,13 +476,13 @@ void CUIOngoingQuestInfo::Slot15(int width, int height) { ); this->titleBar->AddChild(menuButton); - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(342, 395); this->background->Move(0, 17); this->background->SetImage("유저인터페이스\\Renew_QuestUI\\bg_detail_quest.bmp"); this->AddChild(this->background); - this->titleText = new CUIStaticText(*this->m_context); + this->titleText = new CUIStaticText(); this->titleText->SetSize(342, 12); this->titleText->Move(0, 39); this->titleText->SetText("", 0); @@ -496,12 +496,12 @@ void CUIOngoingQuestInfo::Slot15(int width, int height) { this->titleText->SetOutline(0, 0xFFFFFF); this->AddChild(this->titleText); - this->scrollWindow = new OngoingQuestInfo::CUIScrollWindow(*this->m_context); + this->scrollWindow = new OngoingQuestInfo::CUIScrollWindow(); this->scrollWindow->SetSize(342, 322); this->scrollWindow->Move(0, 62); this->AddChild(this->scrollWindow); - this->dateText = new CUIStaticText(*this->m_context); + this->dateText = new CUIStaticText(); this->dateText->SetSize(270, 12); this->dateText->Move(13, 393); this->dateText->SetText("", 0); @@ -515,7 +515,7 @@ void CUIOngoingQuestInfo::Slot15(int width, int height) { this->dateText->SetOutline(0, 0xFFFFFF); this->AddChild(this->dateText); - this->closeButton = new CUIImageButton(*this->m_context); + this->closeButton = new CUIImageButton(); this->closeButton->SetSize(42, 20); this->closeButton->Move(288, 388); this->closeButton->SetOnClick([this]() { this->OnClose(); }); @@ -533,13 +533,13 @@ namespace OngoingQuestInfo { // OFFSET: 0x00A4FFE0 // FUNCTION: fn_16226 void CUIContents::Slot15(int width, int height) { - this->icon = new CUIStaticImage(*this->m_context); + this->icon = new CUIStaticImage(); this->icon->SetSize(10, 9); this->icon->Move(9, 9); this->icon->SetImage("유저인터페이스\\Renew_QuestUI\\img_poring.bmp"); this->AddChild(this->icon); - this->title = new CUIStaticText(*this->m_context); + this->title = new CUIStaticText(); this->title->SetSize(50, 12); this->title->Move(25, 9); this->title->SetText("", 0); @@ -553,7 +553,7 @@ void CUIContents::Slot15(int width, int height) { this->title->SetOutline(0, 0xFFFFFF); this->AddChild(this->title); - this->textViewer = new CUITextViewer(*this->m_context); + this->textViewer = new CUITextViewer(); this->textViewer->SetSize(290, 20); this->textViewer->Move(32, 30); this->textViewer->SetTextOffset(0, 0); @@ -581,20 +581,20 @@ void CUIContents::Slot15(int width, int height) { // OFFSET: 0x00A51900 // FUNCTION: fn_16228 void CUIRewardItem::Slot15(int width, int height) { - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(38, 38); this->background->Move(0, 0); this->background->SetImage("유저인터페이스\\Renew_QuestUI\\img_questIocn.bmp"); this->AddChild(this->background); - this->gameItem = new CUIGameItem(*this->m_context); + this->gameItem = new CUIGameItem(); this->gameItem->SetMode(0); this->gameItem->Move(7, 7); this->gameItem->unknown_0084 = 1; this->gameItem->unknown_0085 = 1; this->AddChild(this->gameItem); - this->nameText = new CUIStaticText(*this->m_context); + this->nameText = new CUIStaticText(); this->nameText->SetSize(170, 12); this->nameText->Move(46, 5); this->nameText->SetText("", 0); @@ -608,7 +608,7 @@ void CUIRewardItem::Slot15(int width, int height) { this->nameText->SetOutline(0, 0xFFFFFF); this->AddChild(this->nameText); - this->countText = new CUIStaticText(*this->m_context); + this->countText = new CUIStaticText(); this->countText->SetSize(170, 12); this->countText->Move(46, 20); this->countText->SetText("", 0); @@ -626,34 +626,34 @@ void CUIRewardItem::Slot15(int width, int height) { // OFFSET: 0x00A53170 // FUNCTION: fn_16230 void CUIScrollWindow::Slot15(int width, int height) { - this->firstContents = new CUIContents(*this->m_context); + this->firstContents = new CUIContents(); this->firstContents->SetSize(335, 59); this->firstContents->Move(0, 0); this->AddChild(this->firstContents); - this->firstLine = new CUIStaticImage(*this->m_context); + this->firstLine = new CUIStaticImage(); this->firstLine->SetSize(334, 1); this->firstLine->Move(1, 59); this->firstLine->SetImage("유저인터페이스\\Renew_QuestUI\\img_line.bmp"); this->AddChild(this->firstLine); - this->secondContents = new CUIContents(*this->m_context); + this->secondContents = new CUIContents(); this->secondContents->SetSize(335, 59); this->secondContents->Move(0, 60); this->AddChild(this->secondContents); - this->secondLine = new CUIStaticImage(*this->m_context); + this->secondLine = new CUIStaticImage(); this->secondLine->SetSize(334, 1); this->secondLine->Move(1, 119); this->secondLine->SetImage("유저인터페이스\\Renew_QuestUI\\img_line.bmp"); this->AddChild(this->secondLine); - this->rewards = new CUIRewards(*this->m_context); + this->rewards = new CUIRewards(); this->rewards->SetSize(335, 122); this->rewards->Move(0, 120); this->AddChild(this->rewards); - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->SetSize(7, 322); this->scrollBar->Move(335, 0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -676,7 +676,7 @@ void CUIScrollWindow::Slot15(int width, int height) { namespace OngoingQuestInfo { // OFFSET: 0x00A54D00 // FUNCTION: fn_16289 -CUIContents::CUIContents(UIWindowContext& context) : CUIControl(context), title(nullptr), textViewer(nullptr), icon(nullptr) { +CUIContents::CUIContents() : CUIControl(), title(nullptr), textViewer(nullptr), icon(nullptr) { } } @@ -689,15 +689,15 @@ CUIOngoingQuestInfo::CUIOngoingQuestInfo() namespace OngoingQuestInfo { // OFFSET: 0x00A54F20 // FUNCTION: fn_16292 -CUIRewards::CUIRewards(UIWindowContext& context) - : CUIControl(context), title(nullptr), firstLabel(nullptr), firstText(nullptr), secondLabel(nullptr), secondText(nullptr), thirdLabel(nullptr), +CUIRewards::CUIRewards() + : CUIControl(), title(nullptr), firstLabel(nullptr), firstText(nullptr), secondLabel(nullptr), secondText(nullptr), thirdLabel(nullptr), rewardList(nullptr), npcSprite(nullptr), icon(nullptr) { } // OFFSET: 0x00A54FF0 // FUNCTION: fn_16293 -CUIScrollWindow::CUIScrollWindow(UIWindowContext& context) - : CUIControl(context), firstLine(nullptr), secondContents(nullptr), secondLine(nullptr), rewards(nullptr), scrollBar(nullptr), firstContents(nullptr) { +CUIScrollWindow::CUIScrollWindow() + : CUIControl(), firstLine(nullptr), secondContents(nullptr), secondLine(nullptr), rewards(nullptr), scrollBar(nullptr), firstContents(nullptr) { } } @@ -722,7 +722,7 @@ void CUIListBoxExitems.resize(count, nullptr); for (OngoingQuestInfo::CUIRewardItem*& slot : this->items) { - OngoingQuestInfo::CUIRewardItem* item = new OngoingQuestInfo::CUIRewardItem(*this->m_context); + OngoingQuestInfo::CUIRewardItem* item = new OngoingQuestInfo::CUIRewardItem(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -774,7 +774,7 @@ void CUIListBoxExicon = new CUIStaticImage(*this->m_context); + this->icon = new CUIStaticImage(); this->icon->SetSize(10, 9); this->icon->Move(9, 9); this->icon->SetImage("유저인터페이스\\Renew_QuestUI\\img_poring.bmp"); this->AddChild(this->icon); - this->title = new CUIStaticText(*this->m_context); + this->title = new CUIStaticText(); this->title->SetSize(50, 12); this->title->Move(25, 9); this->title->SetText("", 0); @@ -802,7 +802,7 @@ void CUIRewards::Slot15(int width, int height) { this->title->SetOutline(0, 0xFFFFFF); this->AddChild(this->title); - this->firstLabel = new CUIStaticText(*this->m_context); + this->firstLabel = new CUIStaticText(); this->firstLabel->SetSize(50, 12); this->firstLabel->Move(32, 30); this->firstLabel->SetText("", 0); @@ -816,7 +816,7 @@ void CUIRewards::Slot15(int width, int height) { this->firstLabel->SetOutline(0, 0xFFFFFF); this->AddChild(this->firstLabel); - this->firstText = new CUIStaticText(*this->m_context); + this->firstText = new CUIStaticText(); this->firstText->SetSize(150, 12); this->firstText->Move(110, 30); this->firstText->SetText("", 0); @@ -830,7 +830,7 @@ void CUIRewards::Slot15(int width, int height) { this->firstText->SetOutline(0, 0xFFFFFF); this->AddChild(this->firstText); - this->secondLabel = new CUIStaticText(*this->m_context); + this->secondLabel = new CUIStaticText(); this->secondLabel->SetSize(100, 12); this->secondLabel->Move(32, 51); this->secondLabel->SetText("", 0); @@ -844,7 +844,7 @@ void CUIRewards::Slot15(int width, int height) { this->secondLabel->SetOutline(0, 0xFFFFFF); this->AddChild(this->secondLabel); - this->secondText = new CUIStaticText(*this->m_context); + this->secondText = new CUIStaticText(); this->secondText->SetSize(150, 12); this->secondText->Move(110, 51); this->secondText->SetText("", 0); @@ -858,7 +858,7 @@ void CUIRewards::Slot15(int width, int height) { this->secondText->SetOutline(0, 0xFFFFFF); this->AddChild(this->secondText); - this->thirdLabel = new CUIStaticText(*this->m_context); + this->thirdLabel = new CUIStaticText(); this->thirdLabel->SetSize(100, 12); this->thirdLabel->Move(32, 72); this->thirdLabel->SetText("", 0); @@ -872,7 +872,7 @@ void CUIRewards::Slot15(int width, int height) { this->thirdLabel->SetOutline(0, 0xFFFFFF); this->AddChild(this->thirdLabel); - this->rewardList = new CUIListBoxEx(*this->m_context); + this->rewardList = new CUIListBoxEx(); this->rewardList->itemWidth = 225; this->rewardList->rowHeight = 41; this->rewardList->SetSize(225, 41); diff --git a/Source/UI/Quest/UIOngoingQuestInfo.h b/Source/UI/Quest/UIOngoingQuestInfo.h index 7ccc4581..c89e498f 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.h +++ b/Source/UI/Quest/UIOngoingQuestInfo.h @@ -50,7 +50,7 @@ public: class CUIContents : public CUIControl { public: - __declspec(noinline) explicit CUIContents(UIWindowContext& context); + __declspec(noinline) CUIContents(); void Slot15(int width, int height) override; void Slot16() override; @@ -70,7 +70,7 @@ public: class CUIRewardItem : public CUIListItem { public: - explicit CUIRewardItem(UIWindowContext& context); + CUIRewardItem(); void Slot15(int width, int height) override; void Slot16() override; void Paint() override; @@ -83,7 +83,7 @@ public: class CUIRewards : public CUIControl { public: - __declspec(noinline) explicit CUIRewards(UIWindowContext& context); + __declspec(noinline) CUIRewards(); void Slot15(int width, int height) override; void Slot16() override; @@ -111,7 +111,7 @@ public: class CUIScrollWindow : public CUIControl { public: - __declspec(noinline) explicit CUIScrollWindow(UIWindowContext& context); + __declspec(noinline) CUIScrollWindow(); void Slot15(int width, int height) override; void Slot16() override; diff --git a/Source/UI/Quest/UIQuestDisplay.cpp b/Source/UI/Quest/UIQuestDisplay.cpp index 9bdb4cb7..f907a6a9 100644 --- a/Source/UI/Quest/UIQuestDisplay.cpp +++ b/Source/UI/Quest/UIQuestDisplay.cpp @@ -276,5 +276,5 @@ int UIQuestDisplay::SendMsg(UIWindow* sender, int message, std::intptr_t argumen // OFFSET: 0x00946EA0 // FUNCTION: fn_12855 -UIQuestDisplay::UIQuestDisplay(UIWindowContext& windows) : UIWindow(windows, 0) { +UIQuestDisplay::UIQuestDisplay() : UIWindow(0) { } diff --git a/Source/UI/Quest/UIQuestDisplay.h b/Source/UI/Quest/UIQuestDisplay.h index 8c41f9e3..e4c7da5f 100644 --- a/Source/UI/Quest/UIQuestDisplay.h +++ b/Source/UI/Quest/UIQuestDisplay.h @@ -14,7 +14,7 @@ struct QuestDisplayMenuItem { class UIQuestDisplay : public UIWindow { public: - UIQuestDisplay(UIWindowContext& windows); + UIQuestDisplay(); bool Slot08() override; void Slot11() override; void Paint() override; diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.cpp b/Source/UI/Quest/UIRecommendedQuestInfo.cpp index dc37d8c7..010a4113 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.cpp +++ b/Source/UI/Quest/UIRecommendedQuestInfo.cpp @@ -26,7 +26,7 @@ void CUIRecommendedQuestInfo::Slot53() { // OFFSET: 0x00A570F0 // FUNCTION: fn_16323 void CUIRecommendedQuestInfo::Slot15(int width, int height) { - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(342, 17); this->titleBar->Move(0, 0); this->titleBar->SetImages( @@ -35,7 +35,7 @@ void CUIRecommendedQuestInfo::Slot15(int width, int height) { ); this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); title->SetText("QUEST", 5); @@ -50,7 +50,7 @@ void CUIRecommendedQuestInfo::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* firstButton = new CUIImageButton(*this->m_context); + CUIImageButton* firstButton = new CUIImageButton(); firstButton->SetSize(11, 11); firstButton->Move(3, 3); firstButton->SetOnClick([this]() { this->OnFirstAction(); }); @@ -62,13 +62,13 @@ void CUIRecommendedQuestInfo::Slot15(int width, int height) { ); this->titleBar->AddChild(firstButton); - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(342, 395); this->background->Move(0, 17); this->background->SetImage(std::string("유저인터페이스\\Renew_QuestUI\\bg_detail_recommended.bmp")); this->AddChild(this->background); - this->titleText = new CUIStaticText(*this->m_context); + this->titleText = new CUIStaticText(); this->titleText->SetSize(342, 12); this->titleText->Move(0, 39); this->titleText->SetText("", 0); @@ -82,12 +82,12 @@ void CUIRecommendedQuestInfo::Slot15(int width, int height) { this->titleText->SetOutline(0, 0xFFFFFF); this->AddChild(this->titleText); - this->scrollWindow = new RecommendedQuestInfo::CUIScrollWindow(*this->m_context); + this->scrollWindow = new RecommendedQuestInfo::CUIScrollWindow(); this->scrollWindow->SetSize(342, 322); this->scrollWindow->Move(0, 62); this->AddChild(this->scrollWindow); - this->closeButton = new CUIImageButton(*this->m_context); + this->closeButton = new CUIImageButton(); this->closeButton->SetSize(42, 20); this->closeButton->Move(288, 388); this->closeButton->SetOnClick([this]() { this->OnClose(); }); @@ -140,7 +140,7 @@ void CUIQuestInfo::Slot16() { // OFFSET: 0x00A569F0 // FUNCTION: fn_16322 void CUIQuestInfo::Slot15(int width, int height) { - this->textViewer = new CUITextViewer(*this->m_context); + this->textViewer = new CUITextViewer(); this->textViewer->SetSize(300, 150); this->textViewer->Move(0, 0); this->textViewer->SetTextOffset(0, 0); @@ -168,26 +168,26 @@ void CUIQuestInfo::Slot15(int width, int height) { // OFFSET: 0x00A57EF0 // FUNCTION: fn_16324 void CUIScrollWindow::Slot15(int width, int height) { - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(336, 318); this->background->Move(3, 2); this->background->SetImage(std::string()); this->AddChild(this->background); - this->topImage = new CUIStaticImage(*this->m_context); + this->topImage = new CUIStaticImage(); this->topImage->SetSize(324, 138); this->topImage->Move(9, 8); this->topImage->SetImage("유저인터페이스\\Renew_QuestUI\\bg_quest01.png"); this->AddChild(this->topImage); - this->bottomImage = new CUIStaticImage(*this->m_context); + this->bottomImage = new CUIStaticImage(); this->bottomImage->SetSize(208, 92); this->bottomImage->Move(9, 221); this->bottomImage->SetImage("유저인터페이스\\Renew_QuestUI\\bg_quest02.png"); this->AddChild(this->bottomImage); for (int count = 3; count != 0; --count) { - CUIQuestInfo* info = new CUIQuestInfo(*this->m_context); + CUIQuestInfo* info = new CUIQuestInfo(); info->SetSize(300, 150); this->AddChild(info); this->questInfos.push_back(info); @@ -216,7 +216,7 @@ void CUIScrollWindow::Slot15(int width, int height) { // OFFSET: 0x00A58C70 // FUNCTION: fn_16350 void CUIScrollWindow::Slot16() { - this->npcSprite = new UINpcSprWnd(*this->m_context); + this->npcSprite = new UINpcSprWnd(); this->npcSprite->SetSize(75, 145); this->npcSprite->Show(0); this->AddChild(this->npcSprite); @@ -228,13 +228,13 @@ namespace RecommendedQuestInfo { // OFFSET: 0x00A58640 // FUNCTION: fn_16339 -CUIQuestInfo::CUIQuestInfo(UIWindowContext& context) : CUIControl(context), textViewer(nullptr) { +CUIQuestInfo::CUIQuestInfo() : CUIControl(), textViewer(nullptr) { } // OFFSET: 0x00A587C0 // FUNCTION: fn_16341 -CUIScrollWindow::CUIScrollWindow(UIWindowContext& context) - : CUIControl(context), background(nullptr), topImage(nullptr), bottomImage(nullptr), questInfos(), npcSprite(nullptr) { +CUIScrollWindow::CUIScrollWindow() + : CUIControl(), background(nullptr), topImage(nullptr), bottomImage(nullptr), questInfos(), npcSprite(nullptr) { } } diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.h b/Source/UI/Quest/UIRecommendedQuestInfo.h index b232e321..8ff9c4ea 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.h +++ b/Source/UI/Quest/UIRecommendedQuestInfo.h @@ -35,7 +35,7 @@ namespace RecommendedQuestInfo { class CUIQuestInfo : public CUIControl { public: - __declspec(noinline) explicit CUIQuestInfo(UIWindowContext& context); + __declspec(noinline) CUIQuestInfo(); void Slot15(int width, int height) override; void Slot16() override; @@ -46,7 +46,7 @@ public: class CUIScrollWindow : public CUIControl { public: - __declspec(noinline) explicit CUIScrollWindow(UIWindowContext& context); + __declspec(noinline) CUIScrollWindow(); void Slot15(int width, int height) override; void Slot16() override; void SetQuest(unsigned int questId); diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index fc9c6973..a4114108 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -1069,8 +1069,8 @@ bool sub_A59960() { // OFFSET: 0x00A599F0 // FUNCTION: fn_16366 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -1082,8 +1082,8 @@ CUIListBoxEx::~CUIListBoxEx() { // OFFSET: 0x00A59BB0 // FUNCTION: fn_16367 -CUIEditBoxEx::CUIEditBoxEx(UIWindowContext& context) - : CUIControl(context), backgroundColor(0xF7F7F7), borderColor(0xC6C6C6), borderWidth(1), editLeft(0), editTop(0), editRight(0), editBottom(0), +CUIEditBoxEx::CUIEditBoxEx() + : CUIControl(), backgroundColor(0xF7F7F7), borderColor(0xC6C6C6), borderWidth(1), editLeft(0), editTop(0), editRight(0), editBottom(0), edit(nullptr), onSubmit() { } @@ -1118,7 +1118,7 @@ int CUIRenewQuestUI::SendMsg(UIWindow* sender, int message, std::intptr_t a, std // FUNCTION: fn_16433 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -1316,13 +1316,13 @@ CUIFrameWnd* CreateRenewQuestUI() { // OFFSET: 0x00A5C590 // FUNCTION: fn_16434 void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { - this->icon = new CUIStaticImage(*this->m_context); + this->icon = new CUIStaticImage(); this->icon->SetSize(26, 29); this->icon->Move(8, 7); this->icon->SetImage(std::string()); this->AddChild(this->icon); - this->unknown_00EC = new CUIStaticText(*this->m_context); + this->unknown_00EC = new CUIStaticText(); this->unknown_00EC->SetSize(260, 12); this->unknown_00EC->Move(42, 6); this->unknown_00EC->SetText("", 0); @@ -1337,7 +1337,7 @@ void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { this->unknown_00EC->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00EC); - this->unknown_00F0 = new CUIStaticText(*this->m_context); + this->unknown_00F0 = new CUIStaticText(); this->unknown_00F0->SetSize(260, 12); this->unknown_00F0->Move(42, 24); this->unknown_00F0->SetText("", 0); @@ -1352,7 +1352,7 @@ void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { this->unknown_00F0->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00F0); - this->unknown_00F4 = new CUICheckBox(*this->m_context); + this->unknown_00F4 = new CUICheckBox(); this->unknown_00F4->SetSize(14, 14); this->unknown_00F4->Move(312, 3); this->unknown_00F4->SetOnCheck([this](bool checked) { this->OnSimpleView(checked); }); @@ -1378,7 +1378,7 @@ void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { this->unknown_00F4->Invalidate(); this->AddChild(this->unknown_00F4); - this->unknown_00F8 = new CUICheckBox(*this->m_context); + this->unknown_00F8 = new CUICheckBox(); this->unknown_00F8->SetSize(20, 17); this->unknown_00F8->Move(306, 22); this->unknown_00F8->SetOnCheck([this](bool checked) { this->OnActiveStateChanged(checked); }); @@ -1408,7 +1408,7 @@ void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { // OFFSET: 0x00A5D850 // FUNCTION: fn_16435 void RenewQuestUI::CUIQuestList::Slot15(int width, int height) { - this->list = new CUIListBoxEx(*this->m_context); + this->list = new CUIListBoxEx(); this->list->itemWidth = 330; this->list->rowHeight = 46; this->list->SetSize(343, 394); @@ -1500,7 +1500,7 @@ void RenewQuestUI::CUIQuestList::Slot15(int width, int height) { // OFFSET: 0x00A5E8C0 // FUNCTION: fn_16436 void CUIRenewQuestUI::Slot15(int width, int height) { - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(352, 17); this->titleBar->Move(29, 0); const std::uint8_t titleRight[] = { @@ -1523,7 +1523,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->titleBar->SetImages(std::string(DecryptName<0x75ADC57D87EFBD8FULL>(titleLeft)), std::string(DecryptName<0x2BAD156DE3E1F9D9ULL>(titleMiddle)), std::string(DecryptName<0x637B959D55771F69ULL>(titleRight))); this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); const std::uint8_t questTitle[] = {0x00, 0xDE, 0x88, 0x52, 0xEF, 0x3D}; @@ -1541,7 +1541,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* systemButton = new CUIImageButton(*this->m_context); + CUIImageButton* systemButton = new CUIImageButton(); systemButton->SetSize(11, 11); systemButton->Move(3, 3); systemButton->SetOnClick([this]() { this->OnCallback6(); }); @@ -1573,7 +1573,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->titleBar->AddChild(systemButton); - this->background = new CUIStaticImage(*this->m_context); + this->background = new CUIStaticImage(); this->background->SetSize(352, 449); this->background->Move(29, 17); const std::uint8_t backgroundImage[] = { @@ -1584,13 +1584,13 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->background->SetImage(std::string(DecryptName<0x39A39F87DD5F535BULL>(backgroundImage))); this->AddChild(this->background); - this->tab = new CUITab(*this->m_context); + this->tab = new CUITab(); this->tab->SetSize(30, 403); this->tab->Move(0, 17); this->tab->SetOnChange([this](CUITabButton* button) { this->OnTabButton(button); }); this->AddChild(this->tab); - CUITabButton* processButton = new CUITabButton(*this->m_context); + CUITabButton* processButton = new CUITabButton(); processButton->SetSize(30, 100); processButton->Move(0, 0); processButton->SetOnClick([this]() { @@ -1645,7 +1645,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->tab->AddChild(processButton); - CUITabButton* recommendedButton = new CUITabButton(*this->m_context); + CUITabButton* recommendedButton = new CUITabButton(); recommendedButton->SetSize(30, 100); recommendedButton->Move(0, 101); recommendedButton->SetOnClick([this]() { @@ -1708,7 +1708,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->tab->AddChild(recommendedButton); - CUITabButton* holdButton = new CUITabButton(*this->m_context); + CUITabButton* holdButton = new CUITabButton(); holdButton->SetSize(30, 100); holdButton->Move(0, 202); holdButton->SetOnClick([this]() { @@ -1760,7 +1760,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->tab->AddChild(holdButton); - CUITabButton* waitButton = new CUITabButton(*this->m_context); + CUITabButton* waitButton = new CUITabButton(); waitButton->SetSize(30, 100); waitButton->Move(0, 303); waitButton->SetOnClick([this]() { @@ -1812,7 +1812,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->tab->AddChild(waitButton); - this->checkBox = new CUICheckBox(*this->m_context); + this->checkBox = new CUICheckBox(); this->checkBox->SetSize(10, 10); this->checkBox->Move(38, 448); this->checkBox->SetOnCheck([this](bool checked) { reinterpret_cast(this)->RecordWindowFlag(checked); }); @@ -1846,7 +1846,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->checkBox->Invalidate(); this->AddChild(this->checkBox); - this->filterLabel = new CUIStaticText(*this->m_context); + this->filterLabel = new CUIStaticText(); this->filterLabel->SetSize(100, 12); this->filterLabel->Move(52, 447); this->filterLabel->SetText("", 0); @@ -1861,7 +1861,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->filterLabel->SetOutline(0, 0xFFFFFF); this->AddChild(this->filterLabel); - this->closeButton = new CUIImageButton(*this->m_context); + this->closeButton = new CUIImageButton(); this->closeButton->SetSize(42, 20); this->closeButton->Move(327, 442); this->closeButton->SetOnClick([this]() { g_windowMgr.CloseWindow(0x2718); }); @@ -1894,7 +1894,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->AddChild(this->closeButton); for (int index = 0; index < 4; ++index) { - RenewQuestUI::CUIQuestList* list = new RenewQuestUI::CUIQuestList(*this->m_context); + RenewQuestUI::CUIQuestList* list = new RenewQuestUI::CUIQuestList(); list->SetSize(343, 394); this->AddChild(list); this->questLists.push_back(list); @@ -1904,7 +1904,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->questLists[2]->Move(38, 17); this->questLists[3]->Move(38, 17); - this->searchBackground = new CUIStaticImage(*this->m_context); + this->searchBackground = new CUIStaticImage(); this->searchBackground->SetSize(352, 28); this->searchBackground->Move(29, 411); const std::uint8_t searchImage[] = { @@ -1915,13 +1915,13 @@ void CUIRenewQuestUI::Slot15(int width, int height) { this->searchBackground->SetImage(std::string(DecryptName<0xDB27CB557D038759ULL>(searchImage))); this->AddChild(this->searchBackground); - this->filterPanel = new CUITab(*this->m_context); + this->filterPanel = new CUITab(); this->filterPanel->SetSize(181, 22); this->filterPanel->Move(35, 414); this->filterPanel->SetOnChange([this](CUITabButton* button) { this->OnFilterButton(button); }); this->AddChild(this->filterPanel); - CUITabButton* allButton = new CUITabButton(*this->m_context); + CUITabButton* allButton = new CUITabButton(); allButton->SetSize(26, 22); allButton->Move(0, 0); allButton->SetOnClick([this]() { this->OnCallback50(); }); @@ -1964,7 +1964,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->filterPanel->AddChild(allButton); - CUITabButton* normalButton = new CUITabButton(*this->m_context); + CUITabButton* normalButton = new CUITabButton(); normalButton->SetSize(26, 22); normalButton->Move(31, 0); normalButton->SetOnClick([this]() { this->OnCallback56(); }); @@ -1986,7 +1986,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->filterPanel->AddChild(normalButton); - CUITabButton* subButton = new CUITabButton(*this->m_context); + CUITabButton* subButton = new CUITabButton(); subButton->SetSize(26, 22); subButton->Move(62, 0); subButton->SetOnClick([this]() { this->OnPanelButton(); }); @@ -2008,7 +2008,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->filterPanel->AddChild(subButton); - CUITabButton* dailyButton = new CUITabButton(*this->m_context); + CUITabButton* dailyButton = new CUITabButton(); dailyButton->SetSize(26, 22); dailyButton->Move(93, 0); dailyButton->SetOnClick([this]() { this->OnCallback43(); }); @@ -2030,7 +2030,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->filterPanel->AddChild(dailyButton); - CUITabButton* eventButton = new CUITabButton(*this->m_context); + CUITabButton* eventButton = new CUITabButton(); eventButton->SetSize(26, 22); eventButton->Move(124, 0); eventButton->SetOnClick([this]() { this->OnCallback74(); }); @@ -2052,7 +2052,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->filterPanel->AddChild(eventButton); - CUITabButton* etcButton = new CUITabButton(*this->m_context); + CUITabButton* etcButton = new CUITabButton(); etcButton->SetSize(26, 22); etcButton->Move(155, 0); etcButton->SetOnClick([this]() { this->OnCallback80(); }); @@ -2074,7 +2074,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { ); this->filterPanel->AddChild(etcButton); - this->searchEdit = new CUIEditBoxEx(*this->m_context); + this->searchEdit = new CUIEditBoxEx(); this->searchEdit->Create(119, 16, false); this->searchEdit->Move(223, 417); this->searchEdit->SetText(std::string("")); @@ -2092,7 +2092,7 @@ void CUIRenewQuestUI::Slot15(int width, int height) { }); this->AddChild(this->searchEdit); - this->searchButton = new CUIImageButton(*this->m_context); + this->searchButton = new CUIImageButton(); this->searchButton->SetSize(23, 18); this->searchButton->Move(342, 416); this->searchButton->SetOnClick([this]() { @@ -2136,7 +2136,7 @@ void CUIListBoxEx::AddNewItem() { } this->items.resize(count, nullptr); for (RenewQuestUI::CUIQuestItem*& slot : this->items) { - RenewQuestUI::CUIQuestItem* item = new RenewQuestUI::CUIQuestItem(*this->m_context); + RenewQuestUI::CUIQuestItem* item = new RenewQuestUI::CUIQuestItem(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -2187,14 +2187,14 @@ void CUIListBoxEx::Resize(int width, // OFFSET: 0x00A659B0 // FUNCTION: fn_16597 -RenewQuestUI::CUIQuestItem::CUIQuestItem(UIWindowContext& context) - : CUIListItem(context), icon(nullptr), unknown_00EC(nullptr), unknown_00F0(nullptr), unknown_00F4(nullptr), unknown_00F8(nullptr), questType(1), +RenewQuestUI::CUIQuestItem::CUIQuestItem() + : CUIListItem(), icon(nullptr), unknown_00EC(nullptr), unknown_00F0(nullptr), unknown_00F4(nullptr), unknown_00F8(nullptr), questType(1), questId(0), pressed(0), baseX(0), baseY(0) { } // OFFSET: 0x00A65A70 // FUNCTION: fn_16598 -RenewQuestUI::CUIQuestList::CUIQuestList(UIWindowContext& context) : CUIControl(context), list(nullptr), type(1) { +RenewQuestUI::CUIQuestList::CUIQuestList() : CUIControl(), list(nullptr), type(1) { } // OFFSET: 0x00A65AF0 diff --git a/Source/UI/Quest/UIRenewQuestUI.h b/Source/UI/Quest/UIRenewQuestUI.h index 78a0573b..3b364552 100644 --- a/Source/UI/Quest/UIRenewQuestUI.h +++ b/Source/UI/Quest/UIRenewQuestUI.h @@ -18,7 +18,7 @@ class CUIStaticText; namespace RenewQuestUI { class CUIQuestItem : public CUIListItem { public: - __declspec(noinline) explicit CUIQuestItem(UIWindowContext& context); + __declspec(noinline) CUIQuestItem(); void Slot15(int width, int height) override; void Move(int x, int y) override; @@ -46,7 +46,7 @@ public: class CUIQuestList : public CUIControl { public: - __declspec(noinline) explicit CUIQuestList(UIWindowContext& context); + __declspec(noinline) CUIQuestList(); void Slot15(int width, int height) override; void Paint() override; void Slot16() override; diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index 5ff43f6c..e7829f01 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -51,8 +51,8 @@ bool g_renewQuestTitlesPending = true; // OFFSET: 0x007F9070 // FUNCTION: fn_09931 -UINpcSprWnd::UINpcSprWnd(UIWindowContext& context) - : UIWindow(context, 0), m_mapName(), m_action(nullptr), m_sprite(nullptr), m_destinationX(0), m_destinationY(0) { +UINpcSprWnd::UINpcSprWnd() + : UIWindow(0), m_mapName(), m_action(nullptr), m_sprite(nullptr), m_destinationX(0), m_destinationY(0) { this->m_mapName.clear(); } @@ -158,8 +158,8 @@ void UINpcSprWnd::SetDestination(std::string mapName, int x, int y) { // OFFSET: 0x007F9A70 // FUNCTION: fn_09940 -UIOngoingQuestScrollWnd::UIOngoingQuestScrollWnd(UIWindowContext& windows, int width, int height) - : UIScrollWnd(windows, width, height, 0), m_questId(0), m_lineHeight(18) { +UIOngoingQuestScrollWnd::UIOngoingQuestScrollWnd(int width, int height) + : UIScrollWnd(width, height, 0), m_questId(0), m_lineHeight(18) { this->m_huntTexts.clear(); this->Slot15(width, height); } @@ -287,7 +287,7 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { label->Move(24, 9); this->AddScrollChild(label); - UITagTextViewer* viewer = new UITagTextViewer(*this->m_context); + UITagTextViewer* viewer = new UITagTextViewer(); viewer->SetSize(290, 200); viewer->Move(32, 30); viewer->m_font = TagTextViewer::TextFont{0x38302E, 12, 0, 0}; @@ -344,7 +344,7 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { y += bitmap->geometry.height + 8; if (!quest.unknown_007C.empty()) { - UINpcSprWnd* npc = new UINpcSprWnd(*this->m_context); + UINpcSprWnd* npc = new UINpcSprWnd(); npc->SetSprite(75, 145, quest.unknown_007C); npc->Move(this->geometry.width - npc->geometry.width - 30, y); if (!quest.unknown_0094.empty()) { @@ -443,10 +443,10 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { } } - this->horizontalBar = new UIScrollBar(*this->m_context); + this->horizontalBar = new UIScrollBar(); this->horizontalBar->Configure(0, this->geometry.height - this->scrollBarHeight, 0, this->geometry.width - this->scrollBarWidth); this->AddChild(this->horizontalBar); - this->scrollBar = new UIRenewQuestScrollBar(*this->m_context); + this->scrollBar = new UIRenewQuestScrollBar(); this->scrollBar->Configure(this->geometry.width - this->scrollBarWidth, 0, 1, this->geometry.height - this->scrollBarHeight); this->AddChild(this->scrollBar); this->Slot53(); @@ -455,8 +455,8 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { // OFFSET: 0x007FAF70 // FUNCTION: fn_09949 -UIRecommededQuestScrollWnd::UIRecommededQuestScrollWnd(UIWindowContext& windows, int width, int height) - : UIScrollWnd(windows, width, height, 0), unknown_00B0(0), unknown_00B4(14) { +UIRecommededQuestScrollWnd::UIRecommededQuestScrollWnd(int width, int height) + : UIScrollWnd(width, height, 0), unknown_00B0(0), unknown_00B4(14) { this->Slot15(width, height); } @@ -512,14 +512,14 @@ void UIRecommededQuestScrollWnd::SetQuest(unsigned int questId) { this->unknown_00B0 = questId; UITagTextViewer* viewers[3]; - viewers[0] = new UITagTextViewer(*this->m_context); + viewers[0] = new UITagTextViewer(); viewers[0]->SetSize(306, 121); viewers[0]->Move(18, 12); viewers[0]->m_backgroundColor = 0xFFFF00FF; viewers[0]->Invalidate(); this->AddScrollChild(viewers[0]); - viewers[1] = new UITagTextViewer(*this->m_context); + viewers[1] = new UITagTextViewer(); viewers[1]->SetSize(213, 60); viewers[1]->Move(16, 157); viewers[1]->m_backgroundColor = 0xFFFF00FF; @@ -530,7 +530,7 @@ void UIRecommededQuestScrollWnd::SetQuest(unsigned int questId) { viewers[1]->m_lineSpacing = 4; this->AddScrollChild(viewers[1]); - viewers[2] = new UITagTextViewer(*this->m_context); + viewers[2] = new UITagTextViewer(); viewers[2]->SetSize(199, 83); viewers[2]->Move(18, 225); viewers[2]->m_backgroundColor = 0xFFFF00FF; @@ -544,7 +544,7 @@ void UIRecommededQuestScrollWnd::SetQuest(unsigned int questId) { } if (!quest.unknown_007C.empty()) { - UINpcSprWnd* npc = new UINpcSprWnd(*this->m_context); + UINpcSprWnd* npc = new UINpcSprWnd(); npc->SetSprite(75, 145, quest.unknown_007C); npc->Move(this->geometry.width - npc->geometry.width - 40, this->geometry.height - npc->geometry.height - 10); if (!quest.unknown_0094.empty()) { @@ -558,23 +558,23 @@ void UIRecommededQuestScrollWnd::SetQuest(unsigned int questId) { // OFFSET: 0x007FB4D0 // FUNCTION: fn_09957 -UIRenewDetailQuestInfoWnd::UIRenewDetailQuestInfoWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_ongoingWnd(nullptr), m_recommendedWnd(nullptr), m_questId(0), m_timeText(""), m_imageName(""), +UIRenewDetailQuestInfoWnd::UIRenewDetailQuestInfoWnd() + : UIFrameWnd(0), m_ongoingWnd(nullptr), m_recommendedWnd(nullptr), m_questId(0), m_timeText(""), m_imageName(""), m_recommended(false) { } // OFFSET: 0x007FB6C0 // FUNCTION: fn_09959 void UIRenewDetailQuestInfoWnd::Slot15(int, int) { - this->m_ongoingWnd = new UIOngoingQuestScrollWnd(*this->m_context, 342, 322); + this->m_ongoingWnd = new UIOngoingQuestScrollWnd(342, 322); this->m_ongoingWnd->Move(0, 62); this->AddChild(this->m_ongoingWnd); - this->m_recommendedWnd = new UIRecommededQuestScrollWnd(*this->m_context, 342, 322); + this->m_recommendedWnd = new UIRecommededQuestScrollWnd(342, 322); this->m_recommendedWnd->Move(0, 62); this->AddChild(this->m_recommendedWnd); - this->m_closeButton = new UIBitmapButton(*this->m_context); + this->m_closeButton = new UIBitmapButton(); this->m_closeButton->SetBitmap("유저인터페이스\\basic_interface\\btn_close.bmp", 0, 0); this->m_closeButton->SetBitmap("유저인터페이스\\basic_interface\\btn_close_a.bmp", 1, 0); this->m_closeButton->SetBitmap("유저인터페이스\\basic_interface\\btn_close_b.bmp", 2, 0); @@ -693,15 +693,15 @@ void UIRenewDetailQuestInfoWnd::SetQuest(unsigned int questId, bool recommended) // OFFSET: 0x007FBF60 // FUNCTION: fn_09966 -UIRenewQuestScrollBar::UIRenewQuestScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UIRenewQuestScrollBar::UIRenewQuestScrollBar() : UIScrollBar() { this->arrowLength = 3; this->thickness = 7; } // OFFSET: 0x007FBFD0 // FUNCTION: fn_09967 -UIRenewQuestWnd::UIRenewQuestWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_tabs(nullptr), m_scrollBar(nullptr), m_optionCheckBox(nullptr), m_closeButton(nullptr), m_tab(0), m_scroll(0), +UIRenewQuestWnd::UIRenewQuestWnd() + : UIFrameWnd(0), m_tabs(nullptr), m_scrollBar(nullptr), m_optionCheckBox(nullptr), m_closeButton(nullptr), m_tab(0), m_scroll(0), m_selected(0), m_scrollable(false), m_pressed(0) { std::memset(&this->m_rows, 0, sizeof(this->m_rows)); this->m_questIds[0].clear(); @@ -712,7 +712,7 @@ UIRenewQuestWnd::UIRenewQuestWnd(UIWindowContext& windows) // OFFSET: 0x007FC4A0 // FUNCTION: fn_09972 void UIRenewQuestWnd::Slot15(int, int) { - this->m_tabs = new UITab(*this->m_context); + this->m_tabs = new UITab(); this->m_tabs->SetSize(29, 404); this->m_tabs->tabCount = 4; this->m_tabs->Move(0, 17); @@ -728,7 +728,7 @@ void UIRenewQuestWnd::Slot15(int, int) { "유저인터페이스\\renew_questui\\checkbox_off.bmp" ); - this->m_closeButton = new UIBitmapButton(*this->m_context); + this->m_closeButton = new UIBitmapButton(); this->m_closeButton->SetBitmap("유저인터페이스\\basic_interface\\btn_close.bmp", 0, 0); this->m_closeButton->SetBitmap("유저인터페이스\\basic_interface\\btn_close_a.bmp", 1, 0); this->m_closeButton->SetBitmap("유저인터페이스\\basic_interface\\btn_close_b.bmp", 2, 0); @@ -737,7 +737,7 @@ void UIRenewQuestWnd::Slot15(int, int) { this->m_closeButton->SetId(201); this->AddChild(this->m_closeButton); - this->m_scrollBar = new UIRenewQuestScrollBar(*this->m_context); + this->m_scrollBar = new UIRenewQuestScrollBar(); this->m_scrollBar->Configure(374, 17, 1, 422); this->m_scroll = 0; this->AddChild(this->m_scrollBar); @@ -759,7 +759,7 @@ void UIRenewQuestWnd::Slot15(int, int) { lock->m_message = 1; this->m_rows.lockBoxes[index]->SetHidden(true); - this->m_rows.icons[index] = new UIStaticBitmap(*this->m_context); + this->m_rows.icons[index] = new UIStaticBitmap(); this->m_rows.icons[index]->SetBitmap("유저인터페이스\\renew_questui\\ico_nq.bmp"); this->m_rows.icons[index]->SetSize(this->m_rows.icons[index]->geometry.width, this->m_rows.icons[index]->geometry.height); this->m_rows.icons[index]->Move(46, y - 15); diff --git a/Source/UI/Quest/UIRenewQuestWnd.h b/Source/UI/Quest/UIRenewQuestWnd.h index f60261a5..4ad0457a 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.h +++ b/Source/UI/Quest/UIRenewQuestWnd.h @@ -20,7 +20,7 @@ class UITab; class UINpcSprWnd : public UIWindow { public: - __declspec(noinline) explicit UINpcSprWnd(UIWindowContext& context); + __declspec(noinline) UINpcSprWnd(); // INLINED ~UINpcSprWnd() override { this->m_mapName.clear(); @@ -42,7 +42,7 @@ public: class UIOngoingQuestScrollWnd : public UIScrollWnd { public: - __declspec(noinline) UIOngoingQuestScrollWnd(UIWindowContext& windows, int width, int height); + __declspec(noinline) UIOngoingQuestScrollWnd(int width, int height); void Slot15(int width, int height) override; void Paint() override; void Slot35(int delta) override; @@ -60,7 +60,7 @@ public: class UIRecommededQuestScrollWnd : public UIScrollWnd { public: - __declspec(noinline) UIRecommededQuestScrollWnd(UIWindowContext& windows, int width, int height); + __declspec(noinline) UIRecommededQuestScrollWnd(int width, int height); void Slot15(int width, int height) override; void Paint() override; void Slot35(int delta) override; @@ -76,7 +76,7 @@ public: class UIRenewDetailQuestInfoWnd : public UIFrameWnd { public: - UIRenewDetailQuestInfoWnd(UIWindowContext& windows); + UIRenewDetailQuestInfoWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; @@ -100,7 +100,7 @@ protected: class UIRenewQuestScrollBar : public UIScrollBar { public: - explicit UIRenewQuestScrollBar(UIWindowContext& windows); + UIRenewQuestScrollBar(); void Paint() override; }; @@ -112,7 +112,7 @@ struct RenewQuestRowControls { class UIRenewQuestWnd : public UIFrameWnd { public: - UIRenewQuestWnd(UIWindowContext& windows); + UIRenewQuestWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Rodex/UIRodexComposeWnd.cpp b/Source/UI/Rodex/UIRodexComposeWnd.cpp index 467985e9..42137596 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.cpp +++ b/Source/UI/Rodex/UIRodexComposeWnd.cpp @@ -62,12 +62,12 @@ struct RodexSendMailRequest { // OFFSET: 0x007FEF20 // FUNCTION: fn_09993 -UIRodexEditCtrl3::UIRodexEditCtrl3(UIWindowContext& windows) : UIEditCtrl3(windows) { +UIRodexEditCtrl3::UIRodexEditCtrl3() : UIEditCtrl3() { } // OFFSET: 0x007FEF80 // FUNCTION: fn_09994 -UIRodexScrollBar::UIRodexScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UIRodexScrollBar::UIRodexScrollBar() : UIScrollBar() { this->arrowLength = 5; } @@ -142,7 +142,7 @@ void UIRodexComposeWnd::sub_7FF940(int tagId) { // OFFSET: 0x00800480 // FUNCTION: fn_10006 void UIRodexEditCtrl3::Slot15(int width, int height) { - auto* scrollBar = new UIRodexScrollBar(*this->m_context); + auto* scrollBar = new UIRodexScrollBar(); this->unknown_0130 = scrollBar; scrollBar->Configure(width - 5, 0, 1, height); this->AddChild(this->unknown_0130); @@ -237,8 +237,8 @@ void UIRodexComposeWnd::Slot32(int x, int y) { // OFFSET: 0x007FEDD0 // FUNCTION: fn_09992 -UIRodexComposeWnd::UIRodexComposeWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00B4(nullptr), unknown_00B8(nullptr), unknown_00BC(nullptr), unknown_00C0(nullptr), unknown_00C4(nullptr), +UIRodexComposeWnd::UIRodexComposeWnd() + : UIFrameWnd(0), unknown_00B4(nullptr), unknown_00B8(nullptr), unknown_00BC(nullptr), unknown_00C0(nullptr), unknown_00C4(nullptr), unknown_00C8(nullptr), unknown_00CC(0), unknown_00D0(nullptr), m_contents(nullptr), unknown_00D8(nullptr), m_zeny(nullptr), unknown_00E0(0), unknown_00E4(0), m_itemIndex(0), unknown_00F8(0), unknown_0100(nullptr) { this->m_items.clear(); diff --git a/Source/UI/Rodex/UIRodexComposeWnd.h b/Source/UI/Rodex/UIRodexComposeWnd.h index f222c757..757c9aaf 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.h +++ b/Source/UI/Rodex/UIRodexComposeWnd.h @@ -18,24 +18,23 @@ class UIStaticText; class UIRodexScrollBar : public UIScrollBar { public: - explicit UIRodexScrollBar(UIWindowContext& windows); + UIRodexScrollBar(); void Paint() override; }; class UIRodexEditCtrl3 : public UIEditCtrl3 { public: - // INLINED - UIRodexEditCtrl3() { + UIRodexEditCtrl3(); + UIRodexEditCtrl3(UIWindowContext&) : UIRodexEditCtrl3() { } - UIRodexEditCtrl3(UIWindowContext& windows); void Slot15(int width, int height) override; void sub_855150(); }; class UIRodexComposeWnd : public UIFrameWnd { public: - UIRodexComposeWnd(UIWindowContext& windows); + UIRodexComposeWnd(); ~UIRodexComposeWnd() override; void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Rodex/UIRodexInboxWnd.cpp b/Source/UI/Rodex/UIRodexInboxWnd.cpp index 1fcad812..21b2e49e 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.cpp +++ b/Source/UI/Rodex/UIRodexInboxWnd.cpp @@ -137,7 +137,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->unknown_0138 = new UIBmpRadioBtn(*this->m_context); + this->unknown_0138 = new UIBmpRadioBtn(); this->unknown_0138->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_out.bmp", 0); this->unknown_0138->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_over.bmp", 1); this->unknown_0138->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_press.bmp", 2); @@ -159,7 +159,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->AddChild(this->unknown_0138); this->unknown_0138->SendMsg(this, 13, 0, 0, 0, 0); - this->unknown_0134 = new UIBmpRadioBtn(*this->m_context); + this->unknown_0134 = new UIBmpRadioBtn(); this->unknown_0134->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_out.bmp", 0); this->unknown_0134->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_over.bmp", 1); this->unknown_0134->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_press.bmp", 2); @@ -181,7 +181,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->AddChild(this->unknown_0134); this->unknown_0134->SendMsg(this, 13, 0, 0, 0, 0); - this->unknown_0130 = new UIBmpRadioBtn(*this->m_context); + this->unknown_0130 = new UIBmpRadioBtn(); this->unknown_0130->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_out.bmp", 0); this->unknown_0130->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_over.bmp", 1); this->unknown_0130->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_press.bmp", 2); @@ -215,7 +215,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { break; } - this->unknown_013C = new UIBitmapButton(*this->m_context); + this->unknown_013C = new UIBitmapButton(); this->unknown_013C->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_refresh_out.bmp", 0, 0); this->unknown_013C->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_refresh_over.bmp", 1, 0); this->unknown_013C->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_refresh_press.bmp", 2, 0); @@ -225,7 +225,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->unknown_013C->SetId(0x19F); this->AddChild(this->unknown_013C); - this->unknown_0140 = new UIBitmapButton(*this->m_context); + this->unknown_0140 = new UIBitmapButton(); this->unknown_0140->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_write_out.bmp", 0, 0); this->unknown_0140->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_write_over.bmp", 1, 0); this->unknown_0140->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_write_press.bmp", 2, 0); @@ -236,7 +236,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->AddChild(this->unknown_0140); for (int y = 0x66, row = 0; y < 0x16E; y += 0x2C, ++row) { - this->checks[row] = new UICheckBox(*this->m_context); + this->checks[row] = new UICheckBox(); this->checks[row]->SetSize(14, 14); this->checks[row]->SetBitmaps("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\checkbox_on.bmp", "유저인터페이스\\basic_interface\\rodexsystem\\renewal\\checkbox_off.bmp"); this->checks[row]->Move(0x11, y + 6); @@ -245,7 +245,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->checks[row]->Show(0); this->AddChild(this->checks[row]); - this->unknown_015C[row] = new UITextButton(*this->m_context); + this->unknown_015C[row] = new UITextButton(); this->unknown_015C[row]->Configure("", 0, 0, 12, 0, 0); this->unknown_015C[row]->m_hoverColor = 0x51417E; this->unknown_015C[row]->Move(0x45, y); @@ -254,7 +254,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->unknown_015C[row]->Enable(0); this->AddChild(this->unknown_015C[row]); - this->unknown_0144[row] = new UITextButton(*this->m_context); + this->unknown_0144[row] = new UITextButton(); this->unknown_0144[row]->Configure("", 0x844A42, 0, 11, 1, 0); this->unknown_0144[row]->m_hoverColor = 0x51417E; this->unknown_0144[row]->Move(0x47, y + 0x10); @@ -263,7 +263,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->unknown_0144[row]->Enable(0); this->AddChild(this->unknown_0144[row]); - this->unknown_01A8[row] = new UIBitmapButton(*this->m_context); + this->unknown_01A8[row] = new UIBitmapButton(); this->unknown_01A8[row]->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_return_out.bmp", 0, 0); this->unknown_01A8[row]->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_return_over.bmp", 1, 0); this->unknown_01A8[row]->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_return_press.bmp", 2, 0); @@ -275,21 +275,21 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->AddChild(this->unknown_01A8[row]); } - UIBasicButton* button = new UIBasicButton(*this->m_context); + UIBasicButton* button = new UIBasicButton(); this->unknown_018C = button; button->Configure(0x46, LookupMessage(0xE05)); this->unknown_018C->SetId(0x222); this->unknown_018C->Move(4, 0x178); this->AddChild(this->unknown_018C); - button = new UIBasicButton(*this->m_context); + button = new UIBasicButton(); this->unknown_0190 = button; button->Configure(0x46, LookupMessage(0xE08)); this->unknown_0190->Move(0x54, 0x188); this->unknown_0190->SetId(0x224); this->AddChild(this->unknown_0190); - this->unknown_0194 = new UIBitmapButton(*this->m_context); + this->unknown_0194 = new UIBitmapButton(); this->unknown_0194->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_prev_out.bmp", 0, 0); this->unknown_0194->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_prev_over.bmp", 1, 0); this->unknown_0194->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_prev_press.bmp", 2, 0); @@ -299,7 +299,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->unknown_0194->SetId(0x13C); this->AddChild(this->unknown_0194); - this->unknown_0198 = new UIBitmapButton(*this->m_context); + this->unknown_0198 = new UIBitmapButton(); this->unknown_0198->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_next_out.bmp", 0, 0); this->unknown_0198->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_next_over.bmp", 1, 0); this->unknown_0198->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_next_press.bmp", 2, 0); @@ -311,7 +311,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { const int searchTexts[2] = {0xC78, 0xC79}; for (int x = 0x16, index = 0; x < 0x7C; x += 0x33, ++index) { - this->unknown_01C0[index] = new UIRadioBtn(*this->m_context); + this->unknown_01C0[index] = new UIRadioBtn(); this->unknown_01C0[index]->SetSize(0x33, 12); { UIRadioBtn* radio = this->unknown_01C0[index]; @@ -338,7 +338,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->unknown_01C8->preserveInput = 1; this->AddChild(this->unknown_01C8); - this->unknown_01CC = new UIBitmapButton(*this->m_context); + this->unknown_01CC = new UIBitmapButton(); this->unknown_01CC->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_search_out.bmp", 0, 0); this->unknown_01CC->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_search_over.bmp", 1, 0); this->unknown_01CC->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_search_press.bmp", 2, 0); @@ -347,7 +347,7 @@ void UIRodexInboxWnd::Slot15(int width, int height) { this->unknown_01CC->SetId(0x141); this->AddChild(this->unknown_01CC); - this->unknown_01D0 = new UIBmpRadioBtn(*this->m_context); + this->unknown_01D0 = new UIBmpRadioBtn(); this->unknown_01D0->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_out.bmp", 0); this->unknown_01D0->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_over.bmp", 1); this->unknown_01D0->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_listtab_empty_press.bmp", 2); diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp index ac345dc4..5889a531 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp @@ -99,12 +99,12 @@ int UIRune_Decom::HitTestItem(int x, int y) { // OFFSET: 0x00818300 // FUNCTION: fn_10174 void UIRune_Info::Slot15(int, int) { - this->m_activeWnd = new (std::nothrow) UIRuneSystem_ActiveWnd(*this->m_context); + this->m_activeWnd = new (std::nothrow) UIRuneSystem_ActiveWnd(); this->AddChild(this->m_activeWnd); this->m_activeWnd->SetSize(0xEA, 0x78); this->m_activeWnd->Move(0xC5, 0x159); - this->m_activateButton = new (std::nothrow) UIBitmapButton(*this->m_context); + this->m_activateButton = new (std::nothrow) UIBitmapButton(); this->AddChild(this->m_activateButton); this->m_activateButton->SetBitmap("유저인터페이스\\runesystem\\bt_active_nomal.bmp", 0, 0); this->m_activateButton->SetBitmap("유저인터페이스\\runesystem\\bt_active_mouseon.bmp", 1, 0); @@ -1493,13 +1493,13 @@ void UIRune_ViewInfo::Paint() { // OFFSET: 0x00814BC0 // FUNCTION: fn_10136 -UIRuneSystemTab::UIRuneSystemTab(UIWindowContext& windows) : UIWindow(windows, 0), m_count(4), m_label("유저인터페이스\\runesystem\\runesystam_tab_%d.bmp") { +UIRuneSystemTab::UIRuneSystemTab() : UIWindow(0), m_count(4), m_label("유저인터페이스\\runesystem\\runesystam_tab_%d.bmp") { this->geometry.unknown_0030 = 0; } // OFFSET: 0x00814D40 // FUNCTION: fn_10137 -UIRuneSystemWnd::UIRuneSystemWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), m_nextTick(0) { +UIRuneSystemWnd::UIRuneSystemWnd() : UIFrameWnd(0), m_nextTick(0) { RuneSystemOpenPacket packet; packet.id = 0x0BE0; packet.open = 1; @@ -1508,14 +1508,14 @@ UIRuneSystemWnd::UIRuneSystemWnd(UIWindowContext& windows) : UIFrameWnd(windows, // OFFSET: 0x00814DE0 // FUNCTION: fn_10138 -UIRuneSystem_ActiveWnd::UIRuneSystem_ActiveWnd(UIWindowContext& windows) : UIWindow(windows, 0), m_columns(4), m_rows(2), m_listId(-1) { +UIRuneSystem_ActiveWnd::UIRuneSystem_ActiveWnd() : UIWindow(0), m_columns(4), m_rows(2), m_listId(-1) { } // OFFSET: 0x00814EE0 // FUNCTION: fn_10139 -UIRuneSystem_DecomResultWnd::UIRuneSystem_DecomResultWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_total(0) { - UIBitmapButton* button = new UIBitmapButton(windows); +UIRuneSystem_DecomResultWnd::UIRuneSystem_DecomResultWnd() + : UIFrameWnd(0), m_total(0) { + UIBitmapButton* button = new UIBitmapButton(); this->AddChild(button); button->SetBitmap("유저인터페이스\\runesystem\\bt_ok_nomal.bmp", 0, 0); button->SetBitmap("유저인터페이스\\runesystem\\bt_ok_mouseon.bmp", 1, 0); @@ -1529,14 +1529,14 @@ UIRuneSystem_DecomResultWnd::UIRuneSystem_DecomResultWnd(UIWindowContext& window // OFFSET: 0x00815020 // FUNCTION: fn_10140 -UIRuneSystem_Decom_RadioBtn::UIRuneSystem_Decom_RadioBtn(UIWindowContext& windows) : UIRadioBtn(windows) { +UIRuneSystem_Decom_RadioBtn::UIRuneSystem_Decom_RadioBtn() : UIRadioBtn() { } // OFFSET: 0x008150A0 // FUNCTION: fn_10141 -UIRuneSystem_tagListWnd::UIRuneSystem_tagListWnd(UIWindowContext& windows) - : UIWindow(windows, 0), m_firstTag(0), m_visibleCount(9) { - this->m_rightButton = new UIBitmapButton(windows); +UIRuneSystem_tagListWnd::UIRuneSystem_tagListWnd() + : UIWindow(0), m_firstTag(0), m_visibleCount(9) { + this->m_rightButton = new UIBitmapButton(); this->AddChild(this->m_rightButton); this->m_rightButton->SetBitmap("유저인터페이스\\runesystem\\bt_tag_right_nomal.bmp", 0, 0); this->m_rightButton->SetBitmap("유저인터페이스\\runesystem\\bt_tag_right_mouseon.bmp", 1, 0); @@ -1546,7 +1546,7 @@ UIRuneSystem_tagListWnd::UIRuneSystem_tagListWnd(UIWindowContext& windows) this->m_rightButton->Move(267, 9); this->m_rightButton->SetId(0x13D); - this->m_leftButton = new UIBitmapButton(windows); + this->m_leftButton = new UIBitmapButton(); this->AddChild(this->m_leftButton); this->m_leftButton->SetBitmap("유저인터페이스\\runesystem\\bt_tag_left_nomal.bmp", 0, 0); this->m_leftButton->SetBitmap("유저인터페이스\\runesystem\\bt_tag_left_mouseon.bmp", 1, 0); @@ -1566,7 +1566,7 @@ UIRuneSystem_tagListWnd::UIRuneSystem_tagListWnd(UIWindowContext& windows) // OFFSET: 0x008152B0 // FUNCTION: fn_10142 -UIRune_Decom::UIRune_Decom(UIWindowContext& windows) : UIWindow(windows, 0) { +UIRune_Decom::UIRune_Decom() : UIWindow(0) { this->unknown_007C.clear(); this->unknown_0094.clear(); this->m_ownedCount = 0; @@ -1577,7 +1577,7 @@ UIRune_Decom::UIRune_Decom(UIWindowContext& windows) : UIWindow(windows, 0) { // OFFSET: 0x008153A0 // FUNCTION: fn_10143 -UIRune_Info::UIRune_Info(UIWindowContext& windows) : UIWindow(windows, 0), m_rune(nullptr) { +UIRune_Info::UIRune_Info() : UIWindow(0), m_rune(nullptr) { } // OFFSET: 0x0081D6B0 @@ -1697,7 +1697,7 @@ struct SessionMessengerContext { // OFFSET: 0x008184A0 // FUNCTION: fn_10175 void UIRune_ViewInfo::Slot15(int, int) { - this->m_gauge = new UIGage_Circle(*this->m_context); + this->m_gauge = new UIGage_Circle(); this->AddChild(this->m_gauge); this->m_gauge->SetSize(0x89, 0x7F); this->m_gauge->Move(0xC0, 0xF7); @@ -1707,7 +1707,7 @@ void UIRune_ViewInfo::Slot15(int, int) { this->m_gauge->m_fullBitmap = "유저인터페이스\\runesystem\\view_gage_full.bmp"; this->m_gauge->m_maxBitmap = "유저인터페이스\\runesystem\\view_gage_max.bmp"; - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); this->AddChild(title); std::string text = "룬타블렛-룬도감"; int width = this->TextWidth(text.c_str(), text.size(), 0, 12, 0, 0); @@ -1717,7 +1717,7 @@ void UIRune_ViewInfo::Slot15(int, int) { title->SetText(text.c_str(), 1); title->SetColor(0xFF, 0xFF, 0xFF); - UIStaticText* rate = new UIStaticText(*this->m_context); + UIStaticText* rate = new UIStaticText(); this->AddChild(rate); text = "수집률"; width = this->TextWidth(text.c_str(), text.size(), 0, 12, 0, 0); @@ -1763,7 +1763,7 @@ int UIRune_Decom::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 // OFFSET: 0x00817EA0 // FUNCTION: fn_10173 void UIRune_Decom::Slot15(int, int) { - this->m_decomButton = new UIBitmapButton(*this->m_context); + this->m_decomButton = new UIBitmapButton(); this->AddChild(this->m_decomButton); this->m_decomButton->SetBitmap("유저인터페이스\\runesystem\\bt_decom_nomal.bmp", 0, 0); this->m_decomButton->SetBitmap("유저인터페이스\\runesystem\\bt_decom_mouseon.bmp", 1, 0); @@ -1775,7 +1775,7 @@ void UIRune_Decom::Slot15(int, int) { int index = 0; for (int x = 0xDD; x < 0x1AF; x += 0x69) { - this->m_radioButtons[index] = new UIRuneSystem_Decom_RadioBtn(*this->m_context); + this->m_radioButtons[index] = new UIRuneSystem_Decom_RadioBtn(); this->m_radioButtons[index]->SetSize(0x68, 0x0E); this->m_radioButtons[index]->Move(x, 0x153); const std::string text = FormatOwnedString(LookupMessage(4074), g_runeSystemMgr->GetDecomItem(index)); @@ -1795,24 +1795,24 @@ void UIRune_Decom::Slot15(int, int) { // OFFSET: 0x008177C0 // FUNCTION: fn_10172 void UIRuneSystemWnd::Slot15(int, int) { - this->m_tab = new UIRuneSystemTab(*this->m_context); + this->m_tab = new UIRuneSystemTab(); this->AddChild(this->m_tab); this->m_tab->SetSize(0x109, 0x1A); this->m_tab->Move(9, 0x12); this->m_tab->Show(1); const int top = this->m_tab->geometry.height + this->m_tab->geometry.y; - this->m_equipRuneSet = new UIEquipRuneSetWnd(*this->m_context); + this->m_equipRuneSet = new UIEquipRuneSetWnd(); this->AddChild(this->m_equipRuneSet); this->m_equipRuneSet->SetSize(0x11B, 0x52); this->m_equipRuneSet->Move(0, top); - this->m_tagList = new UIRuneSystem_tagListWnd(*this->m_context); + this->m_tagList = new UIRuneSystem_tagListWnd(); this->AddChild(this->m_tagList); this->m_tagList->SetSize(0x11B, 0x20); this->m_tagList->m_firstTag = 0; - this->m_lists[0] = new UIRuneSetList(*this->m_context); + this->m_lists[0] = new UIRuneSetList(); this->AddChild(this->m_lists[0]); UIRuneSetList* list = this->m_lists[0]; list->vertical = 1; @@ -1823,7 +1823,7 @@ void UIRuneSystemWnd::Slot15(int, int) { int count = g_runeSystemMgr->GetTag(-1)->GetRuneCount(0); this->m_lists[0]->SetRange(std::max(count - 5, 0), 5, count); - this->m_lists[1] = new UIRuneList(*this->m_context); + this->m_lists[1] = new UIRuneList(); this->AddChild(this->m_lists[1]); list = this->m_lists[1]; list->vertical = 1; @@ -1834,7 +1834,7 @@ void UIRuneSystemWnd::Slot15(int, int) { count = g_runeSystemMgr->GetTag(-1)->GetRuneCount(1); this->m_lists[1]->SetRange(std::max(count - 9, 0), 9, count); - this->m_lists[2] = new UIDecomlist(*this->m_context); + this->m_lists[2] = new UIDecomlist(); this->AddChild(this->m_lists[2]); list = this->m_lists[2]; list->vertical = 1; @@ -1843,17 +1843,17 @@ void UIRuneSystemWnd::Slot15(int, int) { list->Slot22(0x11B, 0x1CB); this->m_lists[2]->Move(0, top); - this->m_runeSetInfo = new UIRuneSet_Info(*this->m_context); + this->m_runeSetInfo = new UIRuneSet_Info(); this->AddChild(this->m_runeSetInfo); this->m_runeSetInfo->SetSize(0x273, 0x20A); this->m_runeSetInfo->Move(0x11B, 0x11); - this->m_runeInfo = new UIRune_Info(*this->m_context); + this->m_runeInfo = new UIRune_Info(); this->AddChild(this->m_runeInfo); this->m_runeInfo->SetSize(0x273, 0x20A); this->m_runeInfo->Move(0x11B, 0x11); - this->m_runeDecom = new UIRune_Decom(*this->m_context); + this->m_runeDecom = new UIRune_Decom(); this->AddChild(this->m_runeDecom); this->m_runeDecom->SetSize(0x273, 0x20A); this->m_runeDecom->Move(0x11B, 0x11); @@ -1866,12 +1866,12 @@ void UIRuneSystemWnd::Slot15(int, int) { // OFFSET: 0x00816CB0 // FUNCTION: fn_10171 void UIRuneSet_Info::Slot15(int, int) { - this->m_activeWnd = new UIRuneSystem_ActiveWnd(*this->m_context); + this->m_activeWnd = new UIRuneSystem_ActiveWnd(); this->AddChild(this->m_activeWnd); this->m_activeWnd->SetSize(0xE6, 0x8C); this->m_activeWnd->Move(0x46, 0x156); - this->unknown_0084 = new UIBitmapButton(*this->m_context); + this->unknown_0084 = new UIBitmapButton(); this->AddChild(this->unknown_0084); this->unknown_0084->SetBitmap("유저인터페이스\\runesystem\\bt_active_nomal.bmp", 0, 0); this->unknown_0084->SetBitmap("유저인터페이스\\runesystem\\bt_active_mouseon.bmp", 1, 0); @@ -1881,7 +1881,7 @@ void UIRuneSet_Info::Slot15(int, int) { this->unknown_0084->Move(0x6F, 0x1EC); this->unknown_0084->SetId(0x23C); - this->unknown_0088 = new UIBitmapButton(*this->m_context); + this->unknown_0088 = new UIBitmapButton(); this->AddChild(this->unknown_0088); this->unknown_0088->SetBitmap("유저인터페이스\\runesystem\\bt_equip_nomal.bmp", 0, 0); this->unknown_0088->SetBitmap("유저인터페이스\\runesystem\\bt_equip_mouseon.bmp", 1, 0); @@ -1891,7 +1891,7 @@ void UIRuneSet_Info::Slot15(int, int) { this->unknown_0088->Move(0x6F, 0x1EC); this->unknown_0088->SetId(0xC3); - this->unknown_008C = new UIBitmapButton(*this->m_context); + this->unknown_008C = new UIBitmapButton(); this->AddChild(this->unknown_008C); this->unknown_008C->SetBitmap("유저인터페이스\\runesystem\\bt_equiptakeoff_nomal.bmp", 0, 0); this->unknown_008C->SetBitmap("유저인터페이스\\runesystem\\bt_equiptakeoff_mouseon.bmp", 1, 0); @@ -1901,19 +1901,19 @@ void UIRuneSet_Info::Slot15(int, int) { this->unknown_008C->Move(0x6F, 0x1EC); this->unknown_008C->SetId(0x158); - this->m_tab = new UIRuneSystemTab(*this->m_context); + this->m_tab = new UIRuneSystemTab(); this->AddChild(this->m_tab); this->m_tab->SetSize(0xC4, 0x1A); this->m_tab->SendMsg(this->m_tab, 0x16, 3, 0, 0, 0); this->m_tab->Move(0x180, 1); this->m_tab->m_label = "유저인터페이스\\runesystem\\runeset_tab_%d.bmp"; - this->m_gauge = new UIGage_Circle(*this->m_context); + this->m_gauge = new UIGage_Circle(); this->AddChild(this->m_gauge); this->m_gauge->SetSize(0x89, 0x7F); this->m_gauge->Move(0x1B1, 0x51); - this->m_gradeText = new UIStaticText(*this->m_context); + this->m_gradeText = new UIStaticText(); this->AddChild(this->m_gradeText); this->m_gradeText->SetSize(0x89, 0x7F); const std::string gradeTitle = LookupMessage(4044); @@ -1922,12 +1922,12 @@ void UIRuneSet_Info::Slot15(int, int) { const int titleWidth = this->TextWidth(gradeTitle.c_str(), 0, 0, 12, 0, 0); this->m_gradeText->Move(static_cast(500.0f - static_cast(titleWidth) * 0.5f), 0x82); - this->m_gradeItems = new UIRuneSystem_ActiveWnd(*this->m_context); + this->m_gradeItems = new UIRuneSystem_ActiveWnd(); this->AddChild(this->m_gradeItems); this->m_gradeItems->SetSize(0xE6, 0x8C); this->m_gradeItems->Move(0x17D, 0x130); - this->m_gradeButton = new UIBitmapButton(*this->m_context); + this->m_gradeButton = new UIBitmapButton(); this->AddChild(this->m_gradeButton); this->m_gradeButton->SetBitmap("유저인터페이스\\runesystem\\bt_upgrade_nomal.bmp", 0, 0); this->m_gradeButton->SetBitmap("유저인터페이스\\runesystem\\bt_upgrade_mouseon.bmp", 1, 0); @@ -1937,7 +1937,7 @@ void UIRuneSet_Info::Slot15(int, int) { this->m_gradeButton->Move(0x1BD, this->geometry.height - 0x41); this->m_gradeButton->SetId(0x1FD); - this->m_infoList = new UIRuneSetinfoList(*this->m_context); + this->m_infoList = new UIRuneSetinfoList(); this->AddChild(this->m_infoList); UIRuneSetinfoList* infoList = this->m_infoList; infoList->vertical = 1; @@ -1951,7 +1951,7 @@ void UIRuneSet_Info::Slot15(int, int) { const int rewardY[6] = {97, 122, 197, 290, 365, 391}; const int rewardIds[6] = {0x24E, 0x24F, 0x250, 0x251, 0x252, 0x253}; for (int index = 0; index < 6; ++index) { - this->m_rewards[index] = new UIRuneSetReWard(*this->m_context); + this->m_rewards[index] = new UIRuneSetReWard(); this->AddChild(this->m_rewards[index]); this->m_rewards[index]->SetBitmap("유저인터페이스\\runesystem\\bt_reward_nomal.tga", 0, 0); this->m_rewards[index]->SetBitmap("유저인터페이스\\runesystem\\bt_reward_mouseon.tga", 1, 0); @@ -1966,7 +1966,7 @@ void UIRuneSet_Info::Slot15(int, int) { this->m_rewards[index]->SendMsg(this, 0x66, 0, 0, 0, 0); } - this->m_rewards[6] = new UIRuneSetReWard(*this->m_context); + this->m_rewards[6] = new UIRuneSetReWard(); this->AddChild(this->m_rewards[6]); this->m_rewards[6]->SetBitmap("유저인터페이스\\runesystem\\bt_reward_l_nomal.tga", 0, 0); this->m_rewards[6]->SetBitmap("유저인터페이스\\runesystem\\bt_reward_l_mouseon.tga", 1, 0); @@ -2397,18 +2397,18 @@ int UIRuneSystemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argume // OFFSET: 0x00814440 // FUNCTION: fn_10128 -UIDecomlist::UIDecomlist(UIWindowContext& windows) : UIRuneSetList(windows) { +UIDecomlist::UIDecomlist() : UIRuneSetList() { this->m_itemHeight = 0x2D; } // OFFSET: 0x008144E0 // FUNCTION: fn_10129 -UIEquipRuneSetWnd::UIEquipRuneSetWnd(UIWindowContext& windows) : UIWindow(windows, 0) { +UIEquipRuneSetWnd::UIEquipRuneSetWnd() : UIWindow(0) { } // OFFSET: 0x00814540 // FUNCTION: fn_10130 -UIGage_Circle::UIGage_Circle(UIWindowContext& windows) : UIWindow(windows, 0), m_textY(0x45), m_value(0), m_max(false) { +UIGage_Circle::UIGage_Circle() : UIWindow(0), m_textY(0x45), m_value(0), m_max(false) { this->m_emptyBitmap = "유저인터페이스\\runesystem\\gage_empty.bmp"; this->m_fullBitmap = "유저인터페이스\\runesystem\\gage_full.bmp"; this->m_maxBitmap = "유저인터페이스\\runesystem\\gage_max.bmp"; @@ -2416,28 +2416,28 @@ UIGage_Circle::UIGage_Circle(UIWindowContext& windows) : UIWindow(windows, 0), m // OFFSET: 0x008148A0 // FUNCTION: fn_10131 -UIRuneList::UIRuneList(UIWindowContext& windows) : UIRuneSetList(windows) { +UIRuneList::UIRuneList() : UIRuneSetList() { this->m_itemHeight = 0x2F; } // OFFSET: 0x00814940 // FUNCTION: fn_10132 -UIRuneSetList::UIRuneSetList(UIWindowContext& windows) : UIScrollBar(windows), m_itemHeight(0x44), unknown_00B8(0x28), m_selected(-1) { +UIRuneSetList::UIRuneSetList() : UIScrollBar(), m_itemHeight(0x44), unknown_00B8(0x28), m_selected(-1) { this->arrowLength = 6; } // OFFSET: 0x008149C0 // FUNCTION: fn_10133 -UIRuneSetReWard::UIRuneSetReWard(UIWindowContext& windows) : UIBitmapButton(windows), m_itemId(0), m_state(0) { +UIRuneSetReWard::UIRuneSetReWard() : UIBitmapButton(), m_itemId(0), m_state(0) { } // OFFSET: 0x00814A50 // FUNCTION: fn_10134 -UIRuneSet_Info::UIRuneSet_Info(UIWindowContext& windows) : UIWindow(windows, 0), m_runeSet(nullptr), m_rewards{} { +UIRuneSet_Info::UIRuneSet_Info() : UIWindow(0), m_runeSet(nullptr), m_rewards{} { } // OFFSET: 0x00814B00 // FUNCTION: fn_10135 -UIRuneSetinfoList::UIRuneSetinfoList(UIWindowContext& windows) : UIRuneSetList(windows) { +UIRuneSetinfoList::UIRuneSetinfoList() : UIRuneSetList() { this->m_itemHeight = 0x0F; } diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.h b/Source/UI/RuneSystem/UIRuneSystemWnd.h index ef494999..0b099cab 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.h +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.h @@ -37,7 +37,7 @@ class RuneSetData; class UIRuneSetReWard : public UIBitmapButton { public: - UIRuneSetReWard(UIWindowContext& windows); + UIRuneSetReWard(); void Paint() override; void Slot28(int x, int y) override; @@ -52,7 +52,7 @@ public: class UIRuneSystemTab : public UIWindow { public: - explicit UIRuneSystemTab(UIWindowContext& windows); + UIRuneSystemTab(); void Paint() override; void Slot25(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -63,7 +63,7 @@ public: class UIEquipRuneSetWnd : public UIWindow { public: - explicit UIEquipRuneSetWnd(UIWindowContext& windows); + UIEquipRuneSetWnd(); void Paint() override; void Slot25(int x, int y) override; @@ -73,7 +73,7 @@ public: class UIRuneSystem_tagListWnd : public UIWindow { public: - UIRuneSystem_tagListWnd(UIWindowContext& windows); + UIRuneSystem_tagListWnd(); void Paint() override; void Slot25(int x, int y) override; void Slot28(int x, int y) override; @@ -87,7 +87,7 @@ public: class UIRuneSetList : public UIScrollBar { public: - explicit UIRuneSetList(UIWindowContext& windows); + UIRuneSetList(); void Paint() override; void Slot25(int x, int y) override; @@ -106,7 +106,7 @@ public: class UIRuneList : public UIRuneSetList { public: - explicit UIRuneList(UIWindowContext& windows); + UIRuneList(); void Paint() override; void Slot28(int x, int y) override; @@ -114,7 +114,7 @@ public: class UIDecomlist : public UIRuneSetList { public: - explicit UIDecomlist(UIWindowContext& windows); + UIDecomlist(); void Paint() override; void Slot28(int x, int y) override; @@ -137,7 +137,7 @@ struct RuneSetInfoLine { class UIRuneSetinfoList : public UIRuneSetList { public: - explicit UIRuneSetinfoList(UIWindowContext& windows); + UIRuneSetinfoList(); void Paint() override; __declspec(noinline) void AddLine(std::string text, std::uint32_t color, bool bold); @@ -148,7 +148,7 @@ public: class UIGage_Circle : public UIWindow { public: - __declspec(noinline) explicit UIGage_Circle(UIWindowContext& windows); + __declspec(noinline) UIGage_Circle(); void Paint() override; @@ -162,7 +162,7 @@ public: class UIRuneSystem_ActiveWnd : public UIWindow { public: - explicit UIRuneSystem_ActiveWnd(UIWindowContext& windows); + UIRuneSystem_ActiveWnd(); void Paint() override; void Slot28(int x, int y) override; @@ -182,7 +182,7 @@ public: class UIRuneSystem_Decom_RadioBtn : public UIRadioBtn { public: - UIRuneSystem_Decom_RadioBtn(UIWindowContext& windows); + UIRuneSystem_Decom_RadioBtn(); void Paint() override; @@ -204,7 +204,7 @@ public: class UIRuneSet_Info : public UIWindow { public: - explicit UIRuneSet_Info(UIWindowContext& windows); + UIRuneSet_Info(); void Slot15(int width, int height) override; void Slot19() override; @@ -233,7 +233,7 @@ public: class UIRune_Info : public UIWindow { public: - explicit UIRune_Info(UIWindowContext& windows); + UIRune_Info(); void Slot15(int width, int height) override; void Paint() override; @@ -246,7 +246,7 @@ public: class UIRune_Decom : public UIWindow { public: - explicit UIRune_Decom(UIWindowContext& windows); + UIRune_Decom(); void Slot15(int width, int height) override; void Paint() override; @@ -304,7 +304,7 @@ struct RuneDecomResultPacket { class UIRuneSystem_DecomResultWnd : public UIFrameWnd { public: - UIRuneSystem_DecomResultWnd(UIWindowContext& windows); + UIRuneSystem_DecomResultWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -315,7 +315,7 @@ public: class UIRuneSystemWnd : public UIFrameWnd { public: - UIRuneSystemWnd(UIWindowContext& windows); + UIRuneSystemWnd(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index d63acdd6..ba8d9855 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -38,8 +38,8 @@ void CUIListBoxEx -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), unknown_00C5{}, items(), data(), selected(static_cast(-1)), unknown_00E0(1), rebind(0), unknown_00E2{}, onSelect(), binder() { } @@ -47,8 +47,8 @@ CUIListBoxEx::CUIListBoxEx(UIWindo // OFFSET: 0x00A686A0 // FUNCTION: fn_16647 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), unknown_00C5{}, items(), data(), selected(static_cast(-1)), unknown_00E0(1), rebind(0), unknown_00E2{}, onSelect(), binder() { } @@ -110,7 +110,7 @@ void CUIListBoxEx void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -120,7 +120,7 @@ void CUIListBoxEx::Slot15(int widt // FUNCTION: fn_16663 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -646,7 +646,7 @@ private: // OFFSET: 0x00A69790 // FUNCTION: fn_16664 void SelectPackageItemBox::CUIItemInfo::Slot15(int width, int height) { - this->image = new CUIStaticImage(*this->m_context); + this->image = new CUIStaticImage(); this->image->SetSize(200, 34); this->image->Move(0, 0); const std::uint8_t imageSource[] = {0xC9, 0x88, 0xEF, 0x41, 0x7D, 0x93, 0xB8, 0x14, 0xCF, 0xC3, 0xEF, 0x77, 0x00, 0xE7, 0x21, @@ -658,7 +658,7 @@ void SelectPackageItemBox::CUIItemInfo::Slot15(int width, int height) { this->image->SetImage(background); this->AddChild(this->image); - this->gameItem = new CUIGameItem(*this->m_context); + this->gameItem = new CUIGameItem(); this->gameItem->SetMode(0); this->gameItem->SetScale(100); this->gameItem->Move(6, 5); @@ -666,7 +666,7 @@ void SelectPackageItemBox::CUIItemInfo::Slot15(int width, int height) { this->gameItem->unknown_0085 = 1; this->AddChild(this->gameItem); - this->nameText = new CUIStaticText(*this->m_context); + this->nameText = new CUIStaticText(); this->nameText->SetSize(148, 24); this->nameText->Move(45, 5); this->nameText->SetText("", 0); @@ -687,7 +687,7 @@ void SelectPackageItemBox::CUIItemInfo::Slot15(int width, int height) { // OFFSET: 0x00A6CDE0 // FUNCTION: fn_16665 void SelectPackageItemBox::CUITabInfo::Slot15(int width, int height) { - this->nameText = new CUIStaticText(*this->m_context); + this->nameText = new CUIStaticText(); this->nameText->SetSize(148, 34); this->nameText->Move(11, 0); this->nameText->SetText("", 0); diff --git a/Source/UI/Shop/UIMerchantItemMyShopWnd.h b/Source/UI/Shop/UIMerchantItemMyShopWnd.h index 61487c8b..8ab37fe2 100644 --- a/Source/UI/Shop/UIMerchantItemMyShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemMyShopWnd.h @@ -15,7 +15,7 @@ extern bool g_vendingSaleAlarm; class UIMerchantItemMyShopWnd : public UIItemBaseWnd { public: - UIMerchantItemMyShopWnd(UIWindowContext& windows, int value); + UIMerchantItemMyShopWnd(int value); void Slot11() override; void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h b/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h index 721cac54..67537328 100644 --- a/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h +++ b/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h @@ -8,7 +8,7 @@ class UIStaticText; class UIMerchantItemPurchaseMSGWnd : public UIFrameWnd { public: - UIMerchantItemPurchaseMSGWnd(UIWindowContext& windowContext); + UIMerchantItemPurchaseMSGWnd(); void Slot15(int width, int height) override; void Paint() override; void SetPurchase(int value, int amount); diff --git a/Source/UI/Shop/UIMerchantItemPurchaseWnd.h b/Source/UI/Shop/UIMerchantItemPurchaseWnd.h index 57e00722..7d1f155a 100644 --- a/Source/UI/Shop/UIMerchantItemPurchaseWnd.h +++ b/Source/UI/Shop/UIMerchantItemPurchaseWnd.h @@ -11,7 +11,7 @@ class UIStaticText; class UIMerchantItemPurchaseWnd : public UIItemBaseWnd { public: - UIMerchantItemPurchaseWnd(UIWindowContext& windows, int value); + UIMerchantItemPurchaseWnd(int value); void Slot11() override; void Slot15(int width, int height) override; void Slot10(int x, int y, std::intptr_t value) override; diff --git a/Source/UI/Shop/UIMerchantItemShopWnd.h b/Source/UI/Shop/UIMerchantItemShopWnd.h index c6e89449..f68ac781 100644 --- a/Source/UI/Shop/UIMerchantItemShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemShopWnd.h @@ -12,7 +12,7 @@ class UIStaticText; class UIMerchantItemShopWnd : public UIItemBaseWnd { public: - UIMerchantItemShopWnd(UIWindowContext& windows, int value); + UIMerchantItemShopWnd(int value); std::vector BuildReplayRecords(); void Slot11() override; void Slot19() override; diff --git a/Source/UI/Shop/UIMerchantItemWnd.h b/Source/UI/Shop/UIMerchantItemWnd.h index 80aee402..395286a3 100644 --- a/Source/UI/Shop/UIMerchantItemWnd.h +++ b/Source/UI/Shop/UIMerchantItemWnd.h @@ -11,7 +11,7 @@ class UIStaticText; class UIMerchantItemWnd : public UIItemBaseWnd { public: - UIMerchantItemWnd(UIWindowContext& windows); + UIMerchantItemWnd(); void Slot10(int x, int y, std::intptr_t value) override; void Slot11() override; void Paint() override; diff --git a/Source/UI/Shop/UIMerchantMirrorItemWnd.h b/Source/UI/Shop/UIMerchantMirrorItemWnd.h index 471acc53..175e2138 100644 --- a/Source/UI/Shop/UIMerchantMirrorItemWnd.h +++ b/Source/UI/Shop/UIMerchantMirrorItemWnd.h @@ -9,7 +9,7 @@ class UIMerchantMirrorItemWnd : public UIItemBaseWnd { public: - UIMerchantMirrorItemWnd(UIWindowContext& windows, int value); + UIMerchantMirrorItemWnd(int value); void Slot28(int x, int y) override; void Slot32(int x, int y) override; void Slot11() override; diff --git a/Source/UI/Shop/UIMerchantShopTitle.cpp b/Source/UI/Shop/UIMerchantShopTitle.cpp index bb3a4ae6..f73be350 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.cpp +++ b/Source/UI/Shop/UIMerchantShopTitle.cpp @@ -15,7 +15,7 @@ // OFFSET: 0x0085ACE0 // FUNCTION: fn_10788 void UIMerchantShopTitle::Slot15(int, int) { - this->label = new UIStaticText(*this->m_context); + this->label = new UIStaticText(); this->label->SetSize(this->geometry.width - 34, 15); this->label->Move(31, 8); this->label->SetTextFitted(""); @@ -90,8 +90,8 @@ void UIMerchantShopTitle::Slot32(int, int) { // OFFSET: 0x0084FE60 // FUNCTION: fn_10667 -UIMerchantShopTitle::UIMerchantShopTitle(UIWindowContext& windows, ForbiddenWords& forbiddenWords, int buyingShop) - : UIWindow(windows, 0), buyingShop(buyingShop), m_forbiddenWords(&forbiddenWords) { +UIMerchantShopTitle::UIMerchantShopTitle(ForbiddenWords& forbiddenWords, int buyingShop) + : UIWindow(0), buyingShop(buyingShop), m_forbiddenWords(&forbiddenWords) { this->geometry.id = 189; } diff --git a/Source/UI/Shop/UIMerchantShopTitle.h b/Source/UI/Shop/UIMerchantShopTitle.h index 636fc05d..02b9f997 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.h +++ b/Source/UI/Shop/UIMerchantShopTitle.h @@ -10,7 +10,7 @@ struct ForbiddenWords; class UIMerchantShopTitle : public UIWindow { public: - UIMerchantShopTitle(UIWindowContext& windows, ForbiddenWords& forbiddenWords, int buyingShop); + UIMerchantShopTitle(ForbiddenWords& forbiddenWords, int buyingShop); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h b/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h index a2d571e0..2ce7b959 100644 --- a/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h +++ b/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h @@ -8,7 +8,7 @@ class UINoticeMessageBox_LockSellItem : public UIFrameWnd { public: - UINoticeMessageBox_LockSellItem(UIWindowContext& windows); + UINoticeMessageBox_LockSellItem(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Shop/UInCash_CallWnd.h b/Source/UI/Shop/UInCash_CallWnd.h index 8757d0df..c5d88e07 100644 --- a/Source/UI/Shop/UInCash_CallWnd.h +++ b/Source/UI/Shop/UInCash_CallWnd.h @@ -12,7 +12,7 @@ class UIScrollBar; class UInCashWnd : public UIItemBaseWnd { public: - UInCashWnd(UIWindowContext& windows); + UInCashWnd(); bool Slot03() override; void Slot10(int x, int y, std::intptr_t value) override; void Slot11() override; @@ -46,7 +46,7 @@ public: class UInCash_CallWnd : public UIFrameWnd { public: - UInCash_CallWnd(UIWindowContext& windows); + UInCash_CallWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp index 9510c7a6..81baa0ef 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp @@ -179,8 +179,8 @@ void UIQuickSlotWnd::Slot32(int x, int y) { // OFFSET: 0x009118C0 // FUNCTION: fn_12520 -UIQuickSlotWnd::UIQuickSlotWnd(UIWindowContext& windows, QuickSlotPainting& painting) - : UIFrameWnd(windows, 0), m_selected(-1), m_painting(&painting) { +UIQuickSlotWnd::UIQuickSlotWnd(QuickSlotPainting& painting) + : UIFrameWnd(0), m_selected(-1), m_painting(&painting) { for (int i = 0; i < 2; ++i) { this->m_entries[i].skill = 0; this->m_entries[i].id = 0; diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.h b/Source/UI/Shortcuts/UIQuickSlotWnd.h index b8428145..e560af0a 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.h +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.h @@ -39,7 +39,7 @@ struct QuickSlotWndInfo; class UIQuickSlotWnd : public UIFrameWnd { public: - UIQuickSlotWnd(UIWindowContext& windows, QuickSlotPainting& painting); + UIQuickSlotWnd(QuickSlotPainting& painting); void Slot10(int x, int y, std::intptr_t argument) override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Skill/UISkillDescribeWnd.h b/Source/UI/Skill/UISkillDescribeWnd.h index 6f2a9890..bf47af86 100644 --- a/Source/UI/Skill/UISkillDescribeWnd.h +++ b/Source/UI/Skill/UISkillDescribeWnd.h @@ -10,7 +10,7 @@ class UITextViewer; class UISkillDescribeWnd : public UIFrameWnd { public: - UISkillDescribeWnd(UIWindowContext& windows); + UISkillDescribeWnd(); /* 00B4 */ UIBitmapButton* m_closeButton; /* 00B8 */ UITextViewer* m_viewer; diff --git a/Source/UI/Skill/UISkillListWnd.h b/Source/UI/Skill/UISkillListWnd.h index 5df88ef1..fc6fdd15 100644 --- a/Source/UI/Skill/UISkillListWnd.h +++ b/Source/UI/Skill/UISkillListWnd.h @@ -12,7 +12,7 @@ class UISkillListWnd : public UIFrameWnd { public: - UISkillListWnd(UIWindowContext& windows); + UISkillListWnd(); bool Slot03() override; void Slot11() override; void Paint() override; diff --git a/Source/UI/Skill/UISkillNameChangeWnd.h b/Source/UI/Skill/UISkillNameChangeWnd.h index 4b376238..6e8ce312 100644 --- a/Source/UI/Skill/UISkillNameChangeWnd.h +++ b/Source/UI/Skill/UISkillNameChangeWnd.h @@ -9,7 +9,7 @@ class UIEditCtrl; class UISkillNameChangeWnd : public UIFrameWnd { public: - UISkillNameChangeWnd(UIWindowContext& windows); + UISkillNameChangeWnd(); /* 00B4 */ UIEditCtrl* m_edit; /* 00B8 */ int m_skillId; /* 00BC */ std::string m_name; diff --git a/Source/UI/SkillDelayInfo/SkillDelayInfo.h b/Source/UI/SkillDelayInfo/SkillDelayInfo.h index bac36bce..bf5464cb 100644 --- a/Source/UI/SkillDelayInfo/SkillDelayInfo.h +++ b/Source/UI/SkillDelayInfo/SkillDelayInfo.h @@ -37,7 +37,7 @@ public: class CUITime : public CUIControl { public: - explicit CUITime(UIWindowContext& context); + CUITime(); ~CUITime() override; void Slot15(int width, int height) override; void Slot16() override; diff --git a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp index 9cce1130..9a3a06f1 100644 --- a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp +++ b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp @@ -82,8 +82,8 @@ struct SkillDelayInfoSelectCallback { // OFFSET: 0x00A71140 // FUNCTION: fn_16799 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -127,7 +127,7 @@ void CUISkillDelayInfo::Slot53() { // FUNCTION: fn_16808 template <> void CUIListBoxEx::Slot15(int width, int height) { - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); @@ -138,7 +138,7 @@ namespace SkillDelayInfo { // OFFSET: 0x00A71D60 // FUNCTION: fn_16809 void CUIDelayItem::Slot15(int width, int height) { - this->level = new CUIStaticText(*this->m_context); + this->level = new CUIStaticText(); this->level->SetSize(44, 21); this->level->Move(0, 0); this->level->SetText("", 0); @@ -156,7 +156,7 @@ void CUIDelayItem::Slot15(int width, int height) { this->AddChild(this->level); for (int index = 4; index != 0; --index) { - CUITime* time = new CUITime(*this->m_context); + CUITime* time = new CUITime(); time->SetSize(70, 21); this->AddChild(time); this->times.push_back(time); @@ -171,7 +171,7 @@ void CUIDelayItem::Slot15(int width, int height) { // OFFSET: 0x00A75A00 // FUNCTION: fn_16811 void CUITime::Slot15(int width, int height) { - this->text = new CUIStaticText(*this->m_context); + this->text = new CUIStaticText(); this->text->SetSize(60, 21); this->text->Move(5, 0); this->text->SetText("", 0); @@ -417,7 +417,7 @@ CUIDelayItem::CUIDelayItem() : CUIListItem(), level(nullptr), times(), backgroun namespace SkillDelayInfo { // OFFSET: 0x00A77350 // FUNCTION: fn_16873 -CUITime::CUITime(UIWindowContext& context) : CUIControl(context), text(nullptr) { +CUITime::CUITime() : CUIControl(), text(nullptr) { } } @@ -612,7 +612,7 @@ void CUISkillDelayInfo::Slot16() { // OFFSET: 0x00A720A0 // FUNCTION: fn_16810 void CUISkillDelayInfo::Slot15(int width, int height) { - this->titleBar = new CUITitleBar(*this->m_context); + this->titleBar = new CUITitleBar(); this->titleBar->SetSize(345, 17); this->titleBar->Move(0, 0); { @@ -638,7 +638,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { } this->AddChild(this->titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); { @@ -665,7 +665,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->titleBar->titleText = title; this->titleBar->AddChild(title); - CUIImageButton* menuButton = new CUIImageButton(*this->m_context); + CUIImageButton* menuButton = new CUIImageButton(); menuButton->SetSize(11, 11); menuButton->Move(3, 3); menuButton->SetOnClick([this]() { this->OnButtonClick(); }); @@ -696,7 +696,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { } this->titleBar->AddChild(menuButton); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(331, 3); closeButton->SetOnClick([this]() { g_windowMgr.CloseWindow(10030); }); @@ -729,7 +729,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { } this->titleBar->SetSecondButton(closeButton); - this->unknown_00DC = new CUIStaticText(*this->m_context); + this->unknown_00DC = new CUIStaticText(); this->unknown_00DC->SetSize(325, 25); this->unknown_00DC->Move(10, 27); this->unknown_00DC->SetText("", 0); @@ -749,7 +749,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->unknown_00DC->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00DC); - this->labels[0] = new CUIStaticText(*this->m_context); + this->labels[0] = new CUIStaticText(); this->labels[0]->SetSize(140, 22); this->labels[0]->Move(54, 58); { @@ -775,7 +775,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->labels[0]->SetOutline(0, 0xFFFFFF); this->AddChild(this->labels[0]); - this->labels[1] = new CUIStaticText(*this->m_context); + this->labels[1] = new CUIStaticText(); this->labels[1]->SetSize(140, 22); this->labels[1]->Move(194, 58); { @@ -801,7 +801,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->labels[1]->SetOutline(0, 0xFFFFFF); this->AddChild(this->labels[1]); - this->labels[2] = new CUIStaticText(*this->m_context); + this->labels[2] = new CUIStaticText(); this->labels[2]->SetSize(44, 22); this->labels[2]->Move(10, 82); { @@ -827,7 +827,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->labels[2]->SetOutline(0, 0xFFFFFF); this->AddChild(this->labels[2]); - this->columns[0] = new CUIStaticText(*this->m_context); + this->columns[0] = new CUIStaticText(); this->columns[0]->SetSize(70, 22); this->columns[0]->Move(54, 82); { @@ -853,7 +853,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->columns[0]->SetOutline(0, 0xFFFFFF); this->AddChild(this->columns[0]); - this->columns[1] = new CUIStaticText(*this->m_context); + this->columns[1] = new CUIStaticText(); this->columns[1]->SetSize(70, 22); this->columns[1]->Move(124, 82); { @@ -879,7 +879,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->columns[1]->SetOutline(0, 0xFFFFFF); this->AddChild(this->columns[1]); - this->columns[2] = new CUIStaticText(*this->m_context); + this->columns[2] = new CUIStaticText(); this->columns[2]->SetSize(70, 22); this->columns[2]->Move(194, 82); { @@ -905,7 +905,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->columns[2]->SetOutline(0, 0xFFFFFF); this->AddChild(this->columns[2]); - this->columns[3] = new CUIStaticText(*this->m_context); + this->columns[3] = new CUIStaticText(); this->columns[3]->SetSize(70, 22); this->columns[3]->Move(264, 82); { @@ -931,7 +931,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->columns[3]->SetOutline(0, 0xFFFFFF); this->AddChild(this->columns[3]); - this->delayList = new CUIListBoxEx(*this->m_context); + this->delayList = new CUIListBoxEx(); this->delayList->itemWidth = 325; this->delayList->rowHeight = 22; this->delayList->SetSize(325, 220); @@ -993,7 +993,7 @@ void CUISkillDelayInfo::Slot15(int width, int height) { this->delayList->AddNewItem(); this->AddChild(this->delayList); - this->description = new CUITextViewer(*this->m_context); + this->description = new CUITextViewer(); this->description->SetSize(330, 35); this->description->Move(11, 334); this->description->SetTextOffset(0, 0); diff --git a/Source/UI/Status/UIStatusWnd.h b/Source/UI/Status/UIStatusWnd.h index 0efb0cc2..a8fd7089 100644 --- a/Source/UI/Status/UIStatusWnd.h +++ b/Source/UI/Status/UIStatusWnd.h @@ -10,7 +10,7 @@ class UIBmpTextButton; class UIStatusWnd : public UIFrameWnd { public: - UIStatusWnd(UIWindowContext& windows); + UIStatusWnd(); /* 00B4 */ UIBitmapButton* m_statButtons[6]; /* 00CC */ int m_expandedHeight; /* 00D0 */ StatusWndInfo* m_info; diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index 1cbc96f8..5161eb47 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -499,22 +499,22 @@ void UIDisplayCharacter::LoadSessionStyle() { // OFFSET: 0x00822C60 // FUNCTION: fn_10286 -UI2ndCostumeWnd::UI2ndCostumeWnd(UIWindowContext& context) : UIStylingshopTabParentWnd(context), m_hideCheckBox(nullptr), m_showCheckBox(nullptr) { +UI2ndCostumeWnd::UI2ndCostumeWnd() : UIStylingshopTabParentWnd(), m_hideCheckBox(nullptr), m_showCheckBox(nullptr) { } // OFFSET: 0x00822E00 // FUNCTION: fn_10287 -UIBasicStylingWnd::UIBasicStylingWnd(UIWindowContext& context) : UIStylingshopTabParentWnd(context) { +UIBasicStylingWnd::UIBasicStylingWnd() : UIStylingshopTabParentWnd() { } // OFFSET: 0x00822EA0 // FUNCTION: fn_10288 -UICostumeChangeWnd::UICostumeChangeWnd(UIWindowContext& context) : UIStylingshopTabParentWnd(context) { +UICostumeChangeWnd::UICostumeChangeWnd() : UIStylingshopTabParentWnd() { } // OFFSET: 0x00822F20 // FUNCTION: fn_10289 -UIDisplayCharacter::UIDisplayCharacter(UIWindowContext& context) : UIWindow(context, 0) { +UIDisplayCharacter::UIDisplayCharacter() : UIWindow(0) { this->unknown_0080 = 0; this->unknown_0084 = 0; this->unknown_0088 = 0; @@ -657,7 +657,7 @@ bool UIStylingShopWnd::AddToMyStyle() { } } - UISlotOfMyStyleWnd* slot = new UISlotOfMyStyleWnd(*this->m_context); + UISlotOfMyStyleWnd* slot = new UISlotOfMyStyleWnd(); slot->SetSize(static_cast(myStyle->geometry.width * 0.5 - 3.0), myStyle->geometry.height + 25); slot->Move(static_cast(myStyle->geometry.width * 0.5 * index), 0); display->unknown_0080 = index; @@ -1307,25 +1307,25 @@ UIShowInfoWnd::~UIShowInfoWnd() { // OFFSET: 0x00823180 // FUNCTION: fn_10290 -UIMyStyleWnd::UIMyStyleWnd(UIWindowContext& context) : UIStylingshopTabParentWnd(context), m_selectedSlot(0), m_slots{} { +UIMyStyleWnd::UIMyStyleWnd() : UIStylingshopTabParentWnd(), m_selectedSlot(0), m_slots{} { } // OFFSET: 0x00823210 // FUNCTION: fn_10291 -UIShowInfoWnd::UIShowInfoWnd(UIWindowContext& context) - : UIWindow(context, 0), m_display(nullptr), unknown_00A0(0), unknown_00A1(0), unknown_00A2(0), m_checkTop(5), unknown_00A8(12), unknown_00AD{}, +UIShowInfoWnd::UIShowInfoWnd() + : UIWindow(0), m_display(nullptr), unknown_00A0(0), unknown_00A1(0), unknown_00A2(0), m_checkTop(5), unknown_00A8(12), unknown_00AD{}, unknown_00B1(0), unknown_00BC(0), unknown_00C0(0), unknown_00C4(0), unknown_00C8(0), unknown_00CC(0), m_offBitmap(nullptr) { } // OFFSET: 0x008232F0 // FUNCTION: fn_10292 -UISlotOfMyStyleWnd::UISlotOfMyStyleWnd(UIWindowContext& context) : UIStylingshopTabParentWnd(context) { +UISlotOfMyStyleWnd::UISlotOfMyStyleWnd() : UIStylingshopTabParentWnd() { } // OFFSET: 0x00823370 // FUNCTION: fn_10293 -UIStylingShopWnd::UIStylingShopWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIStylingShopWnd::UIStylingShopWnd() + : UIFrameWnd(0) { } #include "Contents/Items/ItemInfo.h" @@ -1511,7 +1511,7 @@ struct StyleChangePacket { // OFFSET: 0x00827AE0 // FUNCTION: fn_10331 void UIStylingShopWnd::AddTab(const char* normal, const char* hover, const char* pressed, const int& id, UIStylingshopTabParentWnd* tab, const char* tooltip) { - UIStylingShopButton* button = new (std::nothrow) UIStylingShopButton(*this->m_context); + UIStylingShopButton* button = new (std::nothrow) UIStylingShopButton(); button->SetBitmap(normal, 0, 0); button->SetBitmap(hover, 1, 0); button->SetBitmap(pressed, 2, 0); @@ -1531,7 +1531,7 @@ void UIStylingShopWnd::AddTab(const char* normal, const char* hover, const char* // OFFSET: 0x00829220 // FUNCTION: fn_10339 void UISlotOfMyStyleWnd::Slot15(int, int) { - UIDisplayCharacter* display = new (std::nothrow) UIDisplayCharacter(*this->m_context); + UIDisplayCharacter* display = new (std::nothrow) UIDisplayCharacter(); if (display) { *reinterpret_cast(&display->unknown_00B0) = 1; } @@ -1543,7 +1543,7 @@ void UISlotOfMyStyleWnd::Slot15(int, int) { this->m_display->LoadCostumes(); this->AddChild(this->m_display); - this->m_showInfo = new (std::nothrow) UIShowInfoWnd(*this->m_context); + this->m_showInfo = new (std::nothrow) UIShowInfoWnd(); this->m_showInfo->SetSize(this->geometry.width, static_cast(roundf(static_cast(this->geometry.height) * 0.36f))); const int layout = 496; this->m_showInfo->ArrangeCheckBoxes(layout); @@ -1557,36 +1557,36 @@ void UISlotOfMyStyleWnd::Slot15(int, int) { void UIStylingShopWnd::Slot15(int, int) { this->AddCloseButton("", 0); - UIBasicStylingWnd* basic = new (std::nothrow) UIBasicStylingWnd(*this->m_context); + UIBasicStylingWnd* basic = new (std::nothrow) UIBasicStylingWnd(); this->AddTab("유저인터페이스\\styleshop\\tab_hair_off.bmp", "유저인터페이스\\styleshop\\tab_hair_off.bmp", "유저인터페이스\\styleshop\\tab_hair_on.bmp", 200, basic, LookupMessage(2837)); basic->Show(1); static_cast(this->m_tabs.begin()->first)->SetState(2); - UIAccessoryCusWnd* accessory = new (std::nothrow) UIAccessoryCusWnd(*this->m_context); + UIAccessoryCusWnd* accessory = new (std::nothrow) UIAccessoryCusWnd(); this->AddTab("유저인터페이스\\styleshop\\tab_accessories_off.bmp", "유저인터페이스\\styleshop\\tab_accessories_off_over.bmp", "유저인터페이스\\styleshop\\tab_accessories_on.bmp", 497, accessory, LookupMessage(2831)); if (g_session.IsTreeGroupThree(g_session.GetDisplayJob()) != true && g_session.IsTreeGroupTwo(g_session.GetDisplayJob()) != 1) { - UICostumeChangeWnd* costume = new UICostumeChangeWnd(*this->m_context); + UICostumeChangeWnd* costume = new UICostumeChangeWnd(); this->AddTab("유저인터페이스\\styleshop\\tab_2ndcostume_off.bmp", "유저인터페이스\\styleshop\\tab_2ndcostume_off.bmp", "유저인터페이스\\styleshop\\tab_2ndcostume_off.bmp", 583, costume, LookupMessage(2832)); } else { - UICostumeChangeWnd* costume = new UICostumeChangeWnd(*this->m_context); + UICostumeChangeWnd* costume = new UICostumeChangeWnd(); this->AddTab("유저인터페이스\\styleshop\\tab_2ndcostume_off.bmp", "유저인터페이스\\styleshop\\tab_2ndcostume_on_over.bmp", "유저인터페이스\\styleshop\\tab_2ndcostume_on.bmp", 583, costume, LookupMessage(2832)); } - UIMyStyleWnd* myStyle = new (std::nothrow) UIMyStyleWnd(*this->m_context); + UIMyStyleWnd* myStyle = new (std::nothrow) UIMyStyleWnd(); this->AddTab("유저인터페이스\\styleshop\\tab_favorite_off.bmp", "유저인터페이스\\styleshop\\tab_favorite_off_over.bmp", "유저인터페이스\\styleshop\\tab_favorite_on.bmp", 496, myStyle, LookupMessage(2833)); - this->m_preview = new UIDisplayCharacter(*this->m_context); + this->m_preview = new UIDisplayCharacter(); this->m_preview->SetSize(120, 120); this->m_preview->Show(0); this->AddChild(this->m_preview); - this->m_buyButton = static_cast(new (std::nothrow) UIBitmapButton(*this->m_context)); + this->m_buyButton = static_cast(new (std::nothrow) UIBitmapButton()); this->m_buyButton->SetBitmap("유저인터페이스\\styleshop\\btn_buy_out.bmp", 0, 0); this->m_buyButton->SetBitmap("유저인터페이스\\styleshop\\btn_buy_over.bmp", 1, 0); this->m_buyButton->SetBitmap("유저인터페이스\\styleshop\\btn_buy_down.bmp", 2, 0); @@ -1601,7 +1601,7 @@ void UIStylingShopWnd::Slot15(int, int) { text += FormatGroupedInteger(g_session.m_zeny, zeny, 256); text += "\tz"; - UIStaticText* label = new (std::nothrow) UIStaticText(*this->m_context); + UIStaticText* label = new (std::nothrow) UIStaticText(); label->SetSize(200, 12); label->Move(9, 310); label->SetFont(0, 11, 0, 0); @@ -2027,7 +2027,7 @@ void UIMyStyleWnd::LoadLikeList() { break; } - UIDisplayCharacter* display = new UIDisplayCharacter(*this->m_context); + UIDisplayCharacter* display = new UIDisplayCharacter(); display->unknown_0080 = style.slotNum; display->unknown_0088 = style.robe; display->unknown_008C = style.headStyle; @@ -2074,7 +2074,7 @@ void UIMyStyleWnd::LoadLikeList() { } } - UISlotOfMyStyleWnd* slot = new UISlotOfMyStyleWnd(*this->m_context); + UISlotOfMyStyleWnd* slot = new UISlotOfMyStyleWnd(); int width = static_cast(roundf(static_cast(this->geometry.width) * 0.5f)); slot->SetSize(width, this->geometry.height + 25); slot->Move(width * style.slotNum, 0); @@ -2135,7 +2135,7 @@ void UIMyStyleWnd::LoadLikeList() { void UIMyStyleWnd::Slot15(int, int) { this->LoadLikeList(); - UISlotForSelectWnd* select = new UISlotForSelectWnd(*this->m_context); + UISlotForSelectWnd* select = new UISlotForSelectWnd(); select->SetSize(this->geometry.width, this->geometry.height); select->Move(0, 0); select->SetId(204); @@ -2184,14 +2184,14 @@ void UIMyStyleWnd::Slot15(int, int) { } // FUNCTION: fn_10333 void UIAccessoryCusWnd::Slot15(int, int) { - this->m_display = new (std::nothrow) UIDisplayCharacter(*this->m_context); + this->m_display = new (std::nothrow) UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); this->m_display->LoadCostumes(); this->m_display->Move(0, 0); this->AddChild(this->m_display); - this->m_showInfo = new (std::nothrow) UIShowInfoWnd(*this->m_context); + this->m_showInfo = new (std::nothrow) UIShowInfoWnd(); this->m_showInfo->SetSize(this->m_display->geometry.width, static_cast(roundf(static_cast(this->geometry.height) * 0.4f))); const int layout = 497; this->m_showInfo->ArrangeCheckBoxes(layout); @@ -2200,7 +2200,7 @@ void UIAccessoryCusWnd::Slot15(int, int) { this->AddChild(this->m_showInfo); UIAccessoryShowCase* showCase = - new UIAccessoryShowCase(*this->m_context, static_cast(roundf(static_cast(this->geometry.width) * 0.46f)), this->geometry.height); + new UIAccessoryShowCase(static_cast(roundf(static_cast(this->geometry.width) * 0.46f)), this->geometry.height); showCase->Move(static_cast(roundf(static_cast(this->geometry.width) * 0.6f)), 13); this->AddChild(showCase); } @@ -2331,7 +2331,7 @@ void UIShowInfoWnd::Slot15(int, int) { // OFFSET: 0x00827D00 // FUNCTION: fn_10332 void UI2ndCostumeWnd::Slot15(int, int) { - this->m_display = new (std::nothrow) UIDisplayCharacter(*this->m_context); + this->m_display = new (std::nothrow) UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); this->m_display->Move(0, 0); @@ -2365,7 +2365,7 @@ void UI2ndCostumeWnd::Slot15(int, int) { showText->SetFont(0, 11, 0, 0); this->AddChild(showText); - this->m_showInfo = new (std::nothrow) UIShowInfoWnd(*this->m_context); + this->m_showInfo = new (std::nothrow) UIShowInfoWnd(); this->m_showInfo->SetSize(this->geometry.width - this->m_display->geometry.width, this->geometry.height); const int layout = 498; this->m_showInfo->ArrangeCheckBoxes(layout); @@ -2380,7 +2380,7 @@ void UI2ndCostumeWnd::Slot15(int, int) { // OFFSET: 0x00828380 // FUNCTION: fn_10334 void UIBasicStylingWnd::Slot15(int, int) { - this->m_display = new (std::nothrow) UIDisplayCharacter(*this->m_context); + this->m_display = new (std::nothrow) UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); this->m_display->LoadCostumes(); @@ -2422,7 +2422,7 @@ void UIBasicStylingWnd::Slot15(int, int) { this->m_defaultPaletteButton = defaultButton; g_windowMgr.LookupWindow(281); - this->m_showInfo = new (std::nothrow) UIShowInfoWnd(*this->m_context); + this->m_showInfo = new (std::nothrow) UIShowInfoWnd(); this->m_showInfo->SetSize(this->geometry.width - this->m_display->geometry.width, this->geometry.height); const int layout = 200; this->m_showInfo->ArrangeCheckBoxes(layout); @@ -2434,14 +2434,14 @@ void UIBasicStylingWnd::Slot15(int, int) { // OFFSET: 0x008288C0 // FUNCTION: fn_10335 void UICostumeChangeWnd::Slot15(int, int) { - this->m_display = new UIDisplayCharacter(*this->m_context); + this->m_display = new UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); this->m_display->LoadCostumes(); this->m_display->Move(0, 0); this->AddChild(this->m_display); - this->m_showInfo = new UIShowInfoWnd(*this->m_context); + this->m_showInfo = new UIShowInfoWnd(); this->m_showInfo->SetSize(this->geometry.width - this->m_display->geometry.width, this->geometry.height); const int layout = 583; this->m_showInfo->ArrangeCheckBoxes(layout); diff --git a/Source/UI/StylingShop/UIStylingShopWnd.h b/Source/UI/StylingShop/UIStylingShopWnd.h index 4957a283..ca73d16f 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.h +++ b/Source/UI/StylingShop/UIStylingShopWnd.h @@ -14,7 +14,7 @@ class UIDisplayCharacter : public UIWindow { public: - UIDisplayCharacter(UIWindowContext& context); + UIDisplayCharacter(); void LoadSessionStyle(); void CopyStyle(const UIDisplayCharacter* other); void LoadCostumes(); @@ -50,7 +50,7 @@ public: class UIShowInfoWnd : public UIWindow { public: - explicit UIShowInfoWnd(UIWindowContext& context); + UIShowInfoWnd(); ~UIShowInfoWnd() override; void ResetCheckBoxes(); void ArrangeCheckBoxes(const int& layout); @@ -89,7 +89,7 @@ public: class UIStylingshopTabParentWnd : public UIWindow { public: // INLINED - explicit UIStylingshopTabParentWnd(UIWindowContext& context) : UIWindow(context, 0), m_display(nullptr), m_showInfo(nullptr) { + explicit UIStylingshopTabParentWnd() : UIWindow(0), m_display(nullptr), m_showInfo(nullptr) { } void UpdateFavoriteButton(const bool& favorite); bool IsBuyable() const; @@ -107,7 +107,7 @@ public: class UICostumeChangeWnd : public UIStylingshopTabParentWnd { public: - explicit UICostumeChangeWnd(UIWindowContext& context); + UICostumeChangeWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -119,7 +119,7 @@ void ToggleStylingAccessory(int itemId, int slot); class UIStylingShopWnd : public UIFrameWnd { public: - UIStylingShopWnd(UIWindowContext& windows); + UIStylingShopWnd(); /* 00B4 */ UIStylingShopButton* m_buyButton; /* 00B8 */ UIDisplayCharacter* m_preview; @@ -142,7 +142,7 @@ class UI2ndCostumeWnd : public UIStylingshopTabParentWnd { friend class UIStylingShopWnd; public: - explicit UI2ndCostumeWnd(UIWindowContext& context); + UI2ndCostumeWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -155,7 +155,7 @@ protected: class UIAccessoryCusWnd : public UIStylingshopTabParentWnd { public: // INLINED - explicit UIAccessoryCusWnd(UIWindowContext& context) : UIStylingshopTabParentWnd(context) { + explicit UIAccessoryCusWnd() : UIStylingshopTabParentWnd() { } void Slot15(int width, int height) override; void Paint() override; @@ -167,7 +167,7 @@ class UIStaticBitmap; class UIAccessoryShowCase : public UIScrollWnd { public: // INLINED - UIAccessoryShowCase(UIWindowContext& windows, int width, int height) : UIScrollWnd(windows, width, height, 0), m_itemFrames() { + UIAccessoryShowCase(int width, int height) : UIScrollWnd(width, height, 0), m_itemFrames() { this->Slot15(width, height); } void Slot15(int width, int height) override; @@ -181,7 +181,7 @@ public: class UIBasicStylingWnd : public UIStylingshopTabParentWnd { public: - explicit UIBasicStylingWnd(UIWindowContext& context); + UIBasicStylingWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -194,7 +194,7 @@ class UISlotOfMyStyleWnd; class UIMyStyleWnd : public UIStylingshopTabParentWnd { public: - explicit UIMyStyleWnd(UIWindowContext& context); + UIMyStyleWnd(); void LoadLikeList(); void SaveLikeList(); void Slot15(int width, int height) override; @@ -210,7 +210,7 @@ public: class UISlotOfMyStyleWnd : public UIStylingshopTabParentWnd { public: - explicit UISlotOfMyStyleWnd(UIWindowContext& context); + UISlotOfMyStyleWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -219,7 +219,7 @@ public: class UISlotForSelectWnd : public UIWindow { public: // INLINED - explicit UISlotForSelectWnd(UIWindowContext& context) : UIWindow(context, 0) { + explicit UISlotForSelectWnd() : UIWindow(0) { } void Slot25(int x, int y) override; void Slot26(int x, int y) override; @@ -230,9 +230,6 @@ public: // INLINED UI2ndCostumeCheckBox() : UICheckBox() { } - // INLINED - UI2ndCostumeCheckBox(UIWindowContext& windowContext) : UICheckBox(windowContext) { - } void Slot25(int x, int y) override; }; @@ -242,9 +239,6 @@ public: UIStylingShopButton() : UIBitmapButton() { } // INLINED - UIStylingShopButton(UIWindowContext& windowContext) : UIBitmapButton(windowContext) { - } - // INLINED void SetArgument(int argument) { this->m_argument = argument; } diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index 1170d4da..1a1f052a 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -56,8 +56,8 @@ namespace LineCutter { class UIText : public UIWindow { public: // INLINED - explicit UIText(UIWindowContext& windows) - : UIWindow(windows, 0), m_color(0), m_fontHeight(12), m_bold(0), m_italic(0), m_outlined(0), m_outlineColor(0xFFFFFF), m_shadowed(0), + explicit UIText() + : UIWindow(0), m_color(0), m_fontHeight(12), m_bold(0), m_italic(0), m_outlined(0), m_outlineColor(0xFFFFFF), m_shadowed(0), m_shadowColor(0xFFFFFF) { } @@ -85,11 +85,11 @@ namespace LineCutter { class UIEmotion : public UIWindow { public: - explicit UIEmotion(UIWindowContext& windows, const char* sprite, const char* action); - explicit UIEmotion(UIWindowContext& windows); + explicit UIEmotion(const char* sprite, const char* action); + explicit UIEmotion(); // INLINED - UIEmotion(UIWindowContext& windows, const char* sprite, const char* action, unsigned animation, unsigned maxLoops) - : UIWindow(windows, 0), m_animation(animation), m_frame(0), m_maxLoops(maxLoops), + UIEmotion(const char* sprite, const char* action, unsigned animation, unsigned maxLoops) + : UIWindow(0), m_animation(animation), m_frame(0), m_maxLoops(maxLoops), m_sprite(static_cast(ResourceMgr::Instance().Load(sprite))), m_action(static_cast(ResourceMgr::Instance().Load(action))), m_startTime(timeGetTime()), m_loops(1) { } @@ -110,10 +110,10 @@ protected: class UIItemImage : public UIWindow { public: // INLINED - UIItemImage(UIWindowContext& windows, const std::string& itemId) : UIWindow(windows, 0), m_itemId(itemId) { + UIItemImage(const std::string& itemId) : UIWindow(0), m_itemId(itemId) { this->m_clip = 1; } - explicit UIItemImage(UIWindowContext& windows); + explicit UIItemImage(); void Paint() override; void Slot28(int x, int y) override; @@ -776,7 +776,7 @@ int CCreateLineInfo::LayoutEmotion(int x, const std::string& text) { if (sprite) { const char* action = g_cashEmotionMgr->GetPackName(data->sprId); if (action) { - UIEmotion* emotion = new UIEmotion(*reinterpret_cast(nullptr), sprite, action, data->unknown_0020, loops); + UIEmotion* emotion = new UIEmotion(sprite, action, data->unknown_0020, loops); emotion->SetSize(50, 50); emotion->Invalidate(); if (this->m_width < emotion->geometry.width + x) { @@ -842,7 +842,7 @@ int CCreateLineInfo::LayoutItemImage(int x, const std::string& text) { if (std::regex_search(text.c_str(), text.c_str() + text.size(), match, std::regex("^\\^i\\[(\\d{1,7})\\]*"))) { const std::string itemId = match[1].str(); - UIItemImage* image = new (std::nothrow) UIItemImage(*reinterpret_cast(nullptr), itemId); + UIItemImage* image = new (std::nothrow) UIItemImage(itemId); if (image) { image->SetSize(25, 25); image->Invalidate(); @@ -1124,7 +1124,7 @@ UIWindow* CCreateLineInfo::CreateTextWindow(std::string text, const LineTextStyl } const tagSIZE size = MeasureText(this->m_parent, text, style); - LineCutter::UIText* window = new LineCutter::UIText(*reinterpret_cast(nullptr)); + LineCutter::UIText* window = new LineCutter::UIText(); window->SetSize(size.cx, size.cy); window->m_text = text; window->m_outlineColor = this->unknown_002C; @@ -1720,7 +1720,7 @@ bool NavigationLinkParser::HasUnownedItemLink(std::string text) { // OFFSET: 0x00836D40 // FUNCTION: fn_10435 -UIEmotion::UIEmotion(UIWindowContext& windows, const char* sprite, const char* action) : UIWindow(windows, 0), m_animation(0), m_frame(0), m_maxLoops(0) { +UIEmotion::UIEmotion(const char* sprite, const char* action) : UIWindow(0), m_animation(0), m_frame(0), m_maxLoops(0) { this->m_sprite = static_cast(ResourceMgr::Instance().Load(sprite)); this->m_action = static_cast(ResourceMgr::Instance().Load(action)); this->m_startTime = timeGetTime(); @@ -1728,7 +1728,7 @@ UIEmotion::UIEmotion(UIWindowContext& windows, const char* sprite, const char* a // OFFSET: 0x00836DF0 // FUNCTION: fn_10436 -UIEmotion::UIEmotion(UIWindowContext& windows) : UIWindow(windows, 0), m_animation(0), m_frame(0), m_maxLoops(0) { +UIEmotion::UIEmotion() : UIWindow(0), m_animation(0), m_frame(0), m_maxLoops(0) { this->m_sprite = static_cast(ResourceMgr::Instance().Load("이팩트\\emotion.spr")); this->m_action = static_cast(ResourceMgr::Instance().Load("이팩트\\emotion.act")); this->m_startTime = timeGetTime(); @@ -1736,7 +1736,7 @@ UIEmotion::UIEmotion(UIWindowContext& windows) : UIWindow(windows, 0), m_animati // OFFSET: 0x00836EA0 // FUNCTION: fn_10437 -UIItemImage::UIItemImage(UIWindowContext& windows) : UIWindow(windows, 0), m_itemId("") { +UIItemImage::UIItemImage() : UIWindow(0), m_itemId("") { this->m_clip = 1; } diff --git a/Source/UI/Text/UIAchWnd.cpp b/Source/UI/Text/UIAchWnd.cpp index db15c4f3..f7e9f7f7 100644 --- a/Source/UI/Text/UIAchWnd.cpp +++ b/Source/UI/Text/UIAchWnd.cpp @@ -43,8 +43,8 @@ namespace { // OFFSET: 0x007B2420 // FUNCTION: fn_09186 -UIAchievementWnd::UIAchievementWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), upper(nullptr), tab(nullptr), list(nullptr), group(0), sub(-1) { +UIAchievementWnd::UIAchievementWnd() + : UIFrameWnd(0), upper(nullptr), tab(nullptr), list(nullptr), group(0), sub(-1) { } // OFFSET: 0x007B2E80 @@ -88,13 +88,13 @@ void UIAchListWnd::Create(int width, int height, int rows) { this->unknown_0084 = height / rows; this->rowCount = rows; - this->scrollBar = new UIAchScrollBar(*this->m_context); + this->scrollBar = new UIAchScrollBar(); this->scrollBar->Configure(width - this->unknown_0094, 0, 1, height); this->AddChild(this->scrollBar); this->buttons = new UIButton*[this->rowCount]; for (int index = 0; index < this->rowCount; ++index) { - this->buttons[index] = new UIButton(*this->m_context); + this->buttons[index] = new UIButton(); this->buttons[index]->SetSize(30, 30); this->buttons[index]->Move(5, this->unknown_0084 * index + 5); this->buttons[index]->SetId(index); @@ -196,7 +196,7 @@ bool UIAchTab::sub_7B4370(int x, int y, int* a, int* b) { // OFFSET: 0x007B4470 // FUNCTION: fn_09212 void UIAchievementWnd::CreateTab() { - UIAchTab* tab = new (std::nothrow) UIAchTab(*this->m_context); + UIAchTab* tab = new (std::nothrow) UIAchTab(); this->tab = tab; tab->Slot15(0, 0); tab->tabWidth = 102; @@ -209,7 +209,7 @@ void UIAchievementWnd::CreateTab() { tab->subColor = 0x9B6A59; tab->ClearGroups(); - tab->scrollBar = new UIAchScrollBar(*this->m_context); + tab->scrollBar = new UIAchScrollBar(); tab->scrollBar->Configure(tab->scrollBarX, 0, 1, tab->visibleSubs * tab->subHeight); tab->AddChild(tab->scrollBar); @@ -244,7 +244,7 @@ void UIAchievementWnd::CreateTab() { // OFFSET: 0x007B52E0 // FUNCTION: fn_09214 void UIAchUpperWnd::Slot15(int, int) { - UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(*this->m_context); + UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(); this->unknown_00A4 = gauge; gauge->Slot15(84, 10); gauge->Resize(84, 10); @@ -254,7 +254,7 @@ void UIAchUpperWnd::Slot15(int, int) { this->unknown_00A4->text = LookupMessage(3105); this->AddChild(this->unknown_00A4); - gauge = new (std::nothrow) UICustomGageBar(*this->m_context); + gauge = new (std::nothrow) UICustomGageBar(); this->unknown_00A8 = gauge; gauge->Slot15(124, 8); gauge->Resize(124, 8); @@ -266,7 +266,7 @@ void UIAchUpperWnd::Slot15(int, int) { int index = 0; UIWindow** slot = this->buttons; for (int y = 10; y < 40; y += 15) { - *slot = new UIRadioBtn(*this->m_context); + *slot = new UIRadioBtn(); (*slot)->SetSize(12, 12); (*slot)->Move(150, y); (*slot)->SendMsg(this, 13, index == this->selected, 0, 0, 0); @@ -280,7 +280,7 @@ void UIAchUpperWnd::Slot15(int, int) { // FUNCTION: fn_09215 void UIAchViewWnd::Slot15(int, int) { const std::string name = "유저인터페이스\\achievement_re\\btn_receive"; - this->receiveButton = new UIBitmapButton(*this->m_context); + this->receiveButton = new UIBitmapButton(); this->receiveButton->SetBitmap((name + "_out.bmp").c_str(), 0, 0); this->receiveButton->SetBitmap((name + "_over.bmp").c_str(), 1, 0); this->receiveButton->SetBitmap((name + "_press.bmp").c_str(), 2, 0); @@ -308,7 +308,7 @@ void UIAchViewWnd::Slot15(int, int) { } for (UICustomGageBar*& slot : this->gauges) { - UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(*this->m_context); + UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(); slot = gauge; gauge->Slot15(254, 10); gauge->Resize(254, 10); @@ -323,7 +323,7 @@ void UIAchViewWnd::Slot15(int, int) { } for (UIToolTipBitmapWnd*& reward : this->rewards) { - reward = new (std::nothrow) UIToolTipBitmapWnd(*this->m_context, g_windowMgr); + reward = new (std::nothrow) UIToolTipBitmapWnd(g_windowMgr); reward->Show(0); this->AddChild(reward); } @@ -403,24 +403,24 @@ void UIAchListWnd::Paint() { void UIAchievementWnd::Slot15(int, int) { this->AddCloseButton("", 0); - this->upper = new (std::nothrow) UIAchUpperWnd(*this->m_context); + this->upper = new (std::nothrow) UIAchUpperWnd(); this->upper->SetSize(this->geometry.width, 46); this->upper->Move(0, 17); this->AddChild(this->upper); this->CreateTab(); - this->list = new (std::nothrow) UIAchListWnd(*this->m_context); + this->list = new (std::nothrow) UIAchListWnd(); this->list->Create(320, 405, 5); this->list->Move(102, 63); this->AddChild(this->list); - this->view = new UIAchViewWnd(*this->m_context); + this->view = new UIAchViewWnd(); this->view->SetSize(328, 405); this->view->Move(422, 63); this->AddChild(this->view); - this->summary = new UIAchSummaryWnd(*this->m_context); + this->summary = new UIAchSummaryWnd(); this->summary->SetSize(648, 404); this->summary->Move(102, 63); this->AddChild(this->summary); @@ -1029,7 +1029,7 @@ void UIAchTab::SetLabel(const char* text, int group, int sub) { // OFFSET: 0x007BA260 // FUNCTION: fn_09264 -UIAchTracingWnd::UIAchTracingWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIAchTracingWnd::UIAchTracingWnd() : UIFrameWnd(0) { this->info = nullptr; } @@ -1052,12 +1052,12 @@ void UIAchTracingWnd::Slot11() { // FUNCTION: fn_09268 void UIAchTracingWnd::Slot15(int, int) { for (int index = 0; index < 3; ++index) { - this->toggleButtons[index] = new UITextButton(*this->m_context); + this->toggleButtons[index] = new UITextButton(); this->toggleButtons[index]->Configure("", 0, 0, 12, 1, 0); this->toggleButtons[index]->SetId(478); this->AddChild(this->toggleButtons[index]); - this->openButtons[index] = new UITextButton(*this->m_context); + this->openButtons[index] = new UITextButton(); this->openButtons[index]->Configure("▶", 0, 0, 12, 1, 0); this->openButtons[index]->SetId(479); this->AddChild(this->openButtons[index]); @@ -1181,7 +1181,7 @@ void UIToolTipBitmapWnd::Slot28(int x, int y) { // FUNCTION: fn_09213 void UIAchSummaryWnd::Slot15(int, int) { for (int index = 0; index < this->unknown_007C; ++index) { - UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(*this->m_context); + UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(); if (index == 0) { gauge->Slot15(558, 10); gauge->Resize(558, 10); @@ -1205,7 +1205,7 @@ void UIAchSummaryWnd::Slot15(int, int) { UIWindow** slot = this->buttons; for (int x = 62; x < 694; x += 316) { - UITextButton* button = new UITextButton(*this->m_context); + UITextButton* button = new UITextButton(); *slot = button; button->Configure("", 0x997836, 0, 12, 1, 0); static_cast(*slot)->m_hoverColor = 0x635AA5; @@ -1472,33 +1472,33 @@ void UIAchViewWnd::UpdateInfo() { // OFFSET: 0x007B1E60 // FUNCTION: fn_09181 -UIAchListWnd::UIAchListWnd(UIWindowContext& windows) - : UIWindow(windows, 0), buttons(nullptr), unknown_0084(0), rowCount(0), unknown_008C(0), selectedIndex(0), unknown_0094(11), scrollable(0), +UIAchListWnd::UIAchListWnd() + : UIWindow(0), buttons(nullptr), unknown_0084(0), rowCount(0), unknown_008C(0), selectedIndex(0), unknown_0094(11), scrollable(0), unknown_009C(0), unknown_00AC(nullptr), scrollBar(nullptr) { } // OFFSET: 0x007B1F40 // FUNCTION: fn_09182 -UIAchScrollBar::UIAchScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UIAchScrollBar::UIAchScrollBar() : UIScrollBar() { this->arrowLength = 11; this->thickness = 11; } // OFFSET: 0x007B1FB0 // FUNCTION: fn_09183 -UIAchSummaryWnd::UIAchSummaryWnd(UIWindowContext& windows) : UIWindow(windows, 0), unknown_007C(7) { +UIAchSummaryWnd::UIAchSummaryWnd() : UIWindow(0), unknown_007C(7) { } // OFFSET: 0x007B21D0 // FUNCTION: fn_09184 -UIAchUpperWnd::UIAchUpperWnd(UIWindowContext& windows) - : UIWindow(windows, 0), unknown_0094(0), unknown_0098(0), unknown_009C(0), unknown_00A0(0), unknown_00A4(nullptr), unknown_00A8(nullptr), buttons{}, +UIAchUpperWnd::UIAchUpperWnd() + : UIWindow(0), unknown_0094(0), unknown_0098(0), unknown_009C(0), unknown_00A0(0), unknown_00A4(nullptr), unknown_00A8(nullptr), buttons{}, selected(0) { } // OFFSET: 0x007B22B0 // FUNCTION: fn_09185 -UIAchViewWnd::UIAchViewWnd(UIWindowContext& windows) : UIWindow(windows, 0), achievementId(-1), info(nullptr) { +UIAchViewWnd::UIAchViewWnd() : UIWindow(0), achievementId(-1), info(nullptr) { this->receiveButton = nullptr; this->description = nullptr; for (int index = 0; index < 10; ++index) { @@ -1512,13 +1512,13 @@ UIAchViewWnd::UIAchViewWnd(UIWindowContext& windows) : UIWindow(windows, 0), ach // OFFSET: 0x007B24F0 // FUNCTION: fn_09187 -UICustomGageBar::UICustomGageBar(UIWindowContext& windows) - : UIWindow(windows, 0), value(-1), maximum(-1), text(), barColor(0xCE7B52), backgroundColor(0xFFFFFF), outerBorderColor(0xEFE7E7), +UICustomGageBar::UICustomGageBar() + : UIWindow(0), value(-1), maximum(-1), text(), barColor(0xCE7B52), backgroundColor(0xFFFFFF), outerBorderColor(0xEFE7E7), innerBorderColor(0xADADAD) { } // OFFSET: 0x007B25B0 // FUNCTION: fn_09188 -UIToolTipBitmapWnd::UIToolTipBitmapWnd(UIWindowContext& windows, WindowManagerWindows& managed) - : UIWindow(windows, 0), bitmap(nullptr), itemId(0), unknown_00B4(0), unknown_00B8(0), m_windows(&managed) { +UIToolTipBitmapWnd::UIToolTipBitmapWnd(WindowManagerWindows& managed) + : UIWindow(0), bitmap(nullptr), itemId(0), unknown_00B4(0), unknown_00B8(0), m_windows(&managed) { } diff --git a/Source/UI/Text/UIAchWnd.h b/Source/UI/Text/UIAchWnd.h index c033592f..616c99e3 100644 --- a/Source/UI/Text/UIAchWnd.h +++ b/Source/UI/Text/UIAchWnd.h @@ -28,14 +28,14 @@ struct UIAchListInfo { class UIAchScrollBar : public UIScrollBar { public: - explicit UIAchScrollBar(UIWindowContext& windows); + UIAchScrollBar(); void Paint() override; }; class UICustomGageBar : public UIWindow { public: - __declspec(noinline) explicit UICustomGageBar(UIWindowContext& windows); + __declspec(noinline) UICustomGageBar(); /* 007C */ int value; /* 0080 */ int maximum; @@ -51,7 +51,7 @@ public: class UIAchListWnd : public UIWindow { public: - UIAchListWnd(UIWindowContext& windows); + UIAchListWnd(); ~UIAchListWnd() override; /* 0080 */ UIButton** buttons; @@ -89,8 +89,8 @@ struct UIAchTabGroup { class UIAchTab : public UIWindow { public: // INLINED - UIAchTab(UIWindowContext& windows) - : UIWindow(windows, 0), unknown_007C(-1), unknown_0080(-1), fontHeight(0), hoverGroup(0), hoverSub(0), scrollBar(nullptr), scrollable(0), + UIAchTab() + : UIWindow(0), unknown_007C(-1), unknown_0080(-1), fontHeight(0), hoverGroup(0), hoverSub(0), scrollBar(nullptr), scrollable(0), scrollBarX(13), visibleSubs(3) { this->fontHeight = 12; this->scrollPos = 0; @@ -153,7 +153,7 @@ public: class UIToolTipBitmapWnd : public UIWindow { public: - UIToolTipBitmapWnd(UIWindowContext& windows, WindowManagerWindows& managed); + UIToolTipBitmapWnd(WindowManagerWindows& managed); /* 007C */ std::string tooltip; /* 0094 */ CBitmapRes* bitmap; @@ -174,7 +174,7 @@ private: class UIAchViewWnd : public UIWindow { public: - UIAchViewWnd(UIWindowContext& windows); + UIAchViewWnd(); /* 007C */ UIBitmapButton* receiveButton; /* 0080 */ UIAchTV* description; @@ -196,7 +196,7 @@ private: class UIAchUpperWnd : public UIWindow { public: - UIAchUpperWnd(UIWindowContext& windows); + UIAchUpperWnd(); /* 007C */ std::string title; /* 0094 */ int unknown_0094; @@ -218,7 +218,7 @@ private: class UIAchSummaryWnd : public UIWindow { public: - UIAchSummaryWnd(UIWindowContext& windows); + UIAchSummaryWnd(); /* 007C */ int unknown_007C; /* 0080 */ std::vector gauges; @@ -238,7 +238,7 @@ private: class UIAchievementWnd : public UIFrameWnd { public: - UIAchievementWnd(UIWindowContext& windows); + UIAchievementWnd(); ~UIAchievementWnd() override; /* 00B4 */ UIAchUpperWnd* upper; @@ -284,7 +284,7 @@ public: /* 00B8 */ UITextButton* toggleButtons[3]; /* 00C4 */ UITextButton* openButtons[3]; - UIAchTracingWnd(UIWindowContext& windows); + UIAchTracingWnd(); bool Slot08() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index 14d20386..ad9941be 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -64,8 +64,8 @@ namespace { // OFFSET: 0x0084E970 // FUNCTION: fn_10648 -__declspec(noinline) UIBalloonText::UIBalloonText(UIWindowContext& windows) - : UIWindow(windows, 0), unknown_007C(0), m_fontHeight(12), m_textColor(0xFFFFFF), m_outlineColor(0), m_richText(0) { +__declspec(noinline) UIBalloonText::UIBalloonText() + : UIWindow(0), unknown_007C(0), m_fontHeight(12), m_textColor(0xFFFFFF), m_outlineColor(0), m_richText(0) { this->geometry.unknown_0034 = 0; } @@ -314,7 +314,7 @@ void UINameBalloonText::SetIcon(const char* name, unsigned char framed) { } // OFFSET: 0x0084FED0 // FUNCTION: fn_10668 -UINameBalloonText::UINameBalloonText(UIWindowContext& windows) : UIBalloonText(windows), monsterType(0), framed(0) { +UINameBalloonText::UINameBalloonText() : UIBalloonText(), monsterType(0), framed(0) { this->m_textColor = 0xFFFFFF; this->m_outlineColor = 0; this->unknown_00B8 = 0; @@ -323,7 +323,7 @@ UINameBalloonText::UINameBalloonText(UIWindowContext& windows) : UIBalloonText(w // OFFSET: 0x00CCDFF0 // FUNCTION: fn_21219 -UIVerticalNameBalloonText::UIVerticalNameBalloonText(UIWindowContext& windows) : UINameBalloonText(windows) { +UIVerticalNameBalloonText::UIVerticalNameBalloonText() : UINameBalloonText() { } // OFFSET: 0x00865EB0 diff --git a/Source/UI/Text/UIBalloonText.h b/Source/UI/Text/UIBalloonText.h index ebd9d4f9..2e09ce89 100644 --- a/Source/UI/Text/UIBalloonText.h +++ b/Source/UI/Text/UIBalloonText.h @@ -17,7 +17,7 @@ class UIBalloonText : public UIWindow { friend class UISelCharForUServerWnd; public: - UIBalloonText(UIWindowContext& windows); + UIBalloonText(); ~UIBalloonText() override; bool CanHitTest() override; diff --git a/Source/UI/Text/UICharInfoBalloonText.h b/Source/UI/Text/UICharInfoBalloonText.h index 73036a59..a0d8dbc7 100644 --- a/Source/UI/Text/UICharInfoBalloonText.h +++ b/Source/UI/Text/UICharInfoBalloonText.h @@ -6,7 +6,7 @@ class UICharInfoBalloonText : public UITransBalloonText { public: // INLINED - UICharInfoBalloonText(UIWindowContext& windows) : UITransBalloonText(windows) {} + UICharInfoBalloonText() : UITransBalloonText() {} void Paint() override; }; diff --git a/Source/UI/Text/UINameBalloonText.h b/Source/UI/Text/UINameBalloonText.h index bcf49922..e133a026 100644 --- a/Source/UI/Text/UINameBalloonText.h +++ b/Source/UI/Text/UINameBalloonText.h @@ -9,7 +9,7 @@ class CActorNameCard; class UINameBalloonText : public UIBalloonText { public: - __declspec(noinline) UINameBalloonText(UIWindowContext& windows); + __declspec(noinline) UINameBalloonText(); ~UINameBalloonText() override; void Slot19() override; void Paint() override; @@ -25,7 +25,7 @@ public: class UIVerticalNameBalloonText : public UINameBalloonText { public: - UIVerticalNameBalloonText(UIWindowContext& windows); + UIVerticalNameBalloonText(); void Paint() override; void AddNameLine(const char* text) override; diff --git a/Source/UI/Text/UIStaticText.cpp b/Source/UI/Text/UIStaticText.cpp index f63c1260..bd7d2862 100644 --- a/Source/UI/Text/UIStaticText.cpp +++ b/Source/UI/Text/UIStaticText.cpp @@ -9,8 +9,8 @@ // OFFSET: 0x00850550 // FUNCTION: fn_10678 -__declspec(noinline) UIStaticText::UIStaticText(UIWindowContext& windows) - : UIWindow(windows, 0), red(0), green(0), blue(0), shadow(0), outline(0), background(0xFFFF00FFu), outlineColor(0x969696), fontHeight(12), fontFamily(0), +__declspec(noinline) UIStaticText::UIStaticText() + : UIWindow(0), red(0), green(0), blue(0), shadow(0), outline(0), background(0xFFFF00FFu), outlineColor(0x969696), fontHeight(12), fontFamily(0), bold(0), italic(0), tooltipEnabled(0) { } @@ -360,5 +360,5 @@ void UIStaticText::SetTextWithinWidth(const char* value, int outlineValue) { // OFFSET: 0x008504F0 // FUNCTION: fn_10677 -UIStaticText3::UIStaticText3(UIWindowContext& windows) : UIStaticText(windows), textX(0) { +UIStaticText3::UIStaticText3() : UIStaticText(), textX(0) { } diff --git a/Source/UI/Text/UIStaticText.h b/Source/UI/Text/UIStaticText.h index e798a680..5c7b357e 100644 --- a/Source/UI/Text/UIStaticText.h +++ b/Source/UI/Text/UIStaticText.h @@ -9,7 +9,8 @@ class UIStaticText : public UIWindow { public: UIStaticText(); - UIStaticText(UIWindowContext& windows); + UIStaticText(UIWindowContext&) : UIStaticText() { + } ~UIStaticText() override; void Paint() override; void Slot25(int x, int y) override; @@ -57,7 +58,7 @@ public: class UIStaticText3 : public UIStaticText { public: - UIStaticText3(UIWindowContext& windows); + UIStaticText3(); void Paint() override; /* 00D8 */ int textX; diff --git a/Source/UI/Text/UIStaticTextControl.h b/Source/UI/Text/UIStaticTextControl.h index b02e8df6..83ebd7b3 100644 --- a/Source/UI/Text/UIStaticTextControl.h +++ b/Source/UI/Text/UIStaticTextControl.h @@ -11,7 +11,7 @@ class CUIVScrollBar; class CUIStaticText : public CUIControl { public: - explicit CUIStaticText(UIWindowContext& context); + CUIStaticText(); void Slot28(int x, int y) override; void Paint() override; diff --git a/Source/UI/Text/UIStaticText_LF.h b/Source/UI/Text/UIStaticText_LF.h index 03ab766b..38dbc8ef 100644 --- a/Source/UI/Text/UIStaticText_LF.h +++ b/Source/UI/Text/UIStaticText_LF.h @@ -8,8 +8,10 @@ class UIStaticText_LF : public UIWindow { public: // INLINED - UIStaticText_LF(UIWindowContext& windows, unsigned char cached) - : UIWindow(windows, cached), m_lineSpacing(0), m_align(0), m_fontFamily(0), m_fontHeight(12), m_textColor(0), m_bold(0) {} + UIStaticText_LF(unsigned char cached) + : UIWindow(cached), m_lineSpacing(0), m_align(0), m_fontFamily(0), m_fontHeight(12), m_textColor(0), m_bold(0) {} + UIStaticText_LF(UIWindowContext&, unsigned char cached) : UIStaticText_LF(cached) { + } void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Text/UIString.h b/Source/UI/Text/UIString.h index a98626f5..cd28c797 100644 --- a/Source/UI/Text/UIString.h +++ b/Source/UI/Text/UIString.h @@ -7,7 +7,7 @@ class UIString : public UIWindow { public: - explicit UIString(UIWindowContext& windows); + UIString(); void Paint() override; void ResetCursor(int x, int y) override; void Slot31(int x, int y) override; diff --git a/Source/UI/Text/UITagTextViewer.cpp b/Source/UI/Text/UITagTextViewer.cpp index 6731026c..614572a7 100644 --- a/Source/UI/Text/UITagTextViewer.cpp +++ b/Source/UI/Text/UITagTextViewer.cpp @@ -9,8 +9,8 @@ void sub_83B7F0(UITextButton* button); // OFFSET: 0x0083E1B0 // FUNCTION: fn_10515 -UITagTextViewer::UITagTextViewer(UIWindowContext& context) - : UIScroll(context), m_backgroundColor(0xFFFFFF), m_textWidth(0), m_lineSpacing(6), m_margin(3), m_topMargin(4), m_font{0, 12, 0, 0}, m_outlined(0), +UITagTextViewer::UITagTextViewer() + : UIScroll(), m_backgroundColor(0xFFFFFF), m_textWidth(0), m_lineSpacing(6), m_margin(3), m_topMargin(4), m_font{0, 12, 0, 0}, m_outlined(0), m_outlineColor(0xFFFFFF), m_horizontalAlign(0), m_verticalAlign(3), m_cursorY(0) { m_offsetY = m_topMargin; } @@ -55,7 +55,7 @@ int TagTextViewer::UIScroll::ContentHeight() { // OFFSET: 0x0083EE40 // FUNCTION: fn_10524 void TagTextViewer::UIScroll::Slot15(int width, int height) { - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(width - 13, 0, 1, height); this->AddChild(this->m_scrollBar); this->m_scrollBar->Show(0); diff --git a/Source/UI/Text/UITagTextViewer.h b/Source/UI/Text/UITagTextViewer.h index 3e831f45..215fddd7 100644 --- a/Source/UI/Text/UITagTextViewer.h +++ b/Source/UI/Text/UITagTextViewer.h @@ -28,7 +28,7 @@ namespace TagTextViewer { class UIScroll : public UIWindow { public: - explicit UIScroll(UIWindowContext& context) : UIWindow(context, 0), m_scrollPos(0), m_scrollBar(nullptr) { + explicit UIScroll() : UIWindow(0), m_scrollPos(0), m_scrollBar(nullptr) { } void Slot15(int width, int height) override; void Slot35(int delta) override; @@ -45,7 +45,7 @@ namespace TagTextViewer { class UITagTextViewer : public TagTextViewer::UIScroll { public: - explicit UITagTextViewer(UIWindowContext& context); + UITagTextViewer(); void Resize(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index caa5dfa0..5bc2d00c 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -63,7 +63,7 @@ namespace { // OFFSET: 0x0086F0A0 // FUNCTION: fn_11086 -UITextViewer::UITextViewer(UIWindowContext& windows) : UIListBox(windows), splitTipLinks(0), outline(0), bold(0) { +UITextViewer::UITextViewer() : UIListBox(), splitTipLinks(0), outline(0), bold(0) { this->lineHeight = 18; constexpr char path[] = "유저인터페이스\\colorchip.bmp"; const auto* chip = static_cast(ResourceMgr::Instance().Load(path)); @@ -358,9 +358,6 @@ int UITextViewEX::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 } } -UIItemTagButton::UIItemTagButton(UIWindowContext& windows) : UITextButton(windows), unknown_01F8(0), textY(1) { -} - // OFFSET: 0x00874A40 // FUNCTION: fn_11193 std::string UIItemTagCtrl::sub_874A40(int tagId, unsigned int color) { @@ -370,7 +367,7 @@ std::string UIItemTagCtrl::sub_874A40(int tagId, unsigned int color) { UIItemTagButton* button; { const std::string text = "<" + label + ">"; - button = new (std::nothrow) UIItemTagButton(*this->m_context); + button = new (std::nothrow) UIItemTagButton(); if (button) { button->Configure(text.c_str(), 0x7F00E4, 0, 12, 0, 0); if (title != label) { diff --git a/Source/UI/Text/UITextViewer.h b/Source/UI/Text/UITextViewer.h index d510b44a..555736d6 100644 --- a/Source/UI/Text/UITextViewer.h +++ b/Source/UI/Text/UITextViewer.h @@ -14,7 +14,8 @@ class UITextViewer : public UIListBox { public: UITextViewer(); - UITextViewer(UIWindowContext& windows); + UITextViewer(UIWindowContext&) : UITextViewer() { + } ~UITextViewer() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Text/UITextViewerControl.h b/Source/UI/Text/UITextViewerControl.h index ae65e750..99e6deb7 100644 --- a/Source/UI/Text/UITextViewerControl.h +++ b/Source/UI/Text/UITextViewerControl.h @@ -14,7 +14,7 @@ class CUIVScrollBar; class CUITextViewer : public CUIControl { public: - explicit CUITextViewer(UIWindowContext& context); + CUITextViewer(); void Slot15(int width, int height) override; void Resize(int width, int height) override; void Slot19() override; diff --git a/Source/UI/Text/UITextViewerLinks.cpp b/Source/UI/Text/UITextViewerLinks.cpp index 237f52ce..841afa0a 100644 --- a/Source/UI/Text/UITextViewerLinks.cpp +++ b/Source/UI/Text/UITextViewerLinks.cpp @@ -74,7 +74,7 @@ bool UITextViewer::AddItemLinks(std::string text, unsigned addedLines) { } for (const auto& link : extracted) { - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(link.display.c_str(), 0x00F4934A, 0, 12, 0, 1); const int height = button->geometry.height; const int width = this->TextWidth(link.display.c_str(), 0, 0, 12, 0, 0); @@ -118,7 +118,7 @@ bool UITextViewer::AddNaviLinks(std::string text, unsigned addedLines) { } for (const auto& link : extracted) { - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(link.display.c_str(), 0x00F4934A, 0, 12, 0, 1); const int height = button->geometry.height; const int width = this->TextWidth(link.display.c_str(), 0, 0, 12, 0, 0); @@ -217,7 +217,7 @@ bool UITextViewer::AddQuestLinks(std::string text, unsigned addedLines) { } for (const auto& link : extracted) { - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(link.display.c_str(), 0x00F4934A, 0, 12, 0, 1); const int height = button->geometry.height; const int width = this->TextWidth(link.display.c_str(), 0, 0, 12, 0, 0); @@ -300,7 +300,7 @@ void UITextViewer::AddTipLinks(std::string text, unsigned addedLines) { } for (unsigned fragment = 0; fragment < labels.size(); ++fragment) { - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(labels[fragment].c_str(), 0x00F4934A, 0, 12, 0, 1); const int height = button->geometry.height; const int width = this->TextWidth(labels[fragment].c_str(), 0, 0, 12, 0, 0); @@ -315,7 +315,7 @@ void UITextViewer::AddTipLinks(std::string text, unsigned addedLines) { this->links.push_back(button); } } else { - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(link.display.c_str(), 0x00F4934A, 0, 12, 0, 1); const int height = button->geometry.height; const int width = this->TextWidth(link.display.c_str(), 0, 0, 12, 0, 0); @@ -360,7 +360,7 @@ bool UITextViewer::AddUrlLinks(std::string text, unsigned addedLines) { } for (const auto& link : extracted) { - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(link.display.c_str(), 0x00E6A300, 0, 12, 0, 1); button->m_hoverColor = 0x00EFB700; button->SetId(437); diff --git a/Source/UI/Text/UITransBalloonText.cpp b/Source/UI/Text/UITransBalloonText.cpp index cc6d8765..6debeff2 100644 --- a/Source/UI/Text/UITransBalloonText.cpp +++ b/Source/UI/Text/UITransBalloonText.cpp @@ -36,12 +36,12 @@ namespace { // OFFSET: 0x00850810 // FUNCTION: fn_10680 -UITransBalloonText::UITransBalloonText(UIWindowContext& windows) : UIBalloonText(windows), m_borderColor(6052956) { +UITransBalloonText::UITransBalloonText() : UIBalloonText(), m_borderColor(6052956) { } // OFFSET: 0x0084E8D0 // FUNCTION: fn_10647 -UIAchBalloonText::UIAchBalloonText(UIWindowContext& windows) : UITransBalloonText(windows), m_fontFamily(0) { +UIAchBalloonText::UIAchBalloonText() : UITransBalloonText(), m_fontFamily(0) { } // OFFSET: 0x00853210 diff --git a/Source/UI/Text/UITransBalloonText.h b/Source/UI/Text/UITransBalloonText.h index 3a904bbc..2e4b94ed 100644 --- a/Source/UI/Text/UITransBalloonText.h +++ b/Source/UI/Text/UITransBalloonText.h @@ -20,7 +20,6 @@ class UITransBalloonText : public UIBalloonText { public: UITransBalloonText(); - UITransBalloonText(UIWindowContext& windows); ~UITransBalloonText() override; void Resize(int width, int height) override; @@ -50,13 +49,13 @@ private: class UIColorTransBalloonText : public UITransBalloonText { public: // INLINED - UIColorTransBalloonText(UIWindowContext& windows) : UITransBalloonText(windows) {} + UIColorTransBalloonText() : UITransBalloonText() {} void Paint() override; }; class UIAchBalloonText : public UITransBalloonText { public: - UIAchBalloonText(UIWindowContext& windows); + UIAchBalloonText(); void Paint() override; protected: diff --git a/Source/UI/UIBarGraph.cpp b/Source/UI/UIBarGraph.cpp index 1a124cb9..32457edc 100644 --- a/Source/UI/UIBarGraph.cpp +++ b/Source/UI/UIBarGraph.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0086C190 // FUNCTION: fn_11022 -UIBarGraph2::UIBarGraph2(UIWindowContext& context) : UIBarGraph(context) { +UIBarGraph2::UIBarGraph2() : UIBarGraph() { this->m_vertical = 0; this->m_backgroundRed = 0x8E; this->m_backgroundGreen = 0x8E; @@ -23,17 +23,17 @@ UIBarGraph2::UIBarGraph2(UIWindowContext& context) : UIBarGraph(context) { // OFFSET: 0x0086C240 // FUNCTION: fn_11023 -UIBarGraph3::UIBarGraph3(UIWindowContext& context) : UIWindow(context, 0), m_current(nullptr), m_maximum(nullptr) { +UIBarGraph3::UIBarGraph3() : UIWindow(0), m_current(nullptr), m_maximum(nullptr) { } // OFFSET: 0x0086C310 // FUNCTION: fn_11024 -UIBarGraphHomun::UIBarGraphHomun(UIWindowContext& context) : UIWindow(context, 0) { +UIBarGraphHomun::UIBarGraphHomun() : UIWindow(0) { } // OFFSET: 0x0086C390 // FUNCTION: fn_11025 -UIBarGraphPlayer::UIBarGraphPlayer(UIWindowContext& context) : UIWindow(context, 0) { +UIBarGraphPlayer::UIBarGraphPlayer() : UIWindow(0) { } // OFFSET: 0x0086FFA0 diff --git a/Source/UI/UIBarGraph.h b/Source/UI/UIBarGraph.h index 9b80bb9b..609dc4f4 100644 --- a/Source/UI/UIBarGraph.h +++ b/Source/UI/UIBarGraph.h @@ -9,7 +9,7 @@ class UIBarGraph : public UIWindow { public: - explicit UIBarGraph(UIWindowContext& context) : UIWindow(context, 0), m_value(0) { + explicit UIBarGraph() : UIWindow(0), m_value(0) { } void Paint() override; @@ -21,7 +21,7 @@ public: class UIBarGraph2 : public UIBarGraph { public: - explicit UIBarGraph2(UIWindowContext& context); + UIBarGraph2(); void Paint() override; @@ -36,7 +36,7 @@ public: class UIBarGraph3 : public UIWindow { public: - explicit UIBarGraph3(UIWindowContext& context); + UIBarGraph3(); ~UIBarGraph3() override; protected: @@ -46,7 +46,7 @@ protected: class UIBarGraph4 : public UIBarGraph3 { public: - explicit UIBarGraph4(UIWindowContext& context) : UIBarGraph3(context) { + explicit UIBarGraph4() : UIBarGraph3() { } void Paint() override; @@ -62,7 +62,7 @@ protected: class UIINT64BarGraph : public UIWindow { public: - explicit UIINT64BarGraph(UIWindowContext& context); + UIINT64BarGraph(); void Paint() override; void Slot28(int x, int y) override; @@ -80,7 +80,7 @@ protected: class UIPetInfoBarGraph : public UIWindow { public: - explicit UIPetInfoBarGraph(UIWindowContext& context); + UIPetInfoBarGraph(); void Paint() override; void SetValue(int value); @@ -90,7 +90,7 @@ public: class UIBarGraphHomun : public UIWindow { public: - explicit UIBarGraphHomun(UIWindowContext& context); + UIBarGraphHomun(); void Paint() override; @@ -103,7 +103,7 @@ protected: class UIBarGraphPlayer : public UIWindow { public: - explicit UIBarGraphPlayer(UIWindowContext& context); + UIBarGraphPlayer(); ~UIBarGraphPlayer() override; void Paint() override; @@ -117,7 +117,7 @@ protected: class UIBarGraphPlayerAP : public UIBarGraphPlayer { public: - explicit UIBarGraphPlayerAP(UIWindowContext& context) : UIBarGraphPlayer(context) { + explicit UIBarGraphPlayerAP() : UIBarGraphPlayer() { } void Paint() override; diff --git a/Source/UI/UIBartermarketWnd.cpp b/Source/UI/UIBartermarketWnd.cpp index 3e2277d2..1aa7a57d 100644 --- a/Source/UI/UIBartermarketWnd.cpp +++ b/Source/UI/UIBartermarketWnd.cpp @@ -31,8 +31,8 @@ // OFFSET: 0x00844BE0 // FUNCTION: fn_10567 -UIExpandedBarterItemPurchaseWnd::UIExpandedBarterItemPurchaseWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0) { +UIExpandedBarterItemPurchaseWnd::UIExpandedBarterItemPurchaseWnd() + : UIFrameWnd(0) { new (&this->unknown_00B4) std::list(); this->resizer = nullptr; this->scrollBar = nullptr; @@ -44,8 +44,8 @@ UIExpandedBarterItemPurchaseWnd::UIExpandedBarterItemPurchaseWnd(UIWindowContext // OFFSET: 0x00844D00 // FUNCTION: fn_10569 -UIExpandedBartermarketWnd::UIExpandedBartermarketWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0) { +UIExpandedBartermarketWnd::UIExpandedBartermarketWnd() + : UIFrameWnd(0) { new (&this->unknown_00B4) std::list(); this->unknown_00BC = nullptr; this->scrollBar = nullptr; @@ -1204,7 +1204,7 @@ bool UIBarterItemPurchaseWnd::Purchase() { // OFFSET: 0x00841A10 // FUNCTION: fn_10552 void UIBarterItemPurchaseWnd::Slot15(int width, int height) { - UIResizer* resizer = new UIResizer(*this->m_context); + UIResizer* resizer = new UIResizer(); this->resizer = resizer; resizer->SetSize(16, 16); resizer->SetDirection(3); @@ -1213,7 +1213,7 @@ void UIBarterItemPurchaseWnd::Slot15(int width, int height) { resizer->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(scrollBar); @@ -1412,7 +1412,7 @@ int UIBarterItemPurchaseWnd::SendMsg(UIWindow* sender, int message, std::intptr_ // OFFSET: 0x00846FB0 // FUNCTION: fn_10583 void UIExpandedBarterItemPurchaseWnd::Slot15(int width, int height) { - UIResizer* resizer = new UIResizer(*this->m_context); + UIResizer* resizer = new UIResizer(); this->resizer = resizer; resizer->SetSize(16, 16); resizer->SetDirection(3); @@ -1421,7 +1421,7 @@ void UIExpandedBarterItemPurchaseWnd::Slot15(int width, int height) { resizer->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(resizer); - UIScrollBar* scrollBar = new UIScrollBar(*this->m_context); + UIScrollBar* scrollBar = new UIScrollBar(); this->scrollBar = scrollBar; scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 46); this->AddChild(scrollBar); @@ -1541,7 +1541,7 @@ int UIBartermarketWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s // OFFSET: 0x00842570 // FUNCTION: fn_10553 void UIBartermarketWnd::Slot15(int width, int height) { - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); static_cast(this->resizer)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -1549,7 +1549,7 @@ void UIBartermarketWnd::Slot15(int width, int height) { static_cast(this->resizer)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); static_cast(this->scrollBar)->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - this->unknown_0104 - 17); this->AddChild(this->scrollBar); @@ -1625,7 +1625,7 @@ bool UIExpandedBarterItemPurchaseWnd::Purchase() { // OFFSET: 0x00847290 // FUNCTION: fn_10584 void UIExpandedBartermarketWnd::Slot15(int width, int height) { - this->unknown_00BC = new UIResizer(*this->m_context); + this->unknown_00BC = new UIResizer(); this->unknown_00BC->SetSize(16, 16); static_cast(this->unknown_00BC)->SetDirection(7); static_cast(this->unknown_00BC)->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -1633,7 +1633,7 @@ void UIExpandedBartermarketWnd::Slot15(int width, int height) { static_cast(this->unknown_00BC)->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->unknown_00BC); - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); this->scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 46); this->AddChild(this->scrollBar); diff --git a/Source/UI/UIBartermarketWnd.h b/Source/UI/UIBartermarketWnd.h index 3827c31a..758f634f 100644 --- a/Source/UI/UIBartermarketWnd.h +++ b/Source/UI/UIBartermarketWnd.h @@ -17,7 +17,7 @@ class UIResizer; class UIExpandedBarterItemPurchaseWnd : public UIFrameWnd { public: - UIExpandedBarterItemPurchaseWnd(UIWindowContext& windowContext); + UIExpandedBarterItemPurchaseWnd(); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; void Paint() override; @@ -46,7 +46,7 @@ public: class UIExpandedBartermarketWnd : public UIFrameWnd { public: - UIExpandedBartermarketWnd(UIWindowContext& windowContext); + UIExpandedBartermarketWnd(); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/UIBasicCtrl.cpp b/Source/UI/UIBasicCtrl.cpp index 6189b0ff..4370b0da 100644 --- a/Source/UI/UIBasicCtrl.cpp +++ b/Source/UI/UIBasicCtrl.cpp @@ -2,12 +2,12 @@ // OFFSET: 0x0086C410 // FUNCTION: fn_11026 -UIBasicItemCtrl::UIBasicItemCtrl(UIWindowContext& windows, WindowManagerWindows& windowList) - : UIWindow(windows, 0), m_itemType(-1), m_itemMask(-1), m_identified(0), m_tooltip(""), m_item(0), m_windows(&windowList) { +UIBasicItemCtrl::UIBasicItemCtrl(WindowManagerWindows& windowList) + : UIWindow(0), m_itemType(-1), m_itemMask(-1), m_identified(0), m_tooltip(""), m_item(0), m_windows(&windowList) { } // OFFSET: 0x0086C4C0 // FUNCTION: fn_11027 -UIBasicSkillCtrl::UIBasicSkillCtrl(UIWindowContext& windows, ClientSkills& skills) - : UIWindow(windows, 0), m_skillId(-1), m_skills(&skills), m_level(0) { +UIBasicSkillCtrl::UIBasicSkillCtrl(ClientSkills& skills) + : UIWindow(0), m_skillId(-1), m_skills(&skills), m_level(0) { } diff --git a/Source/UI/UIBasicCtrl.h b/Source/UI/UIBasicCtrl.h index 4fa348e6..702fc174 100644 --- a/Source/UI/UIBasicCtrl.h +++ b/Source/UI/UIBasicCtrl.h @@ -11,7 +11,7 @@ struct ClientSkills; class UIBasicItemCtrl : public UIWindow { public: - UIBasicItemCtrl(UIWindowContext& windows, WindowManagerWindows& windowList); + UIBasicItemCtrl(WindowManagerWindows& windowList); void Slot10(int argument1, int argument2, std::intptr_t argument3) override; void Paint() override; void Slot26(int x, int y) override; @@ -32,7 +32,7 @@ protected: class UIBasicSkillCtrl : public UIWindow { public: - UIBasicSkillCtrl(UIWindowContext& windows, ClientSkills& skills); + UIBasicSkillCtrl(ClientSkills& skills); void Slot10(int argument1, int argument2, std::intptr_t argument3) override; void Paint() override; void Slot26(int x, int y) override; diff --git a/Source/UI/UIBroadcastBalloon.cpp b/Source/UI/UIBroadcastBalloon.cpp index faa0c86d..0f1bd6ae 100644 --- a/Source/UI/UIBroadcastBalloon.cpp +++ b/Source/UI/UIBroadcastBalloon.cpp @@ -9,7 +9,7 @@ // OFFSET: 0x007C27B0 // FUNCTION: fn_09330 -UIBroadcastBalloon::UIBroadcastBalloon(UIWindowContext& windows) : UIWindow(windows, 0) { +UIBroadcastBalloon::UIBroadcastBalloon() : UIWindow(0) { } // OFFSET: 0x007C2D70 diff --git a/Source/UI/UIBroadcastBalloon.h b/Source/UI/UIBroadcastBalloon.h index ec864412..6e197877 100644 --- a/Source/UI/UIBroadcastBalloon.h +++ b/Source/UI/UIBroadcastBalloon.h @@ -29,7 +29,7 @@ struct BroadcastBalloonMessage { class UIBroadcastBalloon : public UIWindow { public: - UIBroadcastBalloon(UIWindowContext& windows); + UIBroadcastBalloon(); void Paint() override; bool CanHitTest() override; void Slot19() override; diff --git a/Source/UI/UICaptchaPreviewWnd.h b/Source/UI/UICaptchaPreviewWnd.h index cf6dd107..f16866d7 100644 --- a/Source/UI/UICaptchaPreviewWnd.h +++ b/Source/UI/UICaptchaPreviewWnd.h @@ -7,7 +7,7 @@ class UICaptchaImage; class UICaptchaPreviewWnd : public UIFrameWnd { public: - UICaptchaPreviewWnd(UIWindowContext& windows); + UICaptchaPreviewWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/UICaptchaRegisterWnd.cpp b/Source/UI/UICaptchaRegisterWnd.cpp index c3832252..369d96f4 100644 --- a/Source/UI/UICaptchaRegisterWnd.cpp +++ b/Source/UI/UICaptchaRegisterWnd.cpp @@ -53,8 +53,8 @@ static_assert(sizeof(CaptchaRegisterPacket) == 20); // OFFSET: 0x007EA1C0 // FUNCTION: fn_09786 -UICaptchaRegisterWnd::UICaptchaRegisterWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_pathText(nullptr), m_fileComboBox(nullptr), +UICaptchaRegisterWnd::UICaptchaRegisterWnd() + : UIFrameWnd(0), m_pathText(nullptr), m_fileComboBox(nullptr), m_captchaBitmap(nullptr), m_editCtrl(nullptr), registerButton(nullptr), m_selectedFile(), m_decompressedData(nullptr), m_decompressedSize(0) {} // OFFSET: 0x007EA3B0 diff --git a/Source/UI/UICaptchaRegisterWnd.h b/Source/UI/UICaptchaRegisterWnd.h index a5b4a363..17185b63 100644 --- a/Source/UI/UICaptchaRegisterWnd.h +++ b/Source/UI/UICaptchaRegisterWnd.h @@ -13,7 +13,7 @@ class UIBitmapButton; class UICaptchaRegisterWnd : public UIFrameWnd { public: - UICaptchaRegisterWnd(UIWindowContext& windows); + UICaptchaRegisterWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a1, std::intptr_t a2, std::intptr_t a3, std::intptr_t a4) override; diff --git a/Source/UI/UIChangeMaterialWnd.cpp b/Source/UI/UIChangeMaterialWnd.cpp index 80e0804c..a8e2d485 100644 --- a/Source/UI/UIChangeMaterialWnd.cpp +++ b/Source/UI/UIChangeMaterialWnd.cpp @@ -38,8 +38,8 @@ // OFFSET: 0x005E03B0 // FUNCTION: fn_03861 -UIChangeMaterialWnd::UIChangeMaterialWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_sortBox(nullptr), m_button(nullptr), m_resultX(168), m_resultY(131), m_resultItem(), +UIChangeMaterialWnd::UIChangeMaterialWnd() + : UIFrameWnd(0), m_sortBox(nullptr), m_button(nullptr), m_resultX(168), m_resultY(131), m_resultItem(), m_materialPos{{90, 86}, {246, 86}, {168, 222}, {168, 40}, {90, 176}, {246, 176}}, m_materials(), m_resultAmount(0), m_resultText() { *reinterpret_cast(reinterpret_cast(this) + 0xB4) = 0; *reinterpret_cast(reinterpret_cast(this) + 0xB8) = 0; @@ -47,8 +47,8 @@ UIChangeMaterialWnd::UIChangeMaterialWnd(UIWindowContext& windows) // OFFSET: 0x005E0560 // FUNCTION: fn_03862 -UIChangeMaterialWnd_List::UIChangeMaterialWnd_List(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_selectedIndex(0), m_hoverIndex(0), m_scrollOffset(0), m_previousScrollOffset(0), m_scrollBar(nullptr), m_items(), +UIChangeMaterialWnd_List::UIChangeMaterialWnd_List() + : UIFrameWnd(0), m_selectedIndex(0), m_hoverIndex(0), m_scrollOffset(0), m_previousScrollOffset(0), m_scrollBar(nullptr), m_items(), m_entries() { *reinterpret_cast(reinterpret_cast(this) + 0xB4) = 27; *reinterpret_cast(reinterpret_cast(this) + 0xB8) = 16; @@ -56,14 +56,14 @@ UIChangeMaterialWnd_List::UIChangeMaterialWnd_List(UIWindowContext& windows) // OFFSET: 0x005E0650 // FUNCTION: fn_03863 -UIChangeMaterialWnd_ScrollBar::UIChangeMaterialWnd_ScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UIChangeMaterialWnd_ScrollBar::UIChangeMaterialWnd_ScrollBar() : UIScrollBar() { this->thickness = 16; } // OFFSET: 0x005E1B30 // FUNCTION: fn_03877 void UIChangeMaterialWnd_List::CreateScrollBar(int width, int height) { - auto* bar = new UIChangeMaterialWnd_ScrollBar(*this->m_context); + auto* bar = new UIChangeMaterialWnd_ScrollBar(); *reinterpret_cast(reinterpret_cast(bar) + 0xA4) = 0x10; this->m_scrollBar = bar; bar->Configure(width - *reinterpret_cast(reinterpret_cast(this) + 0xB8), 0, 1, height); @@ -535,7 +535,6 @@ void UIChangeMaterialWnd_List::ShiftSelectedIndex(int value) { // OFFSET: 0x005E1C00 // FUNCTION: fn_03878 void UIChangeMaterialWnd::Paint() { - UIWindowContext& controls = *this->m_context; CBitmapRes* background = static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\ChangeMaterial\\bg_ChangeMaterial.bmp"))); this->DrawBitmap(0, 0, background ? &background->image : nullptr, true); @@ -693,7 +692,7 @@ void UIChangeMaterialWnd_List::Slot28(int x, int y) { // OFFSET: 0x005E1320 // FUNCTION: fn_03876 void UIChangeMaterialWnd::Slot15(int width, int height) { - UIBitmapButton* close = new UIBitmapButton(*this->m_context); + UIBitmapButton* close = new UIBitmapButton(); close->SetBitmap("유저인터페이스\\basic_interface\\sys_close_off.bmp", 0, 0); close->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 1, 0); close->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 2, 0); @@ -702,7 +701,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) { close->SetId(201); this->AddChild(close); - UIEditCtrl* edit = new UIEditCtrl(*this->m_context); + UIEditCtrl* edit = new UIEditCtrl(); *reinterpret_cast(reinterpret_cast(this) + 0xB8) = edit; edit->SetSize(118, 13); edit->Move(313, 262); @@ -714,7 +713,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) { edit->topPadding = -1; this->AddChild(edit); - UIBmpTextButton* search = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* search = new UIBmpTextButton(); search->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_search.bmp", 0, 0); search->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_search_over.bmp", 1, 0); search->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_search_press.bmp", 2, 0); @@ -725,7 +724,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) { search->SetId(321); this->AddChild(search); - UIBitmapButton* refresh = new UIBitmapButton(*this->m_context); + UIBitmapButton* refresh = new UIBitmapButton(); refresh->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_refresh.bmp", 0, 0); refresh->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_refresh_over.bmp", 1, 0); refresh->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_refresh_press.bmp", 2, 0); @@ -735,7 +734,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) { refresh->SetId(415); this->AddChild(refresh); - this->m_sortBox = new UIChangeMaterialWnd_CheckBox(*this->m_context); + this->m_sortBox = new UIChangeMaterialWnd_CheckBox(); this->m_sortBox->SetSize(74, 14); this->m_sortBox->SetBitmaps("유저인터페이스\\ChangeMaterial\\btn_sort_up.bmp", "유저인터페이스\\ChangeMaterial\\btn_sort_down.bmp"); this->m_sortBox->ascendingText = LookupMessage(3722); @@ -746,7 +745,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) { this->m_sortBox->SetChecked(1); this->AddChild(this->m_sortBox); - UIBitmapButton* change = new UIBitmapButton(*this->m_context); + UIBitmapButton* change = new UIBitmapButton(); this->m_button = change; change->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_change_start.bmp", 0, 0); change->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_change_over.bmp", 1, 0); @@ -757,13 +756,13 @@ void UIChangeMaterialWnd::Slot15(int width, int height) { change->SetId(184); this->AddChild(change); - UIBasicButton* cancel = new UIBasicButton(*this->m_context); + UIBasicButton* cancel = new UIBasicButton(); cancel->Configure(42, LookupMessage(3045)); cancel->Move(width - cancel->geometry.width - 55, height - cancel->geometry.height - 12); cancel->SetId(201); this->AddChild(cancel); - UIChangeMaterialWnd_List* list = new UIChangeMaterialWnd_List(*this->m_context); + UIChangeMaterialWnd_List* list = new UIChangeMaterialWnd_List(); *reinterpret_cast(reinterpret_cast(this) + 0xB4) = list; list->SetSize(186, 216); list->Move(310, 41); diff --git a/Source/UI/UIChangeMaterialWnd.h b/Source/UI/UIChangeMaterialWnd.h index 098b8423..c3c44465 100644 --- a/Source/UI/UIChangeMaterialWnd.h +++ b/Source/UI/UIChangeMaterialWnd.h @@ -43,7 +43,7 @@ struct MaterialNameLess { class UIChangeMaterialWnd_ScrollBar : public UIScrollBar { public: // VTABLE: vt_00211 - explicit UIChangeMaterialWnd_ScrollBar(UIWindowContext& windows); + UIChangeMaterialWnd_ScrollBar(); void Paint() override; }; @@ -51,7 +51,7 @@ public: class UIChangeMaterialWnd_CheckBox : public UICheckBox { public: // INLINED - UIChangeMaterialWnd_CheckBox(UIWindowContext& windows) : UICheckBox(windows) {} + UIChangeMaterialWnd_CheckBox() : UICheckBox() {} void Paint() override; /* 010C */ std::string ascendingText; @@ -60,7 +60,7 @@ public: class UIChangeMaterialWnd : public UIFrameWnd { public: - UIChangeMaterialWnd(UIWindowContext& windows); + UIChangeMaterialWnd(); void Slot15(int width, int height) override; bool Slot02() override; void Paint() override; @@ -88,7 +88,7 @@ protected: class UIChangeMaterialWnd_List : public UIFrameWnd { public: - UIChangeMaterialWnd_List(UIWindowContext& windows); + UIChangeMaterialWnd_List(); void Paint() override; void Move(int x, int y) override; diff --git a/Source/UI/UICheckAttendanceWnd.cpp b/Source/UI/UICheckAttendanceWnd.cpp index 9b81969c..9a739fc5 100644 --- a/Source/UI/UICheckAttendanceWnd.cpp +++ b/Source/UI/UICheckAttendanceWnd.cpp @@ -43,8 +43,8 @@ struct CheckAttendanceRequestPacket { // OFFSET: 0x007DC6B0 // FUNCTION: fn_09631 -UICheckAttendanceWnd::UICheckAttendanceWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_blinking(0), m_checkedDays(0), m_daysLeft(0), +UICheckAttendanceWnd::UICheckAttendanceWnd() + : UIFrameWnd(0), m_blinking(0), m_checkedDays(0), m_daysLeft(0), m_highlight(0), m_notice(nullptr) { this->m_rewardCount = static_cast(g_checkAttendanceMgr->m_rewards.size()); } @@ -96,8 +96,8 @@ int UICheckAttendanceWnd::SlotAt(int x, int y) { } // INLINED -UICheckAttendanceWnd_Banner::UICheckAttendanceWnd_Banner(UIWindowContext& windows) - : UIWindow(windows, 0), m_current(0), m_lastSwitch(timeGetTime()) { +UICheckAttendanceWnd_Banner::UICheckAttendanceWnd_Banner() + : UIWindow(0), m_current(0), m_lastSwitch(timeGetTime()) { } // OFFSET: 0x007DCF50 @@ -120,7 +120,7 @@ void UICheckAttendanceWnd::Slot15(int, int) { this->m_daysLeft = _localtime32(&remaining)->tm_yday; } - this->m_notice = new UIBmpTextButton(*this->m_context); + this->m_notice = new UIBmpTextButton(); this->m_notice->SetBitmap("유저인터페이스\\check_attendance\\bt_ok_normal.bmp", 0, 0); this->m_notice->SetBitmap("유저인터페이스\\check_attendance\\bt_ok_normal.bmp", 1, 0); this->m_notice->SetBitmap("유저인터페이스\\check_attendance\\bt_ok_press.bmp", 2, 0); @@ -133,7 +133,7 @@ void UICheckAttendanceWnd::Slot15(int, int) { this->m_notice->SetId(201); this->AddChild(this->m_notice); - this->m_banner = new UICheckAttendanceWnd_Banner(*this->m_context); + this->m_banner = new UICheckAttendanceWnd_Banner(); this->m_banner->SetSize(441, 41); this->m_banner->Move(this->geometry.width / 2 - this->m_banner->geometry.width / 2, 85); this->AddChild(this->m_banner); @@ -142,7 +142,6 @@ void UICheckAttendanceWnd::Slot15(int, int) { // OFFSET: 0x007DD2E0 // FUNCTION: fn_09640 void UICheckAttendanceWnd::Paint() { - UIWindowContext& controls = *this->m_context; const char* backgroundName = this->m_banner->m_entries.size() != 0 ? "유저인터페이스\\check_attendance\\attendance_bg_ad.bmp" : "유저인터페이스\\check_attendance\\attendance_bg.bmp"; @@ -344,7 +343,7 @@ void UICheckAttendanceWnd_Banner::CreateButtons() { if (this->m_entries.size() > 1) { int index = 0; for (auto it = this->m_entries.begin(); it != this->m_entries.end(); ++it) { - UIBmpRadioBtn* button = new UIBmpRadioBtn(*this->m_context); + UIBmpRadioBtn* button = new UIBmpRadioBtn(); button->SetBitmap("유저인터페이스\\check_attendance\\btn_ad_off.bmp", 0); button->SetBitmap("유저인터페이스\\check_attendance\\btn_ad_off.bmp", 1); button->SetBitmap("유저인터페이스\\check_attendance\\btn_ad_on.bmp", 2); diff --git a/Source/UI/UICheckAttendanceWnd.h b/Source/UI/UICheckAttendanceWnd.h index 1a5878e9..49062fa4 100644 --- a/Source/UI/UICheckAttendanceWnd.h +++ b/Source/UI/UICheckAttendanceWnd.h @@ -18,7 +18,7 @@ struct AttendanceBanner { class UICheckAttendanceWnd_Banner : public UIWindow { public: - UICheckAttendanceWnd_Banner(UIWindowContext& windows); + UICheckAttendanceWnd_Banner(); ~UICheckAttendanceWnd_Banner() override; void Slot19() override; void Paint() override; @@ -39,7 +39,7 @@ protected: class UICheckAttendanceWnd : public UIFrameWnd { public: - UICheckAttendanceWnd(UIWindowContext& windows); + UICheckAttendanceWnd(); ~UICheckAttendanceWnd() override; void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/UIGradeEnchantWnd.cpp b/Source/UI/UIGradeEnchantWnd.cpp index 0611d57e..486ba6f1 100644 --- a/Source/UI/UIGradeEnchantWnd.cpp +++ b/Source/UI/UIGradeEnchantWnd.cpp @@ -49,7 +49,7 @@ struct GradeEnchantClosePacket { // OFFSET: 0x007E68F0 // FUNCTION: fn_09738 UIGradeEnchantWnd::UIGradeEnchantWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), enhancedUpButton(nullptr), state(0), + : UIFrameWnd(0), enhancedUpButton(nullptr), state(0), result(-1), unknown_00C8(200), unknown_00CC(100), stateTick(0), unknown_00D4(0), unknown_00D8(1), unknown_00DC(1), unknown_00E0(0), selectedMaterial(-1), hoverMaterial(-1), materials(), info{}, unknown_0108(0), unknown_010C(0), unknown_0110(0), unknown_0114(0), unknown_0118(0), unknown_011C(), item(0), unknown_0220(0), startButton(nullptr), enhancedDownButton(nullptr) { @@ -57,18 +57,18 @@ UIGradeEnchantWnd::UIGradeEnchantWnd() // OFFSET: 0x007E6A60 // FUNCTION: fn_09739 -UIGradeEnchant_BtnEnhancedDown::UIGradeEnchant_BtnEnhancedDown(UIWindowContext& windows) : UIBitmapButton(windows) { +UIGradeEnchant_BtnEnhancedDown::UIGradeEnchant_BtnEnhancedDown() : UIBitmapButton() { } // OFFSET: 0x007E6AC0 // FUNCTION: fn_09740 -UIGradeEnchant_BtnEnhancedUp::UIGradeEnchant_BtnEnhancedUp(UIWindowContext& windows) - : UIBitmapButton(windows), tooltipValue(0), tooltipEnabled(0) { +UIGradeEnchant_BtnEnhancedUp::UIGradeEnchant_BtnEnhancedUp() + : UIBitmapButton(), tooltipValue(0), tooltipEnabled(0) { } // OFFSET: 0x007E6B30 // FUNCTION: fn_09741 -UIGradeEnchant_BtnStart::UIGradeEnchant_BtnStart(UIWindowContext& windows) : UIBitmapButton(windows) { +UIGradeEnchant_BtnStart::UIGradeEnchant_BtnStart() : UIBitmapButton() { } // OFFSET: 0x007E7500 @@ -137,13 +137,13 @@ void UIGradeEnchantWnd::Slot15(int, int) { close->Move(0x180, 0x14); } - auto* title = new UIBasicButton(*this->m_context); + auto* title = new UIBasicButton(); title->Configure(0x2A, LookupMessage(0x513)); title->Move(0x159, 299); title->SetId(0xB9); this->AddChild(title); - this->startButton = new UIGradeEnchant_BtnStart(*this->m_context); + this->startButton = new UIGradeEnchant_BtnStart(); this->startButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_start.bmp", 0, 0); this->startButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_start_over.bmp", 1, 0); this->startButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_start_press.bmp", 2, 0); @@ -155,7 +155,7 @@ void UIGradeEnchantWnd::Slot15(int, int) { this->startButton->Invalidate(); this->AddChild(this->startButton); - this->enhancedUpButton = new UIGradeEnchant_BtnEnhancedUp(*this->m_context); + this->enhancedUpButton = new UIGradeEnchant_BtnEnhancedUp(); this->enhancedUpButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_chance_up.bmp", 0, 0); this->enhancedUpButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_chance_up_over.bmp", 1, 0); this->enhancedUpButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_chance_up_pick.bmp", 2, 0); @@ -166,7 +166,7 @@ void UIGradeEnchantWnd::Slot15(int, int) { this->enhancedUpButton->Invalidate(); this->AddChild(this->enhancedUpButton); - this->enhancedDownButton = new UIGradeEnchant_BtnEnhancedDown(*this->m_context); + this->enhancedDownButton = new UIGradeEnchant_BtnEnhancedDown(); this->enhancedDownButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_chance_down.bmp", 0, 0); this->enhancedDownButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_chance_down_over.bmp", 1, 0); this->enhancedDownButton->SetBitmap("유저인터페이스\\grade_enchant\\btn_chance_down_pick.bmp", 2, 0); @@ -177,7 +177,7 @@ void UIGradeEnchantWnd::Slot15(int, int) { this->enhancedDownButton->Invalidate(); this->AddChild(this->enhancedDownButton); - auto* help = new UIBitmapButton(*this->m_context); + auto* help = new UIBitmapButton(); help->SetBitmap("유저인터페이스\\basic_interface\\btn_help_normal.bmp", 0, 0); help->SetBitmap("유저인터페이스\\basic_interface\\btn_help_over.bmp", 1, 0); help->SetBitmap("유저인터페이스\\basic_interface\\btn_help_pressed.bmp", 2, 0); diff --git a/Source/UI/UIGradeEnchantWnd.h b/Source/UI/UIGradeEnchantWnd.h index 4e259beb..b1f57c26 100644 --- a/Source/UI/UIGradeEnchantWnd.h +++ b/Source/UI/UIGradeEnchantWnd.h @@ -32,14 +32,14 @@ static_assert(sizeof(GradeEnchantInfo) == 16); class UIGradeEnchant_BtnStart : public UIBitmapButton { public: - UIGradeEnchant_BtnStart(UIWindowContext& windows); + UIGradeEnchant_BtnStart(); void Paint() override; void Enable(unsigned char value) override; }; class UIGradeEnchant_BtnEnhancedUp : public UIBitmapButton { public: - UIGradeEnchant_BtnEnhancedUp(UIWindowContext& windows); + UIGradeEnchant_BtnEnhancedUp(); void Paint() override; void Slot28(int x, int y) override; void Enable(unsigned char value) override; @@ -50,7 +50,7 @@ public: class UIGradeEnchant_BtnEnhancedDown : public UIBitmapButton { public: - UIGradeEnchant_BtnEnhancedDown(UIWindowContext& windows); + UIGradeEnchant_BtnEnhancedDown(); void Paint() override; void Enable(unsigned char value) override; }; diff --git a/Source/UI/UIHotkeyGuideWnd.cpp b/Source/UI/UIHotkeyGuideWnd.cpp index fd933679..e84ba6c7 100644 --- a/Source/UI/UIHotkeyGuideWnd.cpp +++ b/Source/UI/UIHotkeyGuideWnd.cpp @@ -17,8 +17,8 @@ // OFFSET: 0x009663D0 // FUNCTION: fn_13154 -UIHotkeyGuideWnd::UIHotkeyGuideWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIHotkeyGuideWnd::UIHotkeyGuideWnd() + : UIFrameWnd(0) { this->m_current = 4698; } @@ -55,7 +55,7 @@ HotkeyGuideLabel::~HotkeyGuideLabel() { // OFFSET: 0x00966C70 // FUNCTION: fn_13164 void UIHotkeyGuideWnd::Slot15(int, int) { - UIBitmapButton* base = new UIBitmapButton(*this->m_context); + UIBitmapButton* base = new UIBitmapButton(); 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); @@ -177,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); + UIBasicButton* tab = new UIBasicButton(); tab->Configure(118, LookupMessage(entry->id)); tab->Move(index / 6 * 246 + 26, index % 6 * 30 + 310); tab->SetId(entry->id); @@ -186,7 +186,7 @@ void UIHotkeyGuideWnd::Slot15(int, int) { ++index; } - UIBmpTextButton* settings = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* settings = new UIBmpTextButton(); 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); diff --git a/Source/UI/UIHotkeyGuideWnd.h b/Source/UI/UIHotkeyGuideWnd.h index 9078f334..e5bc9aa2 100644 --- a/Source/UI/UIHotkeyGuideWnd.h +++ b/Source/UI/UIHotkeyGuideWnd.h @@ -44,7 +44,7 @@ struct HotkeyGuideLabel { class UIHotkeyGuideWnd : public UIFrameWnd { public: - UIHotkeyGuideWnd(UIWindowContext& windows); + UIHotkeyGuideWnd(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/UIIngredientInfoWnd.h b/Source/UI/UIIngredientInfoWnd.h index 1d1e65b3..772bec65 100644 --- a/Source/UI/UIIngredientInfoWnd.h +++ b/Source/UI/UIIngredientInfoWnd.h @@ -14,8 +14,8 @@ class UIIngredientInfoWnd : public UIFrameWnd { public: // OFFSET: 0x005FEF40 // FUNCTION: fn_04139 - UIIngredientInfoWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), selected(0), insufficient(0), quantity(0) {} + UIIngredientInfoWnd() + : UIFrameWnd(0), selected(0), insufficient(0), quantity(0) {} ~UIIngredientInfoWnd() override; void Move(int x, int y) override; void Slot10(int argument1, int argument2, std::intptr_t argument3) override; diff --git a/Source/UI/UIItemReformWnd.cpp b/Source/UI/UIItemReformWnd.cpp index 283972f7..4f4421a1 100644 --- a/Source/UI/UIItemReformWnd.cpp +++ b/Source/UI/UIItemReformWnd.cpp @@ -46,16 +46,16 @@ struct PACKET_CZ_ITEM_REFORM { // OFFSET: 0x005FC010 // FUNCTION: fn_04095 -UIItemReformWnd::UIItemReformWnd(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0), reformButton(nullptr), list(nullptr), baseIcon(nullptr), resultIcon(nullptr), +UIItemReformWnd::UIItemReformWnd() + : UIFrameWnd(0), reformButton(nullptr), list(nullptr), baseIcon(nullptr), resultIcon(nullptr), materialIcons(), detailButton(nullptr), detailMsg(nullptr), reformItem(), selectedItem(nullptr), resultItem(), materials(), information(), warning() { } // OFFSET: 0x005FC160 // FUNCTION: fn_04096 -UIItemReformWnd_List::UIItemReformWnd_List(UIWindowContext& windowContext) - : UIFrameWnd(windowContext, 0), itemHeight(32), selectedIndex(0xFFFFFFFF), hoverIndex(0), scrollPosition(0), +UIItemReformWnd_List::UIItemReformWnd_List() + : UIFrameWnd(0), itemHeight(32), selectedIndex(0xFFFFFFFF), hoverIndex(0), scrollPosition(0), scrollBar(nullptr), items() { } @@ -92,13 +92,13 @@ void UIItemReformWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - UIBasicButton* cancel = new UIBasicButton(*this->m_context); + UIBasicButton* cancel = new UIBasicButton(); cancel->Configure(60, LookupMessage(218)); cancel->Move(300, 236); cancel->SetId(201); this->AddChild(cancel); - this->reformButton = new UIBasicButton(*this->m_context); + this->reformButton = new UIBasicButton(); this->reformButton->Configure(60, LookupMessage(3847)); this->reformButton->Move(365, 236); this->reformButton->SetId(184); @@ -106,30 +106,30 @@ void UIItemReformWnd::Slot15(int width, int height) { this->reformButton->Invalidate(); this->AddChild(this->reformButton); - this->list = new UIItemReformWnd_List(*this->m_context); + this->list = new UIItemReformWnd_List(); this->list->SetSize(222, 192); this->list->Move(215, 21); this->AddChild(this->list); - this->baseIcon = new UIItemReformWnd_Item(*this->m_context); + this->baseIcon = new UIItemReformWnd_Item(); this->baseIcon->SetSize(24, 24); this->baseIcon->Move(144, 50); this->AddChild(this->baseIcon); - this->resultIcon = new UIItemReformWnd_Item(*this->m_context); + this->resultIcon = new UIItemReformWnd_Item(); this->resultIcon->SetSize(24, 24); this->resultIcon->Move(54, 50); this->AddChild(this->resultIcon); for (unsigned int index = 0; index < CItemReformMgr::Instance()->m_maxMaterials; ++index) { - UIItemReformWnd_Item* icon = new UIItemReformWnd_Item(*this->m_context); + UIItemReformWnd_Item* icon = new UIItemReformWnd_Item(); icon->SetSize(24, 24); icon->Move(index % 3 * 69 + 30, index / 3 * 50 + 140); this->AddChild(icon); this->materialIcons.push_back(icon); } - this->detailButton = new UIItemReformWnd_DetailBtn(*this->m_context); + this->detailButton = new UIItemReformWnd_DetailBtn(); this->detailButton->SetSize(149, 14); this->detailButton->Move(36, 124); this->detailButton->Enable(0); @@ -139,7 +139,7 @@ void UIItemReformWnd::Slot15(int width, int height) { // OFFSET: 0x005FD1B0 // FUNCTION: fn_04109 void UIItemReformWnd_List::Slot15(int width, int height) { - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); this->scrollBar->Configure(width - 13, 0, 1, height); this->scrollBar->Show(0); this->AddChild(this->scrollBar); @@ -151,7 +151,6 @@ void UIItemReformWnd_List::Slot15(int width, int height) { // FUNCTION: fn_04110 void UIItemReformWnd::Paint() { this->DrawBitmap(0, 0, &static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\ItemReform\\bg_reform.bmp")))->image, true); - UIWindowContext& context = *this->m_context; if (std::atoi(this->reformItem.itemId.c_str()) > 0) { this->DrawTitleBar(false, this->reformItem.DisplayName(0).c_str(), 0); } @@ -209,7 +208,6 @@ void UIItemReformWnd_Item::Paint() { // FUNCTION: fn_04114 void UIItemReformWnd_List::Paint() { this->ClearSurface(0xFFFFFFFF); - UIWindowContext& context = *this->m_context; for (unsigned int row = 0; row < this->visibleCount; ++row) { const unsigned int index = this->scrollPosition + row; if (index < this->items.size()) { @@ -470,7 +468,7 @@ int UIItemReformWnd::SendMsg( break; case 167: if (sender == this->detailButton && !this->detailMsg) { - this->detailMsg = new UIItemReformWnd_DetailMsg(*this->m_context); + this->detailMsg = new UIItemReformWnd_DetailMsg(); this->detailMsg->SetText(this->information); g_windowMgr.AddRendered(this->detailMsg); } diff --git a/Source/UI/UIItemReformWnd.h b/Source/UI/UIItemReformWnd.h index 9630cc94..f8eb525b 100644 --- a/Source/UI/UIItemReformWnd.h +++ b/Source/UI/UIItemReformWnd.h @@ -14,7 +14,7 @@ class UIBasicButton; class UIItemReformWnd_List : public UIFrameWnd { public: - UIItemReformWnd_List(UIWindowContext& windowContext); + UIItemReformWnd_List(); void Move(int x, int y) override; void Slot15(int width, int height) override; void Paint() override; @@ -38,7 +38,7 @@ public: class UIItemReformWnd_Item : public UIWindow { public: // INLINED - explicit UIItemReformWnd_Item(UIWindowContext& context) : UIWindow(context, 0), item(nullptr) { + explicit UIItemReformWnd_Item() : UIWindow(0), item(nullptr) { } void Paint() override; void Slot28(int x, int y) override; @@ -50,7 +50,7 @@ public: class UIItemReformWnd_DetailBtn : public UIButton { public: // INLINED - UIItemReformWnd_DetailBtn(UIWindowContext& windowContext) : UIButton(windowContext) { + UIItemReformWnd_DetailBtn() : UIButton() { } void Paint() override; void Slot47() override; @@ -60,7 +60,7 @@ public: class UIItemReformWnd_DetailMsg : public UIWindow { public: // INLINED - explicit UIItemReformWnd_DetailMsg(UIWindowContext& context) : UIWindow(context, 0) { + explicit UIItemReformWnd_DetailMsg() : UIWindow(0) { } void Paint() override; void SetText(const std::string& text); @@ -68,7 +68,7 @@ public: class UIItemReformWnd : public UIFrameWnd { public: - UIItemReformWnd(UIWindowContext& windowContext); + UIItemReformWnd(); void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/UILapineBoxWnd.cpp b/Source/UI/UILapineBoxWnd.cpp index aa1da5fa..159ff2a0 100644 --- a/Source/UI/UILapineBoxWnd.cpp +++ b/Source/UI/UILapineBoxWnd.cpp @@ -38,7 +38,7 @@ struct RandomCombineItemPacket { // OFFSET: 0x005FEFF0 // FUNCTION: fn_04140 UILapineBoxWnd::UILapineBoxWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), cancelButton(nullptr), makeButton(nullptr), + : UIFrameWnd(0), cancelButton(nullptr), makeButton(nullptr), moveButton(nullptr), ingredientList(nullptr), unknown_00C4(0), noticeTick(0), noticeDuration(3000), waiting(0) { } diff --git a/Source/UI/UILapineScrollBar.cpp b/Source/UI/UILapineScrollBar.cpp index 8d836b95..bdd5d045 100644 --- a/Source/UI/UILapineScrollBar.cpp +++ b/Source/UI/UILapineScrollBar.cpp @@ -114,8 +114,8 @@ void UILapineBox_IngredientListWnd::Paint() { // OFFSET: 0x005FF130 // FUNCTION: fn_45447 -UILapineBox_IngredientListWnd::UILapineBox_IngredientListWnd(UIWindowContext& windows, int width, int height) - : UIScrollWnd(windows, width, height, 0), minRefine(0), maxRefine(20) { +UILapineBox_IngredientListWnd::UILapineBox_IngredientListWnd(int width, int height) + : UIScrollWnd(width, height, 0), minRefine(0), maxRefine(20) { this->Resize(width, height); this->Slot15(width, height); } @@ -150,7 +150,7 @@ void UILapineBox_IngredientListWnd::Slot10(int, int, std::intptr_t value) { // OFFSET: 0x005FF920 // FUNCTION: fn_04153 void UILapineBoxWnd::Slot15(int, int) { - UIBitmapButton* base = new UIBitmapButton(*this->m_context); + UIBitmapButton* base = new UIBitmapButton(); 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); @@ -159,12 +159,12 @@ void UILapineBoxWnd::Slot15(int, int) { this->AddChild(base); this->AddCloseButton("", 0); - UILapineBox_IngredientListWnd* list = new UILapineBox_IngredientListWnd(*this->m_context, 150, 204); + UILapineBox_IngredientListWnd* list = new UILapineBox_IngredientListWnd(150, 204); this->ingredientList = list; list->Move(241, 17); this->AddChild(list); - UIBitmapButton* cancel = new UIBitmapButton(*this->m_context); + UIBitmapButton* cancel = new UIBitmapButton(); this->cancelButton = cancel; cancel->SetBitmap("유저인터페이스\\lapine\\btn_cancel_out.bmp", 0, 0); cancel->SetBitmap("유저인터페이스\\lapine\\btn_cancel_over.bmp", 1, 0); @@ -175,7 +175,7 @@ void UILapineBoxWnd::Slot15(int, int) { cancel->SetId(201); this->AddChild(cancel); - UIBitmapButton* make = new UIBitmapButton(*this->m_context); + UIBitmapButton* make = new UIBitmapButton(); this->makeButton = make; make->SetBitmap("유저인터페이스\\lapine\\btn_make_out.bmp", 0, 0); make->SetBitmap("유저인터페이스\\lapine\\btn_make_over.bmp", 1, 0); @@ -186,7 +186,7 @@ void UILapineBoxWnd::Slot15(int, int) { make->SetId(503); this->AddChild(make); - UIBitmapButton* move = new UIBitmapButton(*this->m_context); + UIBitmapButton* move = new UIBitmapButton(); this->moveButton = move; move->SetBitmap("유저인터페이스\\lapine\\btn_moveitem_out.bmp", 0, 0); move->SetBitmap("유저인터페이스\\lapine\\btn_moveitem_over.bmp", 1, 0); @@ -210,7 +210,7 @@ void UILapineBox_IngredientListWnd::Slot15(int width, int height) { this->scrollBar = nullptr; } - UILapineScrollBar* bar = new UILapineScrollBar(*this->m_context); + UILapineScrollBar* bar = new UILapineScrollBar(); this->scrollBar = bar; bar->Configure(width - this->scrollBarWidth, 0, 1, height - this->scrollBarHeight); this->AddChild(this->scrollBar); @@ -358,7 +358,7 @@ unsigned char UILapineBox_IngredientListWnd::AddIngredient(std::uint32_t id) { } UILapineBoxWnd* owner = static_cast(this->parent); - UIIngredientInfoWnd* info = new UIIngredientInfoWnd(*this->m_context); + UIIngredientInfoWnd* info = new UIIngredientInfoWnd(); info->SetSize(136, 30); info->sub_6028C0(id); info->quantity = it->quantity; @@ -381,7 +381,7 @@ unsigned char UILapineBox_IngredientListWnd::AddIngredient(std::uint32_t id) { // OFFSET: 0x005FF210 // FUNCTION: fn_04141 -UILapineScrollBar::UILapineScrollBar(UIWindowContext& windows) : UIScrollBar(windows) { +UILapineScrollBar::UILapineScrollBar() : UIScrollBar() { this->arrowLength = 0; } diff --git a/Source/UI/UILapineScrollBar.h b/Source/UI/UILapineScrollBar.h index a8191b7c..1dd759c0 100644 --- a/Source/UI/UILapineScrollBar.h +++ b/Source/UI/UILapineScrollBar.h @@ -18,15 +18,15 @@ class UILapineBoxWnd; class UILapineScrollBar : public UIScrollBar { public: - explicit UILapineScrollBar(UIWindowContext& windows); + UILapineScrollBar(); void Paint() override; }; class UILapineUpgradeBox_IngredientListWnd : public UIScrollWnd { public: // INLINED - UILapineUpgradeBox_IngredientListWnd(UIWindowContext& windows, int width, int height) - : UIScrollWnd(windows, width, height, 0), minRefine(0), maxRefine(20) { + UILapineUpgradeBox_IngredientListWnd(int width, int height) + : UIScrollWnd(width, height, 0), minRefine(0), maxRefine(20) { this->UIWindow::Resize(width, height); this->Slot15(width, height); } @@ -58,7 +58,7 @@ class UILapineBox_IngredientListWnd : public UIScrollWnd { friend class UILapineBoxWnd; public: - UILapineBox_IngredientListWnd(UIWindowContext& windows, int width, int height); + UILapineBox_IngredientListWnd(int width, int height); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; void Slot35(int argument) override; diff --git a/Source/UI/UILapineUpgradeBoxWnd.cpp b/Source/UI/UILapineUpgradeBoxWnd.cpp index 69d994ab..36e35c60 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.cpp +++ b/Source/UI/UILapineUpgradeBoxWnd.cpp @@ -49,15 +49,15 @@ namespace { // OFFSET: 0x00602D30 // FUNCTION: fn_04187 -UILapineUpgradeBoxWnd::UILapineUpgradeBoxWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), closeButton(nullptr), upgradeButton(nullptr), selectButton(nullptr), ingredientList(nullptr), ingredientId(0), +UILapineUpgradeBoxWnd::UILapineUpgradeBoxWnd() + : UIFrameWnd(0), closeButton(nullptr), upgradeButton(nullptr), selectButton(nullptr), ingredientList(nullptr), ingredientId(0), noticeTick(0), noticeDuration(3000), waiting(0) { } // OFFSET: 0x00602E60 // FUNCTION: fn_04188 -UILapineUpgradeBox_IngredientInfoWnd::UILapineUpgradeBox_IngredientInfoWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), selected(0), quantity(0) { +UILapineUpgradeBox_IngredientInfoWnd::UILapineUpgradeBox_IngredientInfoWnd() + : UIFrameWnd(0), selected(0), quantity(0) { } // INLINED @@ -80,11 +80,11 @@ void UILapineUpgradeBoxWnd::Slot15(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->ingredientList = new UILapineUpgradeBox_IngredientListWnd(*this->m_context, 150, 204); + this->ingredientList = new UILapineUpgradeBox_IngredientListWnd(150, 204); this->ingredientList->Move(241, 17); this->AddChild(this->ingredientList); - this->closeButton = new UIBitmapButton(*this->m_context); + this->closeButton = new UIBitmapButton(); this->closeButton->SetBitmap("유저인터페이스\\lapine\\btn_cancel_out.bmp", 0, 0); this->closeButton->SetBitmap("유저인터페이스\\lapine\\btn_cancel_over.bmp", 1, 0); this->closeButton->SetBitmap("유저인터페이스\\lapine\\btn_cancel_press.bmp", 2, 0); @@ -94,7 +94,7 @@ void UILapineUpgradeBoxWnd::Slot15(int, int) { this->closeButton->SetId(201); this->AddChild(this->closeButton); - this->upgradeButton = new UIBitmapButton(*this->m_context); + this->upgradeButton = new UIBitmapButton(); this->upgradeButton->SetBitmap("유저인터페이스\\lapine\\btn_make_out.bmp", 0, 0); this->upgradeButton->SetBitmap("유저인터페이스\\lapine\\btn_make_over.bmp", 1, 0); this->upgradeButton->SetBitmap("유저인터페이스\\lapine\\btn_make_press.bmp", 2, 0); @@ -104,7 +104,7 @@ void UILapineUpgradeBoxWnd::Slot15(int, int) { this->upgradeButton->SetId(509); this->AddChild(this->upgradeButton); - this->selectButton = new UIBitmapButton(*this->m_context); + this->selectButton = new UIBitmapButton(); this->selectButton->SetBitmap("유저인터페이스\\lapine\\btn_moveitem_out.bmp", 0, 0); this->selectButton->SetBitmap("유저인터페이스\\lapine\\btn_moveitem_over.bmp", 1, 0); this->selectButton->SetBitmap("유저인터페이스\\lapine\\btn_moveitem_press.bmp", 2, 0); @@ -125,7 +125,7 @@ void UILapineUpgradeBox_IngredientListWnd::Slot15(int width, int height) { this->scrollBar = nullptr; } - this->scrollBar = new UILapineScrollBar(*this->m_context); + this->scrollBar = new UILapineScrollBar(); this->scrollBar->Configure(width - this->scrollBarWidth, 0, 1, height - this->scrollBarHeight); this->AddChild(this->scrollBar); } @@ -517,7 +517,7 @@ bool UILapineUpgradeBox_IngredientListWnd::AddIngredient(std::uint32_t identity) } } auto* owner = static_cast(this->parent); - auto* entry = new UILapineUpgradeBox_IngredientInfoWnd(*this->m_context); + auto* entry = new UILapineUpgradeBox_IngredientInfoWnd(); entry->SetSize(136, 30); entry->SetItem(identity); entry->quantity = 1; diff --git a/Source/UI/UILapineUpgradeBoxWnd.h b/Source/UI/UILapineUpgradeBoxWnd.h index d7878204..667feba4 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.h +++ b/Source/UI/UILapineUpgradeBoxWnd.h @@ -12,7 +12,7 @@ class UILapineUpgradeBox_IngredientListWnd; class UILapineUpgradeBox_IngredientInfoWnd : public UIFrameWnd { public: - UILapineUpgradeBox_IngredientInfoWnd(UIWindowContext& windows); + UILapineUpgradeBox_IngredientInfoWnd(); void Move(int x, int y) override; void Slot10(int x, int y, std::intptr_t value) override; @@ -38,7 +38,7 @@ class UILapineUpgradeBoxWnd : public UIFrameWnd { friend class UILapineUpgradeBox_IngredientListWnd; public: - UILapineUpgradeBoxWnd(UIWindowContext& windows); + UILapineUpgradeBoxWnd(); ~UILapineUpgradeBoxWnd() override; void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; diff --git a/Source/UI/UIMacroBlackListCheckWnd.cpp b/Source/UI/UIMacroBlackListCheckWnd.cpp index 8b5f1af3..0112b613 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.cpp +++ b/Source/UI/UIMacroBlackListCheckWnd.cpp @@ -28,8 +28,8 @@ namespace { // OFFSET: 0x007EB0A0 // FUNCTION: fn_09792 -UIMacroBlackListCheckWnd::UIMacroBlackListCheckWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), digitButtons(), resetButton(nullptr), +UIMacroBlackListCheckWnd::UIMacroBlackListCheckWnd() + : UIFrameWnd(0), digitButtons(), resetButton(nullptr), unknown_00E4(0), inputLength(0), input(), code(), charSizes(), charFlags(), charColors(), duration(0), startTick(0) {} // OFFSET: 0x007EB230 @@ -44,7 +44,7 @@ void UIMacroBlackListCheckWnd::Slot15(int width, int height) { std::string directory; - this->okButton = new UIBitmapButton(*this->m_context); + this->okButton = new UIBitmapButton(); this->okButton->SetBitmap("유저인터페이스\\btn_big_ok.bmp", 0, 0); this->okButton->SetBitmap("유저인터페이스\\btn_big_ok_a.bmp", 1, 0); this->okButton->SetBitmap("유저인터페이스\\btn_big_ok_b.bmp", 2, 0); @@ -70,7 +70,7 @@ void UIMacroBlackListCheckWnd::Slot15(int width, int height) { for (int i = 0; i < 10; ++i) { const int digit = this->digits[i]; UIBitmapButton*& button = this->digitButtons[i]; - button = new UIBitmapButton(*this->m_context); + button = new UIBitmapButton(); button->SetBitmap((directory + names[digit][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((directory + names[digit][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((directory + names[digit][2] + ".bmp").c_str(), 2, 0); @@ -80,7 +80,7 @@ void UIMacroBlackListCheckWnd::Slot15(int width, int height) { this->AddChild(button); } - this->resetButton = new UIBitmapButton(*this->m_context); + this->resetButton = new UIBitmapButton(); this->resetButton->SetBitmap((directory + names[10][0] + ".bmp").c_str(), 0, 0); this->resetButton->SetBitmap((directory + names[10][1] + ".bmp").c_str(), 1, 0); this->resetButton->SetBitmap((directory + names[10][2] + ".bmp").c_str(), 2, 0); diff --git a/Source/UI/UIMacroBlackListCheckWnd.h b/Source/UI/UIMacroBlackListCheckWnd.h index 54091095..990f990d 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.h +++ b/Source/UI/UIMacroBlackListCheckWnd.h @@ -9,7 +9,7 @@ class UIBitmapButton; class UIMacroBlackListCheckWnd : public UIFrameWnd { public: - UIMacroBlackListCheckWnd(UIWindowContext& windows); + UIMacroBlackListCheckWnd(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/UIMacroDetectorWnd.h b/Source/UI/UIMacroDetectorWnd.h index ea481522..f402d9d4 100644 --- a/Source/UI/UIMacroDetectorWnd.h +++ b/Source/UI/UIMacroDetectorWnd.h @@ -12,7 +12,7 @@ class UIBitmapButton; class UIMacroDetectorWnd : public UIFrameWnd { public: - UIMacroDetectorWnd(UIWindowContext& windows); + UIMacroDetectorWnd(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/UIMacroReport.cpp b/Source/UI/UIMacroReport.cpp index 4cedbefa..541ea0e0 100644 --- a/Source/UI/UIMacroReport.cpp +++ b/Source/UI/UIMacroReport.cpp @@ -143,7 +143,7 @@ CUIFrameWnd* CreateMacroReport() { // OFFSET: 0x00A44240 // FUNCTION: fn_16053 void CUIMacroReport::Slot15(int width, int height) { - this->m_background = new CUIStaticImage(*this->m_context); + this->m_background = new CUIStaticImage(); this->m_background->SetSize(231, 172); this->m_background->Move(0, 17); { @@ -157,7 +157,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->AddChild(this->m_background); - this->m_titleBar = new CUITitleBar(*this->m_context); + this->m_titleBar = new CUITitleBar(); this->m_titleBar->SetSize(231, 17); this->m_titleBar->Move(0, 0); { @@ -183,7 +183,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->AddChild(this->m_titleBar); - CUIStaticText* title = new CUIStaticText(*this->m_context); + CUIStaticText* title = new CUIStaticText(); title->SetSize(100, 17); title->Move(18, 0); { @@ -209,7 +209,7 @@ void CUIMacroReport::Slot15(int width, int height) { this->m_titleBar->titleText = title; this->m_titleBar->AddChild(title); - CUIImageButton* menuButton = new CUIImageButton(*this->m_context); + CUIImageButton* menuButton = new CUIImageButton(); menuButton->SetSize(11, 11); menuButton->Move(3, 3); menuButton->SetOnClick([this]() { this->OnButtonClick(); }); @@ -240,7 +240,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->m_titleBar->AddChild(menuButton); - CUIImageButton* closeButton = new CUIImageButton(*this->m_context); + CUIImageButton* closeButton = new CUIImageButton(); closeButton->SetSize(11, 11); closeButton->Move(217, 3); closeButton->SetOnClick([this]() { g_windowMgr.CloseWindow(10005); }); @@ -273,7 +273,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->m_titleBar->SetSecondButton(closeButton); - this->m_messageEdit = new CUIEditBox(*this->m_context); + this->m_messageEdit = new CUIEditBox(); this->m_messageEdit->SetSize(215, 58); this->m_messageEdit->Move(8, 80); { @@ -295,7 +295,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->AddChild(this->m_messageEdit); - this->unknown_00E4 = new CUIStaticText(*this->m_context); + this->unknown_00E4 = new CUIStaticText(); this->unknown_00E4->SetSize(165, 12); this->unknown_00E4->Move(28, 25); { @@ -322,7 +322,7 @@ void CUIMacroReport::Slot15(int width, int height) { this->unknown_00E4->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E4); - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(165, 12); this->unknown_00E8->Move(28, 43); { @@ -349,7 +349,7 @@ void CUIMacroReport::Slot15(int width, int height) { this->unknown_00E8->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E8); - this->unknown_00EC = new CUIImageButton(*this->m_context); + this->unknown_00EC = new CUIImageButton(); this->unknown_00EC->SetSize(58, 20); this->unknown_00EC->Move(117, 165); this->unknown_00EC->SetOnClick([this]() { g_windowMgr.CloseWindow(10005); }); @@ -381,7 +381,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->AddChild(this->unknown_00EC); - this->unknown_00F0 = new CUIImageButton(*this->m_context); + this->unknown_00F0 = new CUIImageButton(); this->unknown_00F0->SetSize(58, 20); this->unknown_00F0->Move(55, 165); this->unknown_00F0->SetOnClick([this]() { this->SendReport(); }); @@ -413,7 +413,7 @@ void CUIMacroReport::Slot15(int width, int height) { } this->AddChild(this->unknown_00F0); - this->m_firstTypeButton = new CUIRadioButton(*this->m_context); + this->m_firstTypeButton = new CUIRadioButton(); this->m_firstTypeButton->SetSize(12, 12); this->m_firstTypeButton->Move(9, 25); this->m_firstTypeButton->SetOnSelect([this](CUIRadioButton* button) { this->OnReportTypeSelect(button); }); @@ -447,7 +447,7 @@ void CUIMacroReport::Slot15(int width, int height) { this->m_firstTypeButton->Invalidate(); this->AddChild(this->m_firstTypeButton); - this->m_secondTypeButton = new CUIRadioButton(*this->m_context); + this->m_secondTypeButton = new CUIRadioButton(); this->m_secondTypeButton->SetSize(12, 12); this->m_secondTypeButton->Move(9, 43); this->m_secondTypeButton->SetOnSelect([this](CUIRadioButton* button) { this->OnReportTypeSelect(button); }); @@ -481,7 +481,7 @@ void CUIMacroReport::Slot15(int width, int height) { this->m_secondTypeButton->Invalidate(); this->AddChild(this->m_secondTypeButton); - this->unknown_00FC = new CUIStaticText(*this->m_context); + this->unknown_00FC = new CUIStaticText(); this->unknown_00FC->SetSize(210, 13); this->unknown_00FC->Move(9, 142); { diff --git a/Source/UI/UIMacroUserInfoWnd.cpp b/Source/UI/UIMacroUserInfoWnd.cpp index e148487a..76945569 100644 --- a/Source/UI/UIMacroUserInfoWnd.cpp +++ b/Source/UI/UIMacroUserInfoWnd.cpp @@ -46,8 +46,8 @@ MacroReporterEntry::MacroReporterEntry(std::string name, int id, short unknown_0 // OFFSET: 0x007EEA00 // FUNCTION: fn_09832 -UIMacroReporterWnd::UIMacroReporterWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_scrollBar(nullptr), m_scrollable(false), unknown_00C8(13), m_firstRow(0), m_visibleRows(10), unknown_00D4(nullptr), +UIMacroReporterWnd::UIMacroReporterWnd() + : UIFrameWnd(0), m_scrollBar(nullptr), m_scrollable(false), unknown_00C8(13), m_firstRow(0), m_visibleRows(10), unknown_00D4(nullptr), m_reportButton(nullptr), m_mode(0), m_edit(nullptr), unknown_00F4(1), unknown_00F8(5), m_state(nullptr), unknown_010C(false) { this->m_tabs[0] = nullptr; this->m_tabs[1] = nullptr; @@ -60,8 +60,8 @@ UIMacroReporterWnd::UIMacroReporterWnd(UIWindowContext& windows) // OFFSET: 0x007EEBC0 // FUNCTION: fn_09833 -UIMacroUserInfoWnd::UIMacroUserInfoWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIMacroUserInfoWnd::UIMacroUserInfoWnd() + : UIFrameWnd(0) { } // OFFSET: 0x007EF2C0 @@ -129,7 +129,7 @@ void UIMacroReporterWnd::sub_7EF430(int aid, std::string name) { this->AddChild(btn1); std::string truncated = this->sub_7EF680(0x8E, name.c_str(), 0, 13, 0); - auto* btn2 = new UITextButton(*this->m_context); + auto* btn2 = new UITextButton(); btn2->Configure("", 0, 0, 13, 0, 1); static_cast(btn2)->m_hoverColor = 0x2D2D2D; btn2->label = truncated; @@ -448,11 +448,11 @@ void UIMacroReporterWnd::Slot15(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(186, 56, 1, 216); this->AddChild(this->m_scrollBar); - UICheckBox* check = new UICheckBox(*this->m_context); + UICheckBox* check = new UICheckBox(); this->unknown_00D4 = check; check->SetSize(42, 20); check->SetBitmaps("유저인터페이스\\btn_q_active_a.bmp", "유저인터페이스\\btn_q_active.bmp"); @@ -460,7 +460,7 @@ void UIMacroReporterWnd::Slot15(int, int) { check->SetChecked(0); this->AddChild(check); - UIBitmapButton* report = new UIBitmapButton(*this->m_context); + UIBitmapButton* report = new UIBitmapButton(); this->m_reportButton = report; report->SetBitmap("유저인터페이스\\btn_ok.bmp", 0, 0); report->SetBitmap("유저인터페이스\\btn_ok_a.bmp", 1, 0); @@ -476,7 +476,7 @@ void UIMacroReporterWnd::Slot15(int, int) { int index = 0; for (; index < 2; ++index) { - UIRadioBtn* tab = new UIRadioBtn(*this->m_context); + UIRadioBtn* tab = new UIRadioBtn(); this->m_tabs[index] = tab; tab->SetSize(50, 12); tab->Move(14 + index * 55, 31); @@ -490,7 +490,7 @@ void UIMacroReporterWnd::Slot15(int, int) { this->AddChild(tab); } for (; index < 4; ++index) { - UIRadioBtn* tab = new UIRadioBtn(*this->m_context); + UIRadioBtn* tab = new UIRadioBtn(); this->m_tabs[index] = tab; tab->SetSize(50, 12); tab->Move(70 + index * 30, 31); diff --git a/Source/UI/UIMacroUserInfoWnd.h b/Source/UI/UIMacroUserInfoWnd.h index 65f1eb18..743968b8 100644 --- a/Source/UI/UIMacroUserInfoWnd.h +++ b/Source/UI/UIMacroUserInfoWnd.h @@ -12,7 +12,7 @@ class UIScrollBar; class UIMacroUserInfoWnd : public UIFrameWnd { public: - UIMacroUserInfoWnd(UIWindowContext& windows); + UIMacroUserInfoWnd(); bool Slot08() override; void Slot15(int width, int height) override; void Paint() override; @@ -46,7 +46,7 @@ struct MacroReporterState { class UIMacroReporterWnd : public UIFrameWnd { public: - UIMacroReporterWnd(UIWindowContext& windows); + UIMacroReporterWnd(); void Slot11() override; void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/UIPreviewEquipWnd.cpp b/Source/UI/UIPreviewEquipWnd.cpp index f10894bc..96387d68 100644 --- a/Source/UI/UIPreviewEquipWnd.cpp +++ b/Source/UI/UIPreviewEquipWnd.cpp @@ -20,8 +20,8 @@ // OFFSET: 0x007F2F90 // FUNCTION: fn_09879 -UIPreviewEquipWnd::UIPreviewEquipWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 1), saved(nullptr), m_render(nullptr), m_leftButton(nullptr), m_rightButton(nullptr), unknown_00C4(0) { +UIPreviewEquipWnd::UIPreviewEquipWnd() + : UIFrameWnd(1), saved(nullptr), m_render(nullptr), m_leftButton(nullptr), m_rightButton(nullptr), unknown_00C4(0) { } // OFFSET: 0x007F3090 @@ -76,7 +76,7 @@ void UIPreviewEquipWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - UIStaticText* shadow = new UIStaticText(*this->m_context); + UIStaticText* shadow = new UIStaticText(); shadow->SetSize( this->TextWidth(LookupMessage(0xB90), 0, 0, 12, 0, 0), this->TextHeight(LookupMessage(0xB90), 0, 0, 12, 0, 0) @@ -86,7 +86,7 @@ void UIPreviewEquipWnd::Slot15(int width, int height) { shadow->Move(19, 4); this->AddChild(shadow); - UIStaticText* title = new UIStaticText(*this->m_context); + UIStaticText* title = new UIStaticText(); title->SetSize( this->TextWidth(LookupMessage(0xB90), 0, 0, 12, 0, 0), this->TextHeight(LookupMessage(0xB90), 0, 0, 12, 0, 0) @@ -102,7 +102,7 @@ void UIPreviewEquipWnd::Slot15(int width, int height) { this->m_render = new CCharacterRender(width, height); this->SyncFromPlayer(); - this->m_leftButton = new UIBitmapButton(*this->m_context); + this->m_leftButton = new UIBitmapButton(); this->m_leftButton->SetBitmap("유저인터페이스\\equip_preview\\chr_arrow_rotate_l_out.bmp", 0, 0); this->m_leftButton->SetBitmap("유저인터페이스\\equip_preview\\chr_arrow_rotate_l_over.bmp", 1, 0); this->m_leftButton->SetBitmap("유저인터페이스\\equip_preview\\chr_arrow_rotate_l_press.bmp", 2, 0); @@ -111,7 +111,7 @@ void UIPreviewEquipWnd::Slot15(int width, int height) { this->m_leftButton->SetId(0x180); this->AddChild(this->m_leftButton); - this->m_rightButton = new UIBitmapButton(*this->m_context); + this->m_rightButton = new UIBitmapButton(); this->m_rightButton->SetBitmap("유저인터페이스\\equip_preview\\chr_arrow_rotate_r_out.bmp", 0, 0); this->m_rightButton->SetBitmap("유저인터페이스\\equip_preview\\chr_arrow_rotate_r_over.bmp", 1, 0); this->m_rightButton->SetBitmap("유저인터페이스\\equip_preview\\chr_arrow_rotate_r_press.bmp", 2, 0); @@ -120,7 +120,7 @@ void UIPreviewEquipWnd::Slot15(int width, int height) { this->m_rightButton->SetId(0x181); this->AddChild(this->m_rightButton); - this->unknown_00C4 = new UIBasicButton(*this->m_context); + this->unknown_00C4 = new UIBasicButton(); this->unknown_00C4->Configure(80, LookupMessage(0xB9F)); this->unknown_00C4->Move(static_cast((this->geometry.width - this->unknown_00C4->geometry.width) * 0.5), this->geometry.height - 30); this->unknown_00C4->SetId(0x16B); diff --git a/Source/UI/UIPreviewEquipWnd.h b/Source/UI/UIPreviewEquipWnd.h index 06b6a06a..015545ca 100644 --- a/Source/UI/UIPreviewEquipWnd.h +++ b/Source/UI/UIPreviewEquipWnd.h @@ -10,7 +10,7 @@ struct PreviewEquipWndInfo; class UIPreviewEquipWnd : public UIFrameWnd { public: - UIPreviewEquipWnd(UIWindowContext& windows); + UIPreviewEquipWnd(); ~UIPreviewEquipWnd() override; void Slot11() override; void Paint() override; diff --git a/Source/UI/UIRefiningWnd.cpp b/Source/UI/UIRefiningWnd.cpp index 73a3f974..26b582f6 100644 --- a/Source/UI/UIRefiningWnd.cpp +++ b/Source/UI/UIRefiningWnd.cpp @@ -52,8 +52,8 @@ struct RefiningClosePacket { // OFFSET: 0x007F4920 // FUNCTION: fn_09890 -UIRefiningWnd::UIRefiningWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), refiningButton(nullptr), returnButton(nullptr), +UIRefiningWnd::UIRefiningWnd() + : UIFrameWnd(0), refiningButton(nullptr), returnButton(nullptr), unknown_00C0(nullptr), state(0), result(7), frameInterval(100), stateTick(0), frame(0), selectedMaterial(-1), materials(), catalystEnabled(0), catalystItemId(0), catalystCount(0), item(0), unknown_01F0(0), nextMaterials(), nextCatalystCount(0), nextItem(0) { this->catalystItemId = 6635; @@ -61,17 +61,17 @@ UIRefiningWnd::UIRefiningWnd(UIWindowContext& windows) // OFFSET: 0x007F4A70 // FUNCTION: fn_09891 -UIRefining_BtnAgain::UIRefining_BtnAgain(UIWindowContext& windows) : UIBitmapButton(windows), cost(0) { +UIRefining_BtnAgain::UIRefining_BtnAgain() : UIBitmapButton(), cost(0) { } // OFFSET: 0x007F4AD0 // FUNCTION: fn_09892 -UIRefining_BtnRefining::UIRefining_BtnRefining(UIWindowContext& windows) : UIBitmapButton(windows), cost(0) { +UIRefining_BtnRefining::UIRefining_BtnRefining() : UIBitmapButton(), cost(0) { } // OFFSET: 0x007F4B30 // FUNCTION: fn_09893 -UIRefining_BtnReturn::UIRefining_BtnReturn(UIWindowContext& windows) : UIBitmapButton(windows), highlighted(1) { +UIRefining_BtnReturn::UIRefining_BtnReturn() : UIBitmapButton(), highlighted(1) { } // OFFSET: 0x007F5E30 @@ -80,14 +80,14 @@ void UIRefiningWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - UIBasicButton* basic = new UIBasicButton(*this->m_context); + UIBasicButton* basic = new UIBasicButton(); basic->Configure(56, LookupMessage(218)); basic->Move(204, 322); basic->SetId(185); this->AddChild(basic); this->unknown_00C0 = basic; - this->refiningButton = new UIRefining_BtnRefining(*this->m_context); + this->refiningButton = new UIRefining_BtnRefining(); this->refiningButton->SetBitmap("유저인터페이스\\refining_renewal\\bt_refining_normal.bmp", 0, 0); this->refiningButton->SetBitmap("유저인터페이스\\refining_renewal\\bt_refining_normal.bmp", 1, 0); this->refiningButton->SetBitmap("유저인터페이스\\refining_renewal\\bt_refining_press.bmp", 2, 0); @@ -99,26 +99,26 @@ void UIRefiningWnd::Slot15(int width, int height) { this->refiningButton->Invalidate(); this->AddChild(this->refiningButton); - this->returnButton = new UIRefining_BtnReturn(*this->m_context); + this->returnButton = new UIRefining_BtnReturn(); this->returnButton->UpdateBitmaps(); this->returnButton->Move(20, 267); this->returnButton->SetId(519); this->returnButton->Enable(0); this->AddChild(this->returnButton); - this->againButton = new UIRefining_BtnAgain(*this->m_context); + this->againButton = new UIRefining_BtnAgain(); this->againButton->UpdateBitmaps(); this->againButton->Move(142, 267); this->againButton->SetId(520); this->againButton->Enable(0); this->AddChild(this->againButton); - this->notice = new UIRefining_Notice(*this->m_context); + this->notice = new UIRefining_Notice(); this->notice->SetSize(194, 22); this->notice->Move(6, 322); this->AddChild(this->notice); - UIBitmapButton* help = new UIBitmapButton(*this->m_context); + UIBitmapButton* help = new UIBitmapButton(); help->SetBitmap("유저인터페이스\\basic_interface\\btn_help_normal.bmp", 0, 0); help->SetBitmap("유저인터페이스\\basic_interface\\btn_help_over.bmp", 1, 0); help->SetBitmap("유저인터페이스\\basic_interface\\btn_help_pressed.bmp", 2, 0); diff --git a/Source/UI/UIRefiningWnd.h b/Source/UI/UIRefiningWnd.h index 01f7eed3..4ca242f0 100644 --- a/Source/UI/UIRefiningWnd.h +++ b/Source/UI/UIRefiningWnd.h @@ -24,7 +24,7 @@ static_assert(sizeof(RefiningMaterial) == 9); class UIRefining_BtnAgain : public UIBitmapButton { public: - UIRefining_BtnAgain(UIWindowContext& windows); + UIRefining_BtnAgain(); void Paint() override; void Enable(unsigned char value) override; void UpdateBitmaps(); @@ -36,7 +36,7 @@ public: class UIRefining_BtnRefining : public UIBitmapButton { public: - UIRefining_BtnRefining(UIWindowContext& windows); + UIRefining_BtnRefining(); void Paint() override; void Enable(unsigned char value) override; @@ -45,7 +45,7 @@ public: class UIRefining_BtnReturn : public UIBitmapButton { public: - UIRefining_BtnReturn(UIWindowContext& windows); + UIRefining_BtnReturn(); void Paint() override; void UpdateBitmaps(); @@ -55,8 +55,8 @@ public: class UIRefining_Notice : public UIStaticText { public: // INLINED - UIRefining_Notice(UIWindowContext& windows) - : UIStaticText(windows), savedHighlight(0), expireTick(0), autoShown(0), highlight(0) {} + UIRefining_Notice() + : UIStaticText(), savedHighlight(0), expireTick(0), autoShown(0), highlight(0) {} void Slot19() override; void Paint() override; void SetNotice(const char* value, int duration, unsigned char highlight); @@ -70,7 +70,7 @@ public: class UIRefiningWnd : public UIFrameWnd { public: - UIRefiningWnd(UIWindowContext& windows); + UIRefiningWnd(); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/UIReputeWnd.cpp b/Source/UI/UIReputeWnd.cpp index cfeb2b0f..dade0a76 100644 --- a/Source/UI/UIReputeWnd.cpp +++ b/Source/UI/UIReputeWnd.cpp @@ -35,8 +35,8 @@ CReputeMgr* Singleton::GetInstance() { // OFFSET: 0x0060EF80 // FUNCTION: fn_04309 -UIReputeWnd::UIReputeWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_groupCombo(nullptr), m_searchEdit(nullptr), +UIReputeWnd::UIReputeWnd() + : UIFrameWnd(0), m_groupCombo(nullptr), m_searchEdit(nullptr), m_perPage(8), m_page(1), m_pageCount(1), m_groupSelected(false), m_totalPoints(0), m_reputes() {} // OFFSET: 0x0060F170 @@ -51,7 +51,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_groupCombo = new UIComboBoxDefWnd(*this->m_context); + this->m_groupCombo = new UIComboBoxDefWnd(); this->m_groupCombo->dropdownHeight = 160; this->m_groupCombo->SetSize(122, 18); this->m_groupCombo->Move(8, 25); @@ -63,7 +63,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->m_groupCombo->borderBlue = 99; this->AddChild(this->m_groupCombo); - this->m_searchEdit = new UIEditCtrl(*this->m_context); + this->m_searchEdit = new UIEditCtrl(); this->m_searchEdit->SetSize(200, 18); this->m_searchEdit->Move(136, 25); this->m_searchEdit->maximum = 20; @@ -73,7 +73,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->m_searchEdit->flat = 0; this->AddChild(this->m_searchEdit); - UIBitmapButton* search = new UIBitmapButton(*this->m_context); + UIBitmapButton* search = new UIBitmapButton(); search->SetBitmap("유저인터페이스\\Reputation\\btn_search.bmp", 0, 0); search->SetBitmap("유저인터페이스\\Reputation\\btn_search_over.bmp", 1, 0); search->SetBitmap("유저인터페이스\\Reputation\\btn_search_press.bmp", 2, 0); @@ -85,7 +85,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->AddChild(search); this->m_message0 = 321; - this->m_prevButton = new UIBitmapButton(*this->m_context); + this->m_prevButton = new UIBitmapButton(); this->m_prevButton->SetBitmap("유저인터페이스\\Reputation\\arrow_prev.bmp", 0, 0); this->m_prevButton->SetBitmap("유저인터페이스\\Reputation\\arrow_prev.bmp", 1, 0); this->m_prevButton->SetBitmap("유저인터페이스\\Reputation\\arrow_prev.bmp", 2, 0); @@ -96,7 +96,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->m_prevButton->SetId(316); this->AddChild(this->m_prevButton); - this->m_nextButton = new UIBitmapButton(*this->m_context); + this->m_nextButton = new UIBitmapButton(); this->m_nextButton->SetBitmap("유저인터페이스\\Reputation\\arrow_next.bmp", 0, 0); this->m_nextButton->SetBitmap("유저인터페이스\\Reputation\\arrow_next.bmp", 1, 0); this->m_nextButton->SetBitmap("유저인터페이스\\Reputation\\arrow_next.bmp", 2, 0); @@ -107,7 +107,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->m_nextButton->SetId(317); this->AddChild(this->m_nextButton); - UIBasicButton* close = new UIBasicButton(*this->m_context); + UIBasicButton* close = new UIBasicButton(); close->Configure(42, LookupMessage(3045)); close->Move(589, 425); close->SetId(201); diff --git a/Source/UI/UIReputeWnd.h b/Source/UI/UIReputeWnd.h index 001c5392..14ead884 100644 --- a/Source/UI/UIReputeWnd.h +++ b/Source/UI/UIReputeWnd.h @@ -15,7 +15,7 @@ class UIEditCtrl; class UIReputeWnd : public UIFrameWnd { public: - UIReputeWnd(UIWindowContext& windows); + UIReputeWnd(); bool Slot02() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/UIRoundBoxTooltipWnd.cpp b/Source/UI/UIRoundBoxTooltipWnd.cpp index a43e9329..8ff48416 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.cpp +++ b/Source/UI/UIRoundBoxTooltipWnd.cpp @@ -19,10 +19,6 @@ #include #include -// INLINED -UIColoringTextViewer::UIColoringTextViewer(UIWindowContext& windows) : UIListBox(windows), color(0), lineLimit(0) { -} - // OFFSET: 0x0099A1F0 // FUNCTION: fn_13540 void UIRoundBoxTooltipWnd::Slot15(int width, int height) { @@ -30,7 +26,7 @@ void UIRoundBoxTooltipWnd::Slot15(int width, int height) { return; } - this->viewer = new UIColoringTextViewer(*this->m_context); + this->viewer = new UIColoringTextViewer(); this->viewer->Configure(4, 4, width - 6, height - 6, 0); unsigned red; diff --git a/Source/UI/UIRoundBoxTooltipWnd.h b/Source/UI/UIRoundBoxTooltipWnd.h index 3219bc7f..d545239d 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.h +++ b/Source/UI/UIRoundBoxTooltipWnd.h @@ -7,7 +7,6 @@ class UIColoringTextViewer : public UIListBox { public: UIColoringTextViewer(); - UIColoringTextViewer(UIWindowContext& windows); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -18,7 +17,7 @@ public: class UIRoundBoxTooltipWnd : public UIFrameWnd { public: - UIRoundBoxTooltipWnd(UIWindowContext& windows); + UIRoundBoxTooltipWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/UIScrollWnd.cpp b/Source/UI/UIScrollWnd.cpp index c96b4018..12c22726 100644 --- a/Source/UI/UIScrollWnd.cpp +++ b/Source/UI/UIScrollWnd.cpp @@ -14,8 +14,8 @@ // OFFSET: 0x009AC040 // FUNCTION: fn_13770 -UIScrollWnd::UIScrollWnd(UIWindowContext& windows, int width, int height, unsigned char cached) - : UIWindow(windows, cached), viewHeight(0), contentWidth(0), contentHeight(0), horizontalBar(nullptr), scrollBar(nullptr), +UIScrollWnd::UIScrollWnd(int width, int height, unsigned char cached) + : UIWindow(cached), viewHeight(0), contentWidth(0), contentHeight(0), horizontalBar(nullptr), scrollBar(nullptr), scrollBarWidth(13), scrollBarHeight(13), unknown_009C(0), scrollPosition(0), unknown_00A4(0), wheelScroll(0) { this->UIWindow::Resize(width, height); this->Slot15(width, height); @@ -268,10 +268,10 @@ RenderPrimitive* UIScrollWnd::BuildPrimitive(int x, int y, int sourceX, int sour // OFFSET: 0x009AD3A0 // FUNCTION: fn_13783 __declspec(noinline) void UIScrollWnd::Slot15(int width, int height) { - this->horizontalBar = new UIScrollBar(*this->m_context); + this->horizontalBar = new UIScrollBar(); this->horizontalBar->Configure(0, height - this->scrollBarHeight, 0, width - this->scrollBarWidth); this->AddChild(this->horizontalBar); - this->scrollBar = new UIScrollBar(*this->m_context); + this->scrollBar = new UIScrollBar(); this->scrollBar->Configure(width - this->scrollBarWidth, 0, 1, height - this->scrollBarHeight); this->AddChild(this->scrollBar); } diff --git a/Source/UI/UIScrollWnd.h b/Source/UI/UIScrollWnd.h index aa5ebd99..81d84539 100644 --- a/Source/UI/UIScrollWnd.h +++ b/Source/UI/UIScrollWnd.h @@ -11,7 +11,9 @@ class UIScrollBar; class UIScrollWnd : public UIWindow { public: - UIScrollWnd(UIWindowContext& windows, int width, int height, unsigned char cached); + UIScrollWnd(int width, int height, unsigned char cached); + UIScrollWnd(UIWindowContext&, int width, int height, unsigned char cached) : UIScrollWnd(width, height, cached) { + } ~UIScrollWnd() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; diff --git a/Source/UI/UISlotBitmap.cpp b/Source/UI/UISlotBitmap.cpp index cb3badc3..56c218e4 100644 --- a/Source/UI/UISlotBitmap.cpp +++ b/Source/UI/UISlotBitmap.cpp @@ -5,7 +5,7 @@ // FUNCTION: fn_10789 void UISlotBitmap::Slot15(int, int) { if (this->unknown_00B8 == 1) { - this->addButton = new UIBitmapButton(*this->m_context); + this->addButton = new UIBitmapButton(); this->addButton->SetBitmap("유저인터페이스\\select_character\\btn_add_out.bmp", 0, 0); this->addButton->SetBitmap("유저인터페이스\\select_character\\btn_add_over.bmp", 1, 0); this->addButton->SetBitmap("유저인터페이스\\select_character\\btn_add_press.bmp", 2, 0); @@ -64,7 +64,7 @@ int UISlotBitmap::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 // OFFSET: 0x008501D0 // FUNCTION: fn_10672 -UISlotBitmap::UISlotBitmap(UIWindowContext& windows, int slot) : UIStaticBitmap(windows) { +UISlotBitmap::UISlotBitmap(int slot) : UIStaticBitmap() { this->slot = slot; this->unknown_00B8 = 0; this->addButton = nullptr; @@ -72,7 +72,7 @@ UISlotBitmap::UISlotBitmap(UIWindowContext& windows, int slot) : UIStaticBitmap( // OFFSET: 0x00850240 // FUNCTION: fn_10673 -UISlotBitmap::UISlotBitmap(UIWindowContext& windows, int slot, unsigned char flag) : UIStaticBitmap(windows) { +UISlotBitmap::UISlotBitmap(int slot, unsigned char flag) : UIStaticBitmap() { this->slot = slot; this->unknown_00B8 = flag; this->addButton = nullptr; diff --git a/Source/UI/UISlotBitmap.h b/Source/UI/UISlotBitmap.h index 52221cb6..d0da7644 100644 --- a/Source/UI/UISlotBitmap.h +++ b/Source/UI/UISlotBitmap.h @@ -7,8 +7,8 @@ class UIBitmapButton; class UISlotBitmap : public UIStaticBitmap { public: - UISlotBitmap(UIWindowContext& windows, int slot); - UISlotBitmap(UIWindowContext& windows, int slot, unsigned char flag); + UISlotBitmap(int slot); + UISlotBitmap(int slot, unsigned char flag); void Slot15(int width, int height) override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; diff --git a/Source/UI/UIStaticBitmap.cpp b/Source/UI/UIStaticBitmap.cpp index 28e1b1c7..1a166cdd 100644 --- a/Source/UI/UIStaticBitmap.cpp +++ b/Source/UI/UIStaticBitmap.cpp @@ -8,8 +8,8 @@ // OFFSET: 0x00850430 // FUNCTION: fn_10676 -UIStaticBitmap::UIStaticBitmap(UIWindowContext& windows) - : UIWindow(windows, 0), tooltipX(0), tooltipY(-20), forwardHover(0) { +UIStaticBitmap::UIStaticBitmap() + : UIWindow(0), tooltipX(0), tooltipY(-20), forwardHover(0) { } // OFFSET: 0x00852F20 diff --git a/Source/UI/UIStaticBitmap.h b/Source/UI/UIStaticBitmap.h index 3099f1d6..7fd03e1b 100644 --- a/Source/UI/UIStaticBitmap.h +++ b/Source/UI/UIStaticBitmap.h @@ -9,7 +9,6 @@ class UIStaticBitmap : public UIWindow { public: UIStaticBitmap(); - UIStaticBitmap(UIWindowContext& windows); ~UIStaticBitmap() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/UIStaticItem.cpp b/Source/UI/UIStaticItem.cpp index 9a6f2d2d..f9df1419 100644 --- a/Source/UI/UIStaticItem.cpp +++ b/Source/UI/UIStaticItem.cpp @@ -2,8 +2,8 @@ // OFFSET: 0x0086E970 // FUNCTION: fn_11079 -UIStaticItem::UIStaticItem(UIWindowContext& windows, WindowManagerWindows& windowList) - : UIWindow(windows, 0), m_item(), m_windows(&windowList) { +UIStaticItem::UIStaticItem(WindowManagerWindows& windowList) + : UIWindow(0), m_item(), m_windows(&windowList) { } // OFFSET: 0x00871A00 diff --git a/Source/UI/UIStaticItem.h b/Source/UI/UIStaticItem.h index a8ed2cd9..f9b84579 100644 --- a/Source/UI/UIStaticItem.h +++ b/Source/UI/UIStaticItem.h @@ -8,7 +8,7 @@ class UIStaticItem : public UIWindow { public: - UIStaticItem(UIWindowContext& windows, WindowManagerWindows& windowList); + UIStaticItem(WindowManagerWindows& windowList); ~UIStaticItem() override; void Paint() override; void Slot28(int x, int y) override; diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.cpp b/Source/UI/Window/UIAccountLimitedToolWnd.cpp index 79a360b8..57a517dc 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.cpp +++ b/Source/UI/Window/UIAccountLimitedToolWnd.cpp @@ -58,7 +58,7 @@ void UIAccountLimitedToolWnd::Slot15(int, int) { {125, 121}, {160, 121}, {268, 121}, {305, 121}, {90, 151}, {240, 151}, {285, 151}, }; for (int i = 0; i < 15; ++i) { - this->m_edits[i] = new UIEditCtrl(*this->m_context); + this->m_edits[i] = new UIEditCtrl(); this->m_edits[i]->flat = 1; this->m_edits[i]->disabled = 1; this->m_edits[i]->Invalidate(); @@ -100,7 +100,7 @@ void UIAccountLimitedToolWnd::Slot15(int, int) { this->AddChild(this->m_edits[i]); } - this->m_accountIdText = new UIStaticText(*this->m_context); + this->m_accountIdText = new UIStaticText(); this->m_accountIdText->SetSize(200, 17); this->m_accountIdText->Move(90, 47); this->m_accountIdText->background = 0xFF969696; @@ -117,7 +117,7 @@ void UIAccountLimitedToolWnd::Slot15(int, int) { {"btn_deleteItem", "btn_deleteItem_a", "btn_deleteItem_b", "btn_deleteItem_c"}, }; for (int i = 0; i < 3; ++i) { - this->m_buttons[i] = new UIBitmapButton(*this->m_context); + this->m_buttons[i] = new UIBitmapButton(); this->m_buttons[i]->SetBitmap((prefix + buttonNames[i][0] + ".bmp").c_str(), 0, 0); this->m_buttons[i]->SetBitmap((prefix + buttonNames[i][1] + ".bmp").c_str(), 1, 0); this->m_buttons[i]->SetBitmap((prefix + buttonNames[i][2] + ".bmp").c_str(), 2, 0); @@ -131,7 +131,7 @@ void UIAccountLimitedToolWnd::Slot15(int, int) { this->m_buttons[i]->Invalidate(); } - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); const int buttonHeight = this->m_buttons[1]->geometry.height; this->m_viewer->Configure(10, buttonHeight + 189, this->geometry.width - 20, this->geometry.height - buttonHeight - 199, 0); this->m_viewer->backgroundColor = 0xFF969696; @@ -366,8 +366,8 @@ int UIAccountLimitedToolWnd::SendMsg(UIWindow* sender, int message, std::intptr_ // OFFSET: 0x00946800 // FUNCTION: fn_12846 -UIAccountLimitedToolWnd::UIAccountLimitedToolWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_accountIdText(nullptr), m_viewer(nullptr) { +UIAccountLimitedToolWnd::UIAccountLimitedToolWnd() + : UIFrameWnd(0), m_accountIdText(nullptr), m_viewer(nullptr) { SecureZeroMemory(this->m_edits, sizeof(this->m_edits)); SecureZeroMemory(this->m_buttons, sizeof(this->m_buttons)); } diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.h b/Source/UI/Window/UIAccountLimitedToolWnd.h index e4c52911..b323df91 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.h +++ b/Source/UI/Window/UIAccountLimitedToolWnd.h @@ -12,7 +12,7 @@ class UITextViewer; class UIAccountLimitedToolWnd : public UIFrameWnd { public: - UIAccountLimitedToolWnd(UIWindowContext& windows); + UIAccountLimitedToolWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIBalloonOpenBtn.cpp b/Source/UI/Window/UIBalloonOpenBtn.cpp index 428ced6c..f2a9b0f3 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.cpp +++ b/Source/UI/Window/UIBalloonOpenBtn.cpp @@ -31,8 +31,8 @@ void UIBalloonOpenBtn::Slot19() { // OFFSET: 0x009468D0 // FUNCTION: fn_12847 -UIBalloonOpenBtn::UIBalloonOpenBtn(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_openTime(0), m_openDelay(4000), m_balloonId(0), m_balloon(nullptr), m_button(nullptr) { +UIBalloonOpenBtn::UIBalloonOpenBtn() + : UIFrameWnd(0), m_openTime(0), m_openDelay(4000), m_balloonId(0), m_balloon(nullptr), m_button(nullptr) { } // OFFSET: 0x00950200 @@ -44,7 +44,7 @@ int UIBalloonOpenBtn::SendMsg(UIWindow* sender, int message, std::intptr_t argum } if (this->m_balloon == nullptr) { - this->m_balloon = new UITransBalloonText(*this->m_context); + this->m_balloon = new UITransBalloonText(); this->m_balloon->SetSize(8, 8); g_windowMgr.AddRenderedFront(this->m_balloon); if (this->m_balloon == nullptr) { diff --git a/Source/UI/Window/UIBalloonOpenBtn.h b/Source/UI/Window/UIBalloonOpenBtn.h index 0766a958..60c708cd 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.h +++ b/Source/UI/Window/UIBalloonOpenBtn.h @@ -10,7 +10,7 @@ class UITransBalloonText; class UIBalloonOpenBtn : public UIFrameWnd { public: - UIBalloonOpenBtn(UIWindowContext& windows); + UIBalloonOpenBtn(); void Paint() override; void Slot15(int width, int height) override; void Slot19() override; diff --git a/Source/UI/Window/UIBank_NewWnd.h b/Source/UI/Window/UIBank_NewWnd.h index 2ceef025..731b3f70 100644 --- a/Source/UI/Window/UIBank_NewWnd.h +++ b/Source/UI/Window/UIBank_NewWnd.h @@ -7,7 +7,7 @@ class UIEditCtrl; class UIBank_NewWnd : public UIFrameWnd { public: - UIBank_NewWnd(UIWindowContext& windows); + UIBank_NewWnd(); bool Slot03() override; void Slot15(int width, int height) override; long long AdjustAmount(int amount); diff --git a/Source/UI/Window/UIBasicInfoWnd.cpp b/Source/UI/Window/UIBasicInfoWnd.cpp index e1c7ef04..fe811af6 100644 --- a/Source/UI/Window/UIBasicInfoWnd.cpp +++ b/Source/UI/Window/UIBasicInfoWnd.cpp @@ -53,7 +53,7 @@ std::int64_t JobExpMaximum() { // OFFSET: 0x00997250 // FUNCTION: fn_13484 -UIBasicInfoWnd::UIBasicInfoWnd(UIWindowContext& windowContext) : UIFrameWnd(windowContext, 0) { +UIBasicInfoWnd::UIBasicInfoWnd() : UIFrameWnd(0) { this->saved = nullptr; this->mode = 0; this->layoutOffset = 13; @@ -532,14 +532,14 @@ void UIBasicInfoWnd::Slot15(int width, int height) { UIBitmapButton* minimizeButton = this->AddMinimizeButton("Alt+V, Ctrl+V", 0); minimizeButton->Move(this->geometry.width - 14, 3); - this->nameText = new UIStaticText(*this->m_context); + this->nameText = new UIStaticText(); this->nameText->SetSize(this->geometry.width - 20, 15); this->nameText->Move(9, 23); this->nameText->SetTextFitted(g_session.DecodePlayerName()); this->nameText->SetFont(0, 12, 0, 0); this->AddChild(this->nameText); - UIBarGraphPlayer* hpBar = new UIBarGraphPlayer(*this->m_context); + UIBarGraphPlayer* hpBar = new UIBarGraphPlayer(); hpBar->SetValues( []() -> std::int64_t { return g_session.unknown_5568; }, []() -> std::int64_t { return g_session.unknown_556C; } @@ -549,7 +549,7 @@ void UIBasicInfoWnd::Slot15(int width, int height) { this->AddChild(hpBar); this->hpBar = hpBar; - UIBarGraphPlayer* spBar = new UIBarGraphPlayer(*this->m_context); + UIBarGraphPlayer* spBar = new UIBarGraphPlayer(); spBar->SetValues( []() -> std::int64_t { return *reinterpret_cast(&g_session.unknown_5570[0]); }, []() -> std::int64_t { return *reinterpret_cast(&g_session.unknown_5570[4]); } @@ -559,7 +559,7 @@ void UIBasicInfoWnd::Slot15(int width, int height) { this->AddChild(spBar); this->spBar = spBar; - UIBarGraphPlayerAP* apBar = new UIBarGraphPlayerAP(*this->m_context); + UIBarGraphPlayerAP* apBar = new UIBarGraphPlayerAP(); apBar->SetValues( []() -> std::int64_t { return g_session.GetTraitStat(232); }, []() -> std::int64_t { return g_session.GetTraitStat(233); } @@ -569,7 +569,7 @@ void UIBasicInfoWnd::Slot15(int width, int height) { this->AddChild(apBar); this->apBar = apBar; - UIINT64BarGraph* baseExpBar = new UIINT64BarGraph(*this->m_context); + UIINT64BarGraph* baseExpBar = new UIINT64BarGraph(); baseExpBar->m_plainColor = 1; baseExpBar->SetSize(112, 6); baseExpBar->Move(84, this->layoutOffset + 76); @@ -577,7 +577,7 @@ void UIBasicInfoWnd::Slot15(int width, int height) { this->AddChild(baseExpBar); this->baseExpBar = baseExpBar; - UIINT64BarGraph* jobExpBar = new UIINT64BarGraph(*this->m_context); + UIINT64BarGraph* jobExpBar = new UIINT64BarGraph(); jobExpBar->m_plainColor = 1; jobExpBar->SetSize(112, 6); jobExpBar->Move(84, this->layoutOffset + 86); diff --git a/Source/UI/Window/UIBasicInfoWnd.h b/Source/UI/Window/UIBasicInfoWnd.h index 3e3874aa..7a00aabc 100644 --- a/Source/UI/Window/UIBasicInfoWnd.h +++ b/Source/UI/Window/UIBasicInfoWnd.h @@ -8,7 +8,7 @@ class UIStaticText; class UIBasicInfoWnd : public UIFrameWnd { public: - UIBasicInfoWnd(UIWindowContext& windowContext); + UIBasicInfoWnd(); bool Slot03() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.cpp b/Source/UI/Window/UIBattleMsgOptionWnd.cpp index f7d2336e..eebce3a6 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.cpp +++ b/Source/UI/Window/UIBattleMsgOptionWnd.cpp @@ -32,7 +32,7 @@ void UIBattleMsgOptionWnd::Slot35(int delta) { // OFFSET: 0x00910C40 // FUNCTION: fn_12510 -UIBattleMsgOptionWnd::UIBattleMsgOptionWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIBattleMsgOptionWnd::UIBattleMsgOptionWnd() : UIFrameWnd(0) { this->unknown_00B8 = -1; this->messages.push_back(LookupMessage(0x50B)); @@ -71,7 +71,7 @@ UIBattleMsgOptionWnd::UIBattleMsgOptionWnd(UIWindowContext& windows) : UIFrameWn // OFFSET: 0x0091EC40 // FUNCTION: fn_12636 void UIBattleMsgOptionWnd::Slot15(int, int height) { - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->m_scrollBar); this->AddBaseButton(); diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.h b/Source/UI/Window/UIBattleMsgOptionWnd.h index 0a67b340..ab3c1cf0 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.h +++ b/Source/UI/Window/UIBattleMsgOptionWnd.h @@ -11,7 +11,7 @@ class UIScrollBar; class UIBattleMsgOptionWnd : public UIFrameWnd { public: - UIBattleMsgOptionWnd(UIWindowContext& windows); + UIBattleMsgOptionWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Window/UIChangeNameWnd.cpp index bfed233c..5cc25594 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Window/UIChangeNameWnd.cpp @@ -86,8 +86,8 @@ void UIChangeNameWnd::Slot15(int, int) { // OFFSET: 0x00911190 // FUNCTION: fn_12511 -UIChangeNameWnd::UIChangeNameWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIChangeNameWnd::UIChangeNameWnd() + : UIFrameWnd(0) { } // OFFSET: 0x00934A10 diff --git a/Source/UI/Window/UIChangeNameWnd.h b/Source/UI/Window/UIChangeNameWnd.h index 8c0dd2ea..9795196e 100644 --- a/Source/UI/Window/UIChangeNameWnd.h +++ b/Source/UI/Window/UIChangeNameWnd.h @@ -11,7 +11,7 @@ class UIBitmapEditCtrl; class UIChangeNameWnd : public UIFrameWnd { public: - UIChangeNameWnd(UIWindowContext& windows); + UIChangeNameWnd(); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UIChatRoomWnd.h b/Source/UI/Window/UIChatRoomWnd.h index 773ae5bf..ab3e3dac 100644 --- a/Source/UI/Window/UIChatRoomWnd.h +++ b/Source/UI/Window/UIChatRoomWnd.h @@ -18,7 +18,7 @@ class UIStaticText; class UIChatRoomWnd : public UIFrameWnd { public: - UIChatRoomWnd(UIWindowContext& windows); + UIChatRoomWnd(); void Move(int x, int y) override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UICntWnd.h b/Source/UI/Window/UICntWnd.h index 154a221a..b0dd602f 100644 --- a/Source/UI/Window/UICntWnd.h +++ b/Source/UI/Window/UICntWnd.h @@ -8,7 +8,7 @@ class UIStaticText; class UICntWnd : public UIFrameWnd { public: - UICntWnd(UIWindowContext& windows); + UICntWnd(); ~UICntWnd() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UICollectionSystemWnd.cpp b/Source/UI/Window/UICollectionSystemWnd.cpp index 5430f226..e67ae523 100644 --- a/Source/UI/Window/UICollectionSystemWnd.cpp +++ b/Source/UI/Window/UICollectionSystemWnd.cpp @@ -18,8 +18,8 @@ // OFFSET: 0x00910890 // FUNCTION: fn_12504 -CUICollectionSystemWnd::CUICollectionSystemWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_frameDelay(15), unknown_00B8(-1), unknown_00BC(0), +CUICollectionSystemWnd::CUICollectionSystemWnd() + : UIFrameWnd(0), m_frameDelay(15), unknown_00B8(-1), unknown_00BC(0), m_frame(0), m_lastFrame(-1), m_paused(false), m_lastTick(0) { this->m_action = static_cast(ResourceMgr::Instance().Load("collection_slotmachine.act")); this->m_sprite = static_cast(ResourceMgr::Instance().Load("collection_slotmachine.spr")); diff --git a/Source/UI/Window/UICollectionSystemWnd.h b/Source/UI/Window/UICollectionSystemWnd.h index 746b184f..40940723 100644 --- a/Source/UI/Window/UICollectionSystemWnd.h +++ b/Source/UI/Window/UICollectionSystemWnd.h @@ -10,7 +10,7 @@ class CSprRes; class CUICollectionSystemWnd : public UIFrameWnd { public: - CUICollectionSystemWnd(UIWindowContext& windows); + CUICollectionSystemWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot19() override; diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index 5d8645da..04c02689 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -226,22 +226,22 @@ CBitmapRes* CUIControl::LoadBitmapResource(const std::string& name, bool resolve } // INLINED -CUIControl::CUIControl(UIWindowContext& context) : UIWindow(context, 0), hitEnabled(1) { +CUIControl::CUIControl() : UIWindow(0), hitEnabled(1) { } // INLINED -__forceinline CUIButton::CUIButton(UIWindowContext& context) : CUIControl(context), state(0), disabled(0), tooltip(), unknown_00C4(nullptr), unknown_00EC(nullptr) { +__forceinline CUIButton::CUIButton() : CUIControl(), state(0), disabled(0), tooltip(), unknown_00C4(nullptr), unknown_00EC(nullptr) { } // OFFSET: 0x009BDF40 // FUNCTION: fn_13944 -__forceinline CUIImageButton::CUIImageButton(UIWindowContext& context) : CUIButton(context), images(), disabledImage(), transparent(0), imageNames(), disabledName() { +__forceinline CUIImageButton::CUIImageButton() : CUIButton(), images(), disabledImage(), transparent(0), imageNames(), disabledName() { } // OFFSET: 0x009BE480 // FUNCTION: fn_13948 -CUIVScrollBar::CUIVScrollBar(UIWindowContext& context) - : CUIControl(context), downButton(nullptr), thumb(nullptr), total(1), visible(1), step(1), position(0), maximum(0), trackLength(1), dragging(0), +CUIVScrollBar::CUIVScrollBar() + : CUIControl(), downButton(nullptr), thumb(nullptr), total(1), visible(1), step(1), position(0), maximum(0), trackLength(1), dragging(0), hidden(0), transparent(0), upButton(nullptr) { } @@ -1546,7 +1546,7 @@ void CUICheckBox::Slot31(int, int) { // OFFSET: 0x009E8430 // FUNCTION: fn_14492 -CUICheckBox::CUICheckBox(UIWindowContext& context) : CUIImageButton(context), checked(false), onCheck() { +CUICheckBox::CUICheckBox() : CUIImageButton(), checked(false), onCheck() { } // OFFSET: 0x009E89B0 @@ -1557,7 +1557,7 @@ bool CUIRadioItem::IsChecked() { // OFFSET: 0x009E7D60 // FUNCTION: fn_14486 -CUIImageTextButton::CUIImageTextButton(UIWindowContext& context) : CUITextButton(context), images(), disabledImage(), imageNames(), disabledName() { +CUIImageTextButton::CUIImageTextButton() : CUITextButton(), images(), disabledImage(), imageNames(), disabledName() { this->textColors[0] = 0; this->textColors[1] = 0; this->textColors[2] = 0; @@ -1749,7 +1749,7 @@ void CUIListBoxEx::AddNe } this->items.resize(count, nullptr); for (AdventureGuide::CUIItemInfo*& slot : this->items) { - AdventureGuide::CUIItemInfo* item = new AdventureGuide::CUIItemInfo(*this->m_context); + AdventureGuide::CUIItemInfo* item = new AdventureGuide::CUIItemInfo(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -1815,7 +1815,7 @@ void CUIListBoxEx: } this->items.resize(count, nullptr); for (AdventureGuide::CUIMonsterInfo*& slot : this->items) { - AdventureGuide::CUIMonsterInfo* item = new AdventureGuide::CUIMonsterInfo(*this->m_context); + AdventureGuide::CUIMonsterInfo* item = new AdventureGuide::CUIMonsterInfo(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -1881,7 +1881,7 @@ void CUIListBoxEx::Add } this->items.resize(count, nullptr); for (AdventureGuide::CUIQuestInfo*& slot : this->items) { - AdventureGuide::CUIQuestInfo* item = new AdventureGuide::CUIQuestInfo(*this->m_context); + AdventureGuide::CUIQuestInfo* item = new AdventureGuide::CUIQuestInfo(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -1947,7 +1947,7 @@ void CUIListBoxEx::AddNewItem } this->items.resize(count, nullptr); for (AdventureGuide::CUITabInfo*& slot : this->items) { - AdventureGuide::CUITabInfo* item = new AdventureGuide::CUITabInfo(*this->m_context); + AdventureGuide::CUITabInfo* item = new AdventureGuide::CUITabInfo(); item->SetSize(this->itemWidth, this->rowHeight); item->Show(0); CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); @@ -2631,8 +2631,8 @@ UIWindow* CUIControl::FindChildById(int id) { // OFFSET: 0x009BE300 // FUNCTION: fn_13947 -CUITextViewer::CUITextViewer(UIWindowContext& context) - : CUIControl(context), textX(0), textY(0), font(0), fontHeight(12), bold(false), textColor(0), unknown_0098(false), unknown_009C(0xFFFFFF), outline(false), +CUITextViewer::CUITextViewer() + : CUIControl(), textX(0), textY(0), font(0), fontHeight(12), bold(false), textColor(0), unknown_0098(false), unknown_009C(0xFFFFFF), outline(false), outlineColor(0xFFFFFF), lineSpacing(6), backgroundColor(0xFFFFFF), paddingLeft(3), paddingTop(3), paddingRight(3), paddingBottom(3), scrollBar(nullptr), padding(nullptr), lines(), contentHeight(0), childPositions() { } @@ -2724,32 +2724,32 @@ bool UnusedTrue9BD5C0() { // OFFSET: 0x009BD7D0 // FUNCTION: fn_13939 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x009BD990 // FUNCTION: fn_13940 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x009BDB50 // FUNCTION: fn_13941 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } // OFFSET: 0x009BDD10 // FUNCTION: fn_13942 template <> -CUIListBoxEx::CUIListBoxEx(UIWindowContext& context) - : CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), +CUIListBoxEx::CUIListBoxEx() + : CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast(-1)), unknown_00E0(1), rebind(0) { } @@ -2815,37 +2815,37 @@ namespace AdventureGuide { // OFFSET: 0x009D9150 // FUNCTION: fn_14276 -CUIItemInfo::CUIItemInfo(UIWindowContext& context) - : CUIListItem(context), unknown_00E8(), unknown_00F0(nullptr), unknown_00F4(nullptr), unknown_00F8(nullptr), itemId(-1), type(21), location(-1), +CUIItemInfo::CUIItemInfo() + : CUIListItem(), unknown_00E8(), unknown_00F0(nullptr), unknown_00F4(nullptr), unknown_00F8(nullptr), itemId(-1), type(21), location(-1), unknown_0108() { } // OFFSET: 0x009D92D0 // FUNCTION: fn_14278 -CUIMonsterInfo::CUIMonsterInfo(UIWindowContext& context) - : CUIListItem(context), unknown_00E8(nullptr), unknown_00EC(nullptr), unknown_00F0(nullptr), sprite(nullptr), action(nullptr) { +CUIMonsterInfo::CUIMonsterInfo() + : CUIListItem(), unknown_00E8(nullptr), unknown_00EC(nullptr), unknown_00F0(nullptr), sprite(nullptr), action(nullptr) { } // OFFSET: 0x009D9420 // FUNCTION: fn_14280 -CUIQuestInfo::CUIQuestInfo(UIWindowContext& context) - : CUIListItem(context), unknown_00E8(nullptr), unknown_00EC(nullptr), unknown_00F0(nullptr), unknown_00F4(nullptr), unknown_00F8(), questId(0) { +CUIQuestInfo::CUIQuestInfo() + : CUIListItem(), unknown_00E8(nullptr), unknown_00EC(nullptr), unknown_00F0(nullptr), unknown_00F4(nullptr), unknown_00F8(), questId(0) { } // OFFSET: 0x009D94D0 // FUNCTION: fn_14281 -CUISubTab::CUISubTab(UIWindowContext& context) : CUIListItem(context), unknown_00E8(nullptr), unknown_00EC(nullptr), id(0), unknown_00F4(0) { +CUISubTab::CUISubTab() : CUIListItem(), unknown_00E8(nullptr), unknown_00EC(nullptr), id(0), unknown_00F4(0) { } // OFFSET: 0x009D9550 // FUNCTION: fn_14282 -CUITab::CUITab(UIWindowContext& context) - : CUIListItem(context), unknown_00E8(nullptr), subTabs(nullptr), unknown_00F0(), type(7), page(nullptr), unknown_0110(0) { +CUITab::CUITab() + : CUIListItem(), unknown_00E8(nullptr), subTabs(nullptr), unknown_00F0(), type(7), page(nullptr), unknown_0110(0) { } // OFFSET: 0x009D9600 // FUNCTION: fn_14283 -CUITabInfo::CUITabInfo(UIWindowContext& context) : CUIListItem(context), unknown_00E8(nullptr), unknown_00EC(nullptr) { +CUITabInfo::CUITabInfo() : CUIListItem(), unknown_00E8(nullptr), unknown_00EC(nullptr) { } } @@ -3292,8 +3292,8 @@ void CUITabButton::Paint() { // OFFSET: 0x009EC430 // FUNCTION: fn_14559 -CUITextButton::CUITextButton(UIWindowContext& context) - : CUIButton(context), text(), displayText(), fullText(), fitText(false), orientation(0), horizontalAlign(0), verticalAlign(0), fontIndex(0), fontHeight(12), +CUITextButton::CUITextButton() + : CUIButton(), text(), displayText(), fullText(), fitText(false), orientation(0), horizontalAlign(0), verticalAlign(0), fontIndex(0), fontHeight(12), bold(0), textColors(), disabledTextColor(0x808080), shadow(0), shadowColor(0xFFFFFF), outline(0), outlineColor(0xFFFFFF), textX(0), textY(0), tooltipText() { this->textColors[0] = 0; @@ -3303,8 +3303,8 @@ CUITextButton::CUITextButton(UIWindowContext& context) // OFFSET: 0x009E1250 // FUNCTION: fn_14394 -CUIBasicButton::CUIBasicButton(UIWindowContext& context) - : CUITextButton(context), unknown_0190(0), defaultWidth(0), leftImages(), disabledLeft(), middleImages(), disabledMiddle(), rightImages(), +CUIBasicButton::CUIBasicButton() + : CUITextButton(), unknown_0190(0), defaultWidth(0), leftImages(), disabledLeft(), middleImages(), disabledMiddle(), rightImages(), disabledRight() { this->textColors[0] = 0; this->textColors[1] = 0; @@ -3314,11 +3314,11 @@ CUIBasicButton::CUIBasicButton(UIWindowContext& context) // OFFSET: 0x009E9F00 // FUNCTION: fn_14513 void CUITextViewer::Slot15(int width, int height) { - this->padding = new CUIPadding(*this->m_context); + this->padding = new CUIPadding(); this->padding->SetSize(width, height); this->AddChild(this->padding); - this->scrollBar = new CUIVScrollBar(*this->m_context); + this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); const std::function onChange = [this](int position) { int y = this->paddingTop; @@ -3548,35 +3548,35 @@ void CUIRegisterMgr::Load() { } // INLINED -CUIThumb::CUIThumb(UIWindowContext& context) - : CUIControl(context), top(), middle(), bottom(), dragOrigin(0), transparent(0), resizable(1), tooltip(), topName(), middleName(), bottomName(), onDrag() { +CUIThumb::CUIThumb() + : CUIControl(), top(), middle(), bottom(), dragOrigin(0), transparent(0), resizable(1), tooltip(), topName(), middleName(), bottomName(), onDrag() { } // INLINED -CUIVThumb::CUIVThumb(UIWindowContext& context) : CUIThumb(context) { +CUIVThumb::CUIVThumb() : CUIThumb() { } // INLINED -CUIHThumb::CUIHThumb(UIWindowContext& context) : CUIVThumb(context) { +CUIHThumb::CUIHThumb() : CUIVThumb() { } // OFFSET: 0x009EDBE0 // FUNCTION: fn_14596 void CUIHScrollBar::Slot15(int, int) { if (!this->upButton) { - this->upButton = new CUIImageButton(*this->m_context); + this->upButton = new CUIImageButton(); this->upButton->Show(0); this->upButton->SetOnClick([this]() { this->PageUp(); }); this->AddChild(this->upButton); } if (!this->downButton) { - this->downButton = new CUIImageButton(*this->m_context); + this->downButton = new CUIImageButton(); this->downButton->Show(0); this->downButton->SetOnClick([this]() { this->PageDown(); }); this->AddChild(this->downButton); } if (!this->thumb) { - this->thumb = new CUIHThumb(*this->m_context); + this->thumb = new CUIHThumb(); this->thumb->Show(0); const std::function onDrag = [this](int value) { this->Slot55(value); }; this->thumb->onDrag = onDrag; @@ -3588,19 +3588,19 @@ void CUIHScrollBar::Slot15(int, int) { // FUNCTION: fn_14706 void CUIVScrollBar::Slot15(int, int) { if (!this->upButton) { - this->upButton = new CUIImageButton(*this->m_context); + this->upButton = new CUIImageButton(); this->upButton->Show(0); this->upButton->SetOnClick([this]() { this->SetPosition(this->position - this->step); }); this->AddChild(this->upButton); } if (!this->downButton) { - this->downButton = new CUIImageButton(*this->m_context); + this->downButton = new CUIImageButton(); this->downButton->Show(0); this->downButton->SetOnClick([this]() { this->SetPosition(this->position + this->step); }); this->AddChild(this->downButton); } if (!this->thumb) { - this->thumb = new CUIVThumb(*this->m_context); + this->thumb = new CUIVThumb(); this->thumb->Show(0); const std::function onDrag = [this](int value) { this->Slot55(value); }; this->thumb->onDrag = onDrag; @@ -3610,8 +3610,8 @@ void CUIVScrollBar::Slot15(int, int) { // OFFSET: 0x009BE1A0 // FUNCTION: fn_13946 -CUIStaticText::CUIStaticText(UIWindowContext& context) - : CUIControl(context), unknown_0084(), unknown_0098(), unknown_00B0(), scrollBar(nullptr), unknown_00C4(), fitText(false), horizontalAlign(0), +CUIStaticText::CUIStaticText() + : CUIControl(), unknown_0084(), unknown_0098(), unknown_00B0(), scrollBar(nullptr), unknown_00C4(), fitText(false), horizontalAlign(0), verticalAlign(0), fontIndex(0), fontHeight(12), bold(0), color(0), shadow(false), shadowColor(0xFFFFFF), outline(false), outlineColor(0xFFFFFF), textX(0), textY(0), text() { new (&this->Tooltip()) std::string(); @@ -3626,7 +3626,7 @@ CUIListItem::~CUIListItem() { // OFFSET: 0x009EFC30 // FUNCTION: fn_14653 -CUIListItem::CUIListItem(UIWindowContext& context) : CUIControl(context), unknown_0084(), selected(0), disabledImage(nullptr), frozen(0), index(-1), onHover(), onPress() { +CUIListItem::CUIListItem() : CUIControl(), unknown_0084(), selected(0), disabledImage(nullptr), frozen(0), index(-1), onHover(), onPress() { new (&this->Images()) std::map(); this->Images()[0] = nullptr; this->Images()[1] = nullptr; diff --git a/Source/UI/Window/UIControl.h b/Source/UI/Window/UIControl.h index b95b6055..89fe212b 100644 --- a/Source/UI/Window/UIControl.h +++ b/Source/UI/Window/UIControl.h @@ -58,7 +58,7 @@ class CUIControl : public UIWindow { public: __declspec(noinline) CBitmapRes* LoadBitmapResource(const std::string& name, bool resolveSkin); - explicit CUIControl(UIWindowContext& context); + CUIControl(); ~CUIControl() override; bool CanHitTest() override; void Slot10(int x, int y, std::intptr_t value) override; @@ -86,7 +86,7 @@ class CUITabButton; class CUITab : public CUIControl { public: - __declspec(noinline) explicit CUITab(UIWindowContext& context); + __declspec(noinline) CUITab(); void Paint() override; @@ -104,7 +104,7 @@ public: class CUIButton : public CUIControl { public: - explicit CUIButton(UIWindowContext& context); + CUIButton(); ~CUIButton() override; void Slot25(int x, int y) override; void Slot28(int x, int y) override; @@ -129,7 +129,7 @@ public: class CUITextButton : public CUIButton { public: - explicit CUITextButton(UIWindowContext& context); + CUITextButton(); ~CUITextButton() override; void Slot28(int x, int y) override; void Paint() override; @@ -173,7 +173,7 @@ public: class CUIImageTextButton : public CUITextButton { public: - explicit CUIImageTextButton(UIWindowContext& context); + CUIImageTextButton(); ~CUIImageTextButton() override; void Paint() override; void Slot53(int resolveSkin) override; @@ -189,7 +189,7 @@ public: class CUIBasicButton : public CUITextButton { public: - explicit CUIBasicButton(UIWindowContext& context); + CUIBasicButton(); ~CUIBasicButton() override; void Resize(int width, int height) override; void Paint() override; @@ -211,7 +211,7 @@ public: class CUITabButton : public CUIImageTextButton { public: - explicit CUITabButton(UIWindowContext& context); + CUITabButton(); void Slot25(int x, int y) override; void Slot31(int x, int y) override; void Slot47() override; @@ -235,7 +235,7 @@ public: class CUIImageButton : public CUIButton { public: - explicit CUIImageButton(UIWindowContext& context); + CUIImageButton(); ~CUIImageButton() override; void Paint() override; void Slot53(int resolveSkin) override; @@ -253,7 +253,7 @@ class CUIStaticImage : public CUIControl { public: // OFFSET: 0x009BE0C0 // FUNCTION: fn_13945 - explicit CUIStaticImage(UIWindowContext& context) : CUIControl(context), image(), tooltip(), transparent(0), scale(100), imageName() { + explicit CUIStaticImage() : CUIControl(), image(), tooltip(), transparent(0), scale(100), imageName() { } void Paint() override; @@ -272,8 +272,8 @@ public: class CUITitleBar : public CUIControl { public: // INLINED - explicit CUITitleBar(UIWindowContext& context) - : CUIControl(context), resizable(1), left(), middle(), right(), leftName(), middleName(), rightName(), unknown_00D8(), titleText(nullptr), + explicit CUITitleBar() + : CUIControl(), resizable(1), left(), middle(), right(), leftName(), middleName(), rightName(), unknown_00D8(), titleText(nullptr), firstButton(nullptr), secondButton(nullptr) { } @@ -303,8 +303,8 @@ class CUIEditCtrl; class CUIEditBox : public CUIControl { public: // INLINED - explicit CUIEditBox(UIWindowContext& context) - : CUIControl(context), backgroundColor(0xF7F7F7), borderColor(0xC6C6C6), borderWidth(1), editLeft(0), editTop(0), editRight(0), editBottom(0), + explicit CUIEditBox() + : CUIControl(), backgroundColor(0xF7F7F7), borderColor(0xC6C6C6), borderWidth(1), editLeft(0), editTop(0), editRight(0), editBottom(0), edit(nullptr), onSubmit() { } @@ -334,8 +334,8 @@ public: class CUIResizer : public CUIControl { public: // INLINED - explicit CUIResizer(UIWindowContext& context) - : CUIControl(context), minWidth(0), minHeight(0), maxWidth(0), maxHeight(0), stepX(1), stepY(1), startX(0), startY(0), startWidth(0), startHeight(0), + explicit CUIResizer() + : CUIControl(), minWidth(0), minHeight(0), maxWidth(0), maxHeight(0), stepX(1), stepY(1), startX(0), startY(0), startWidth(0), startHeight(0), deltaX(0), deltaY(0), imageName(), onResize(), image() { } diff --git a/Source/UI/Window/UIDebuffRemoveWnd.cpp b/Source/UI/Window/UIDebuffRemoveWnd.cpp index 3315ecd4..d14b2a96 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.cpp +++ b/Source/UI/Window/UIDebuffRemoveWnd.cpp @@ -55,6 +55,6 @@ int UIDebuffRemoveWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s // OFFSET: 0x00946970 // FUNCTION: fn_12848 -UIDebuffRemoveWnd::UIDebuffRemoveWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_button(nullptr) { +UIDebuffRemoveWnd::UIDebuffRemoveWnd() + : UIFrameWnd(0), m_button(nullptr) { } diff --git a/Source/UI/Window/UIDebuffRemoveWnd.h b/Source/UI/Window/UIDebuffRemoveWnd.h index cf81bf34..01850abd 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.h +++ b/Source/UI/Window/UIDebuffRemoveWnd.h @@ -7,7 +7,7 @@ class UIBasicButton; class UIDebuffRemoveWnd : public UIFrameWnd { public: - UIDebuffRemoveWnd(UIWindowContext& windows); + UIDebuffRemoveWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 71d755da..48d4e663 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -64,8 +64,8 @@ std::uint32_t g_monsterInfoActorId; // OFFSET: 0x008A3700 // FUNCTION: fn_11657 -UIFrameWnd::UIFrameWnd(UIWindowContext& windowContext, unsigned char cached) - : UIWindow(windowContext, cached), m_dragX(0), m_dragY(0), m_message0(600), m_message1(600) { +UIFrameWnd::UIFrameWnd(unsigned char cached) + : UIWindow(cached), m_dragX(0), m_dragY(0), m_message0(600), m_message1(600) { this->m_textCache.max_load_factor(1.0f); this->m_textCache.rehash(8); } @@ -234,7 +234,7 @@ int UIFrameWnd::Slot46() { // OFFSET: 0x008CEF10 // FUNCTION: fn_12074 UIBitmapButton* UIFrameWnd::AddBaseButton() { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\sys_base_off.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_base_on.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_base_on.bmp", 2, 0); @@ -252,7 +252,7 @@ UIBitmapButton* UIFrameWnd::AddBigCloseButton(const char* tooltip, int width) { width = this->geometry.width; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\big_sys_close_off.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\big_sys_close_on.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\big_sys_close_on.bmp", 2, 0); @@ -272,7 +272,7 @@ UIBitmapButton* UIFrameWnd::AddCloseButton(const char* tooltip, int width) { width = this->geometry.width; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_off.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 2, 0); @@ -292,7 +292,7 @@ UIBitmapButton* UIFrameWnd::AddMinimizeButton(const char* tooltip, int width) { width = this->geometry.width; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\sys_mini_off.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_mini_on.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\sys_mini_on.bmp", 2, 0); @@ -312,7 +312,7 @@ UIBitmapButton* UIFrameWnd::AddBitmapButton(int id, int x, int y, const char* na return nullptr; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); std::string path = "유저인터페이스\\"; path += name; button->SetBitmap((path + "_out" + ".bmp").c_str(), 0, 0); @@ -334,7 +334,7 @@ UIBitmapButton* UIFrameWnd::AddNumberedButton(int id, int x, int y, const char* return nullptr; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); std::string path; if (prefix) { path += "유저인터페이스\\"; @@ -357,7 +357,7 @@ UIBitmapButton* UIFrameWnd::AddNumberedButton(int id, int x, int y, const char* UICheckBox* UIFrameWnd::AddStyledCheckBox(int id, int width, int height, const char* text, int x, int y, bool checked, const char* tooltip, int fontHeight, std::uint32_t color, const char* checkedImage, const char* uncheckedImage ) { - UICheckBox* checkBox = new UICheckBox(*this->m_context); + UICheckBox* checkBox = new UICheckBox(); checkBox->SetSize(width, height); checkBox->SetImages( checkedImage ? checkedImage : "유저인터페이스\\checkbox_1.bmp", uncheckedImage ? uncheckedImage : "유저인터페이스\\checkbox_0.bmp", text @@ -376,7 +376,7 @@ UICheckBox* UIFrameWnd::AddStyledCheckBox(int id, int width, int height, const c // OFFSET: 0x008CFF40 // FUNCTION: fn_12081 UICheckBox* UIFrameWnd::AddCheckBox(int id, int width, int height, const char* text, int x, int y, int checked, const char* tooltip) { - UICheckBox* checkBox = new UICheckBox(*this->m_context); + UICheckBox* checkBox = new UICheckBox(); checkBox->SetSize(width, height); checkBox->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", text); checkBox->Move(x, y); @@ -610,20 +610,20 @@ int UICntWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intpt // OFFSET: 0x008A34B0 // FUNCTION: fn_11653 -UIAllyGuildAcceptWnd::UIAllyGuildAcceptWnd(UIWindowContext& windows, UIAcceptanceContext& acceptance) - : UIExchangeAcceptWnd(windows, acceptance) { +UIAllyGuildAcceptWnd::UIAllyGuildAcceptWnd(UIAcceptanceContext& acceptance) + : UIExchangeAcceptWnd(acceptance) { } // OFFSET: 0x008A3510 // FUNCTION: fn_11654 -UIBank_NewWnd::UIBank_NewWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_amountEdit(nullptr), m_status() { +UIBank_NewWnd::UIBank_NewWnd() + : UIFrameWnd(0), m_amountEdit(nullptr), m_status() { } // OFFSET: 0x008A35A0 // FUNCTION: fn_11655 -UIChatRoomWnd::UIChatRoomWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), title(), unknown_00CC(), unknown_010C(), unknown_0114(), saved(nullptr) { +UIChatRoomWnd::UIChatRoomWnd() + : UIFrameWnd(0), title(), unknown_00CC(), unknown_010C(), unknown_0114(), saved(nullptr) { } // OFFSET: 0x008BB9E0 @@ -1091,24 +1091,24 @@ int UIChatRoomWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // OFFSET: 0x008A36A0 // FUNCTION: fn_11656 -UICntWnd::UICntWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UICntWnd::UICntWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008A37F0 // FUNCTION: fn_11658 -UIHomunInfoWnd::UIHomunInfoWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), unknown_00D0(0), unknown_00D4(0) { +UIHomunInfoWnd::UIHomunInfoWnd() : UIFrameWnd(0), unknown_00D0(0), unknown_00D4(0) { } // OFFSET: 0x008A3860 // FUNCTION: fn_11659 -UILoginOTPWnd::UILoginOTPWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00B4(0), unknown_00B8(0), timerText(nullptr), unknown_00C0(0) { +UILoginOTPWnd::UILoginOTPWnd() + : UIFrameWnd(0), unknown_00B4(0), unknown_00B8(0), timerText(nullptr), unknown_00C0(0) { } // OFFSET: 0x008A38E0 // FUNCTION: fn_11660 -UILoginWnd::UILoginWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), idEdit(nullptr), passwordEdit(nullptr), unknown_00BC(0), unknown_00C4(0), saveId(0), unknown_00CC(1), unknown_00D0(0), +UILoginWnd::UILoginWnd() + : UIFrameWnd(0), idEdit(nullptr), passwordEdit(nullptr), unknown_00BC(0), unknown_00C4(0), saveId(0), unknown_00CC(1), unknown_00D0(0), unknown_00D4(0), unknown_00D8(), unknown_00E8(0), unknown_00EC("G000") { } diff --git a/Source/UI/Window/UIFrameWnd.h b/Source/UI/Window/UIFrameWnd.h index 08c46717..6200b516 100644 --- a/Source/UI/Window/UIFrameWnd.h +++ b/Source/UI/Window/UIFrameWnd.h @@ -10,7 +10,9 @@ class UICheckBox; class UIFrameWnd : public UIWindow { public: - UIFrameWnd(UIWindowContext& windowContext, unsigned char cached); + UIFrameWnd(unsigned char cached); + UIFrameWnd(UIWindowContext&, unsigned char cached) : UIFrameWnd(cached) { + } ~UIFrameWnd() override; bool Slot02() override; void Move(int x, int y) override; diff --git a/Source/UI/Window/UIHomunInfoWnd.h b/Source/UI/Window/UIHomunInfoWnd.h index e1ebb678..924415f7 100644 --- a/Source/UI/Window/UIHomunInfoWnd.h +++ b/Source/UI/Window/UIHomunInfoWnd.h @@ -16,7 +16,7 @@ struct WindowResponseRecorder; class UIHomunInfoWnd : public UIFrameWnd { public: - UIHomunInfoWnd(UIWindowContext& windows); + UIHomunInfoWnd(); void Slot11() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index 1140c385..d500a945 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -94,13 +94,13 @@ void UIHotKeyWnd::Slot15(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_balloon = new UITransBalloonText(*this->m_context); + this->m_balloon = new UITransBalloonText(); this->m_balloon->SetSize(this->geometry.width, 20); this->m_balloon->SetText(LookupMessage(1486), 60); this->m_balloon->Show(0); g_windowMgr.AddRendered(this->m_balloon); - this->unknown_0100 = new UITabControl(*this->m_context); + this->unknown_0100 = new UITabControl(); this->unknown_0100->Configure(1, this->unknown_00C4 - 3, 20, 1, 1, 0, 0, 0, 0, 0, 0, 0); this->unknown_0100->Move(this->unknown_00C8, this->unknown_00CC + this->unknown_00BC); this->AddChild(this->unknown_0100); @@ -187,8 +187,8 @@ void UIHotKeyWnd::UpdatePageButtons() { // OFFSET: 0x00911300 // FUNCTION: fn_12513 -UIHotKeyWnd::UIHotKeyWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_selectedRow(-1), m_rowsPerPage(18), unknown_00BC(17), unknown_00C0(0), unknown_00C4(20), unknown_00C8(3), unknown_00CC(3), +UIHotKeyWnd::UIHotKeyWnd() + : UIFrameWnd(0), m_selectedRow(-1), m_rowsPerPage(18), unknown_00BC(17), unknown_00C0(0), unknown_00C4(20), unknown_00C8(3), unknown_00CC(3), unknown_00D0(20), unknown_00D4(80), unknown_00D8(135), m_balloon(nullptr), m_tab(0), m_page(1), m_pageCount(0), unknown_0114(0) { } diff --git a/Source/UI/Window/UIHotKeyWnd.h b/Source/UI/Window/UIHotKeyWnd.h index 90ee00a1..4b25f0ab 100644 --- a/Source/UI/Window/UIHotKeyWnd.h +++ b/Source/UI/Window/UIHotKeyWnd.h @@ -19,7 +19,7 @@ public: HotkeyInfo info; }; - UIHotKeyWnd(UIWindowContext& windows); + UIHotKeyWnd(); void Slot15(int width, int height) override; void Slot25(int x, int y) override; void Slot32(int x, int y) override; diff --git a/Source/UI/Window/UILocaleTextWnd.cpp b/Source/UI/Window/UILocaleTextWnd.cpp index 9ada8f22..67110e79 100644 --- a/Source/UI/Window/UILocaleTextWnd.cpp +++ b/Source/UI/Window/UILocaleTextWnd.cpp @@ -44,7 +44,7 @@ namespace AdventureGuide { // OFFSET: 0x009D1830 // FUNCTION: fn_14008 void CUISubTab::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(98, 26); this->unknown_00E8->Move(0, 0); this->unknown_00E8->SetText("", 0); @@ -63,7 +63,7 @@ void CUISubTab::Slot15(int width, int height) { this->unknown_00E8->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E8); - this->unknown_00EC = new CUIStaticImage(*this->m_context); + this->unknown_00EC = new CUIStaticImage(); this->unknown_00EC->SetSize(40, 26); this->unknown_00EC->Move(58, 0); { @@ -80,7 +80,7 @@ void CUISubTab::Slot15(int width, int height) { // OFFSET: 0x009D1C80 // FUNCTION: fn_14009 void CUITab::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(98, 40); this->unknown_00E8->Move(0, 0); this->unknown_00E8->SetText("", 0); @@ -103,7 +103,7 @@ void CUITab::Slot15(int width, int height) { // OFFSET: 0x009D1F00 // FUNCTION: fn_14010 void CUITabInfo::Slot15(int width, int height) { - this->unknown_00E8 = new CUIStaticText(*this->m_context); + this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(90, 44); this->unknown_00E8->Move(32, 0); this->unknown_00E8->SetText("", 0); @@ -122,7 +122,7 @@ void CUITabInfo::Slot15(int width, int height) { this->unknown_00E8->SetOutline(0, 0xFFFFFF); this->AddChild(this->unknown_00E8); - this->unknown_00EC = new CUIStaticText(*this->m_context); + this->unknown_00EC = new CUIStaticText(); this->unknown_00EC->SetSize(442, 44); this->unknown_00EC->Move(140, 0); this->unknown_00EC->SetText("", 0); diff --git a/Source/UI/Window/UILoginOTPWnd.h b/Source/UI/Window/UILoginOTPWnd.h index 679bc132..a9f376e0 100644 --- a/Source/UI/Window/UILoginOTPWnd.h +++ b/Source/UI/Window/UILoginOTPWnd.h @@ -8,7 +8,7 @@ class UIStaticText; class UILoginOTPWnd : public UIFrameWnd { public: - UILoginOTPWnd(UIWindowContext& windows); + UILoginOTPWnd(); void Slot15(int width, int height) override; void Slot18() override; void Slot19() override; diff --git a/Source/UI/Window/UILoginWnd.h b/Source/UI/Window/UILoginWnd.h index 885468d5..1ecc5e0b 100644 --- a/Source/UI/Window/UILoginWnd.h +++ b/Source/UI/Window/UILoginWnd.h @@ -11,7 +11,7 @@ class UILoginWnd : public UIFrameWnd { public: - UILoginWnd(UIWindowContext& windows); + UILoginWnd(); ~UILoginWnd() override; void Slot11() override; diff --git a/Source/UI/Window/UIMakeCharWnd.h b/Source/UI/Window/UIMakeCharWnd.h index 4547c3ee..6c73ca03 100644 --- a/Source/UI/Window/UIMakeCharWnd.h +++ b/Source/UI/Window/UIMakeCharWnd.h @@ -11,7 +11,7 @@ class UIScrollBar; class UIMakeCharWnd : public UIFrameWnd { public: - UIMakeCharWnd(UIWindowContext& windows); + UIMakeCharWnd(); void Slot15(int width, int height) override; void Slot18() override; diff --git a/Source/UI/Window/UIMerInfoWnd.h b/Source/UI/Window/UIMerInfoWnd.h index b48ae073..2cf5d035 100644 --- a/Source/UI/Window/UIMerInfoWnd.h +++ b/Source/UI/Window/UIMerInfoWnd.h @@ -10,7 +10,7 @@ struct WindowResponseRecorder; class UIMerInfoWnd : public UIFrameWnd { public: - UIMerInfoWnd(UIWindowContext& windows); + UIMerInfoWnd(); void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 1532d78c..cf7de6fa 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -163,8 +163,8 @@ namespace { // OFFSET: 0x008A39C0 // FUNCTION: fn_11661 -UIMakeCharWnd::UIMakeCharWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_02C4(0), unknown_02C8(0), unknown_02CC(0), unknown_02D0(0), unknown_02D4(0), unknown_02D8(0) { +UIMakeCharWnd::UIMakeCharWnd() + : UIFrameWnd(0), unknown_02C4(0), unknown_02C8(0), unknown_02CC(0), unknown_02D0(0), unknown_02D4(0), unknown_02D8(0) { this->geometry.unknown_0034 = 0; this->m_nameEdit = nullptr; this->m_info.sex = static_cast(g_doramSex); @@ -232,25 +232,25 @@ UIMakeCharWnd::UIMakeCharWnd(UIWindowContext& windows) // OFFSET: 0x008A3F60 // FUNCTION: fn_11662 -UIMerInfoWnd::UIMerInfoWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIMerInfoWnd::UIMerInfoWnd() : UIFrameWnd(0) { } // OFFSET: 0x008A3FC0 // FUNCTION: fn_11663 -UIMessageBox::UIMessageBox(UIWindowContext& windows, UIMessageBoxContext& dialog) - : UIFrameWnd(windows, 0), counting(0), protectedMessage(0), m_dialog(&dialog) { +UIMessageBox::UIMessageBox(UIMessageBoxContext& dialog) + : UIFrameWnd(0), counting(0), protectedMessage(0), m_dialog(&dialog) { } // OFFSET: 0x008A40B0 // FUNCTION: fn_11664 -UIMessageBoxAutoreturn::UIMessageBoxAutoreturn(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIMessageBoxAutoreturn::UIMessageBoxAutoreturn() : UIFrameWnd(0) { this->counting = 0; } // OFFSET: 0x008A4170 // FUNCTION: fn_11665 -UIMonsterInfoWnd::UIMonsterInfoWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), info(), unknown_00D4(0) { +UIMonsterInfoWnd::UIMonsterInfoWnd() + : UIFrameWnd(0), info(), unknown_00D4(0) { } // INLINED @@ -637,7 +637,7 @@ void UIMessageBox::FormatCountdown() { // INLINED void UIMessageBox::AddButton(const char* name, int id, int x, int y) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); const char* suffixes[] = {"", "_a", "_b"}; for (int state = 0; state < 3; ++state) { @@ -677,7 +677,7 @@ void UIMessageBox::Configure( int inset = 0; if (icon) { - auto* image = new UIStaticBitmap(*this->m_context); + auto* image = new UIStaticBitmap(); image->SetBitmap(icon); image->SetSize(image->geometry.width, image->geometry.height); image->Move(10, 22); @@ -685,7 +685,7 @@ void UIMessageBox::Configure( inset = image->geometry.width + image->geometry.x; } - this->viewer = new UITextViewer(*this->m_context); + this->viewer = new UITextViewer(); this->viewer->Configure(inset + 10, 22, width - inset - 20, height - 55, 0); this->viewer->backgroundColor = Palette(ResourceMgr::Instance(), 2, 2) | 0xFF000000u; this->viewer->Invalidate(); @@ -712,7 +712,7 @@ void UIMessageBox::Configure( this->AddButton("btn_ok", 184, width - 46, height - 24); this->m_message0 = 184; - auto* button = new UITextButton(*this->m_context); + auto* button = new UITextButton(); button->Configure(LookupMessage(3445), 0x00F4934A, 0, 12, 0, 0); button->m_hoverColor = 0x00FF7864; button->Move(14, 70); @@ -883,7 +883,7 @@ void UIMerInfoWnd::Slot15(int, int) { this->AddCloseButton("", 0); { const std::string name("유저인터페이스\\btn_fired"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((name + ".bmp").c_str(), 0, 0); this->button->SetBitmap((name + "_a.bmp").c_str(), 1, 0); this->button->SetBitmap((name + "_b.bmp").c_str(), 2, 0); @@ -894,7 +894,7 @@ void UIMerInfoWnd::Slot15(int, int) { } { const std::string name("유저인터페이스\\btn_skill"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((name + ".bmp").c_str(), 0, 0); this->button->SetBitmap((name + "_a.bmp").c_str(), 1, 0); this->button->SetBitmap((name + "_b.bmp").c_str(), 2, 0); @@ -904,13 +904,13 @@ void UIMerInfoWnd::Slot15(int, int) { this->AddChild(this->button); } - this->hpBar = new UIBarGraphPlayer(*this->m_context); + this->hpBar = new UIBarGraphPlayer(); this->hpBar->SetValues([]() -> std::int64_t { return g_session.m_mercenaryHp; }, []() -> std::int64_t { return g_session.m_mercenaryMaxHp; }); this->hpBar->SetSize(85, 9); this->hpBar->Move(117, 73); this->AddChild(this->hpBar); - this->spBar = new UIBarGraphPlayer(*this->m_context); + this->spBar = new UIBarGraphPlayer(); this->spBar->SetValues([]() -> std::int64_t { return g_session.m_mercenarySp; }, []() -> std::int64_t { return g_session.m_mercenaryMaxSp; }); this->spBar->SetSize(85, 9); this->spBar->Move(117, 88); @@ -1023,7 +1023,7 @@ void UILoginOTPWnd::Slot15(int, int) { thread_local EncryptedName prefixName(prefixSource); const std::string prefix(prefixName.Text()); - this->unknown_00B4 = new UIEditCtrl(*this->m_context); + this->unknown_00B4 = new UIEditCtrl(); this->unknown_00B4->SetSize(80, 16); this->unknown_00B4->maximum = 8; this->unknown_00B4->Move(99, 95); @@ -1033,13 +1033,13 @@ void UILoginOTPWnd::Slot15(int, int) { this->unknown_00B4->SetText(""); g_windowMgr.SetFocus(this->unknown_00B4); - UIStaticText* label = new UIStaticText(*this->m_context); + UIStaticText* label = new UIStaticText(); label->SetSize(80, 20); label->Move(141 - this->TextWidth(LookupMessage(3410), 0, 0, 12, 0, 0), 67); label->SetText(LookupMessage(3410), 0); this->AddChild(label); - this->timerText = new UIStaticText(*this->m_context); + this->timerText = new UIStaticText(); this->timerText->SetSize(80, 20); this->timerText->Move(150, 66); this->timerText->SetText(LookupMessage(3410), 0); @@ -1047,19 +1047,19 @@ void UILoginOTPWnd::Slot15(int, int) { this->timerText->SetColor(205, 19, 41); this->AddChild(this->timerText); - label = new UIStaticText(*this->m_context); + label = new UIStaticText(); label->SetSize(200, 40); label->SetText(LookupMessage(3385), 0); label->Move(static_cast(141.0f - this->TextWidth(LookupMessage(3385), 0, 0, 12, 0, 0) * 0.5f), 28); this->AddChild(label); - label = new UIStaticText(*this->m_context); + label = new UIStaticText(); label->SetSize(200, 40); label->SetText(LookupMessage(3386), 0); label->Move(static_cast(141.0f - this->TextWidth(LookupMessage(3386), 0, 0, 12, 0, 0) * 0.5f), 42); this->AddChild(label); - label = new UIStaticText(*this->m_context); + label = new UIStaticText(); label->SetSize(80, 20); label->Move(74 - this->TextWidth(LookupMessage(3255), 0, 0, 12, 0, 0), 98); label->SetText(LookupMessage(3255), 0); @@ -1067,7 +1067,7 @@ void UILoginOTPWnd::Slot15(int, int) { label->SetColor(64, 64, 64); this->AddChild(label); - UIBmpTextButton* button = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* button = new UIBmpTextButton(); const std::uint8_t normalSource[] = {0xDD, 0xAA, 0x53, 0xD3, 0xB1, 0xED, 0x92, 0x28, 0xDB, 0xE1, 0x53, 0xE5, 0xCC, 0x99, 0x0B, 0x89, 0x72, 0x62, 0xFA, 0x47, 0x2E, 0x4A, 0x39, 0x91, 0x78, 0x77, 0xF5, 0x48, 0x12, 0x46, 0x0B, 0x87, 0x69, 0x5A, 0xFC, 0x5D, 0x01, 0x7C, 0x39, 0x8A, 0x6F, 0x68, 0xF2, 0x45, 0x5F, 0x41, 0x3A, 0x95, 0x1D}; @@ -1565,11 +1565,11 @@ void UIMakeCharWnd::InitHairControls() { } this->unknown_02D8 = this->m_view.headPalette < 0 ? 0 : this->m_view.headPalette; - this->unknown_02CC = new UIScrollBar(*this->m_context); + this->unknown_02CC = new UIScrollBar(); this->unknown_02CC->Configure(10, 190, 0, 130); this->AddChild(this->unknown_02CC); - this->unknown_02D0 = new UIScrollBar(*this->m_context); + this->unknown_02D0 = new UIScrollBar(); this->unknown_02D0->Configure(10, 230, 0, 130); this->AddChild(this->unknown_02D0); @@ -1613,7 +1613,7 @@ void UIChatRoomWnd::Move(int x, int y) { void UIChatRoomWnd::Slot15(int, int) { this->m_message0 = 184; - this->resizer = new UIResizer(*this->m_context); + this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); this->resizer->SetDirection(7); this->resizer->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -1621,7 +1621,7 @@ void UIChatRoomWnd::Slot15(int, int) { this->resizer->SetColors(0xFFFF00FF, 0xFFFF00FF); this->AddChild(this->resizer); - this->edit = new UIChatEditCtrl(*this->m_context); + this->edit = new UIChatEditCtrl(); this->edit->SetSize(this->geometry.width - 30, 16); this->edit->Move(3, this->geometry.height - 18); this->edit->maximum = 70; @@ -1630,14 +1630,14 @@ void UIChatRoomWnd::Slot15(int, int) { g_windowMgr.SetFocus(this->edit); this->edit->SetId(494); - UIChatHisBox2* history = new UIChatHisBox2(*this->m_context); + UIChatHisBox2* history = new UIChatHisBox2(); this->history = history; history->Configure(0, 0, this->geometry.width - this->geometry.width * 56 / 280 - 3, this->geometry.height - 38, 0); this->history->Move(1, 17); this->history->SetId(184); this->AddChild(this->history); - this->memberList = new UIMemberListBox(*this->m_context); + this->memberList = new UIMemberListBox(); this->memberList->Configure(0, 0, this->geometry.width * 56 / 280, this->geometry.height - 38, 0); this->memberList->Move(this->geometry.width - this->geometry.width * 56 / 280 - 1, 17); this->memberList->SetId(184); @@ -1645,7 +1645,7 @@ void UIChatRoomWnd::Slot15(int, int) { this->closeButton = this->AddCloseButton("/q", 0); - this->titleText = new UIStaticText(*this->m_context); + this->titleText = new UIStaticText(); this->titleText->SetSize(this->geometry.width - 30, 15); this->titleText->Move(9, 2); this->titleText->SetTextFitted(""); @@ -1662,7 +1662,7 @@ void UINoticeWnd::Slot15(int, int) { int positions[3][2] = {{534, 376}, {244, 376}, {294, 376}}; for (int index = 0; index < 3; ++index) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[index][2] + ".bmp").c_str(), 2, 0); @@ -1772,7 +1772,7 @@ void UINoticeWnd::Slot15(int, int) { this->AddChild(this->m_texts[i]); } - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); static_cast(this->m_scrollBar)->Configure(583, 18, 1, this->geometry.height - 48); const int total = this->m_bottomPositions[this->m_index] - this->m_scrollPositions[this->m_index]; static_cast(this->m_scrollBar)->SetRange(total - 19, 19, total); @@ -1832,7 +1832,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { int ids[6] = {420, 421, 422, 423, 424, 425}; for (int index = 0; index < 2; ++index) { - this->buttons[index] = new UIReplayButton(*this->m_context); + this->buttons[index] = new UIReplayButton(); this->buttons[index]->SetBitmap((prefix + names[index] + "a.bmp").c_str(), 0, 0); this->buttons[index]->SetBitmap((prefix + names[index] + "a.bmp").c_str(), 1, 0); this->buttons[index]->SetBitmap((prefix + names[index] + "b.bmp").c_str(), 2, 0); @@ -1844,7 +1844,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { } for (int index = 2; index < 6; ++index) { - this->buttons[index] = new UIBitmapButton(*this->m_context); + this->buttons[index] = new UIBitmapButton(); this->buttons[index]->SetBitmap((prefix + names[index] + "a.bmp").c_str(), 0, 0); this->buttons[index]->SetBitmap((prefix + names[index] + "a.bmp").c_str(), 1, 0); this->buttons[index]->SetBitmap((prefix + names[index] + "b.bmp").c_str(), 2, 0); @@ -1856,7 +1856,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { } for (int index = 0; index < 5; ++index) { - UIStaticBitmap* tab = new UIStaticBitmap(*this->m_context); + UIStaticBitmap* tab = new UIStaticBitmap(); this->tabs[index] = tab; tab->SetBitmap((prefix + names[index + 6] + ".bmp").c_str()); tab->SetSize(tab->geometry.width, tab->geometry.height); @@ -1868,7 +1868,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { int textSizes[2][2] = {{50, 12}, {80, 12}}; const char* labels[2] = {"000:00:00", LookupMessage(0x7B3)}; for (int index = 0; index < 2; ++index) { - this->texts[index] = new UIStaticText(*this->m_context); + this->texts[index] = new UIStaticText(); this->texts[index]->SetSize(textSizes[index][0], textSizes[index][1]); this->texts[index]->SetText(labels[index], 0); this->texts[index]->Move(-100, -100); @@ -1881,7 +1881,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { "Basicinfo", "Equip", "Item", "Skill", "Guild", "Party", "Chatting", "Shortcut", "Status", "ALL", "User Defined File Name", "Repeated File Check", }; for (int index = 0; index < 10; ++index) { - UICheckBox* option = new UICheckBox(*this->m_context); + UICheckBox* option = new UICheckBox(); this->options[index] = option; option->SetSize(70, 12); option->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", optionNames[index]); @@ -1891,7 +1891,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { } for (int index = 0; index < 2; ++index) { - this->fileOptions[index] = new UICheckBox(*this->m_context); + this->fileOptions[index] = new UICheckBox(); this->fileOptions[index]->SetSize(150, 12); this->fileOptions[index]->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", optionNames[index + 10]); this->fileOptions[index]->Move(-100, -100); @@ -1906,7 +1906,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { this->fileOptions[1]->SetChecked(option119); this->replayOption119 = option119; - UIEditCtrl* edit = new UIEditCtrl(*this->m_context); + UIEditCtrl* edit = new UIEditCtrl(); this->window_0134 = edit; edit->SetSize(151, 18); edit->Move(-100, -100); @@ -1925,7 +1925,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { // OFFSET: 0x008B5A50 // FUNCTION: fn_11750 void UISelectReplayDataWnd::Slot15(int width, int height) { - this->m_list = new UIReplayListBox(*this->m_context); + this->m_list = new UIReplayListBox(); this->m_list->Configure(6, 127, width - 12, height - 170, 0); this->m_list->backgroundRed = 240; this->m_list->backgroundGreen = 240; @@ -1944,7 +1944,7 @@ void UISelectReplayDataWnd::Slot15(int width, int height) { int positions[4][2] = {{189, height - 25}, {-100, -100}, {234, height - 25}, {100, height - 25}}; for (int index = 0; index < 4; ++index) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[index][2] + ".bmp").c_str(), 2, 0); @@ -1961,7 +1961,7 @@ void UISelectReplayDataWnd::Slot15(int width, int height) { UIStaticText** text = this->m_texts; for (int y = 35; y < 110; y += 15) { - *text = new UIStaticText(*this->m_context); + *text = new UIStaticText(); (*text)->SetSize(width - 12, 15); (*text)->SetText("", 0); (*text)->Move(12, y); @@ -1974,7 +1974,7 @@ void UISelectReplayDataWnd::Slot15(int width, int height) { // OFFSET: 0x008B7040 // FUNCTION: fn_11752 void UITalkboxTrapInputWnd::Slot15(int, int) { - this->edit = new UIEditCtrl(*this->m_context); + this->edit = new UIEditCtrl(); this->edit->SetSize(240, 16); this->edit->Move(22, 50); this->edit->maximum = 78; @@ -1988,7 +1988,7 @@ void UITalkboxTrapInputWnd::Slot15(int, int) { int positions[2][2] = {{189, 96}, {234, 96}}; for (int index = 0; index < 2; ++index) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[index][2] + ".bmp").c_str(), 2, 0); @@ -2597,10 +2597,10 @@ int sub_8AB060() { // OFFSET: 0x008A4220 // FUNCTION: fn_11666 -UINoticeWnd::UINoticeWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UINoticeWnd::UINoticeWnd() : UIFrameWnd(0) { this->m_patchFile = "notice_patch.txt"; for (int i = 0; i < 19; ++i) { - this->m_texts[i] = new UIStaticText(*this->m_context); + this->m_texts[i] = new UIStaticText(); } this->unknown_0108 = 20; this->unknown_010C = 0; @@ -2625,7 +2625,7 @@ void UIBank_NewWnd::Slot15(int, int) { this->AddBitmapButton(390, 93, 132, "bank\\btn_1000mil", "+ 10,000,000"); this->AddBitmapButton(389, 45, 132, "bank\\btn_max", LookupMessage(2778)); - this->m_amountEdit = new UIEditCtrl(*this->m_context); + this->m_amountEdit = new UIEditCtrl(); this->m_amountEdit->SetSize(99, 17); this->m_amountEdit->maximum = 10; this->m_amountEdit->Move(78, 90); @@ -2640,7 +2640,7 @@ void UIBank_NewWnd::Slot15(int, int) { // OFFSET: 0x008AD770 // FUNCTION: fn_11739 void UICntWnd::Slot15(int, int) { - this->m_edit = new UIEditCtrl(*this->m_context); + this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(80, 16); this->m_edit->Move(15, 22); this->m_edit->maximum = 6; @@ -2649,7 +2649,7 @@ void UICntWnd::Slot15(int, int) { g_windowMgr.SetFocus(this->m_edit); this->m_edit->SelectAll(); - this->m_text = new UIStaticText(*this->m_context); + this->m_text = new UIStaticText(); this->m_text->SetSize(this->geometry.width - 30, 15); this->m_text->Move(15, 6); this->AddChild(this->m_text); @@ -2657,7 +2657,7 @@ void UICntWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); const int width = this->geometry.width; const int height = this->geometry.height; - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -3122,7 +3122,7 @@ void UIPetInfoWnd::UpdateFriendlyGauge() { // FUNCTION: fn_11745 void UIMonsterInfoWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -3143,8 +3143,8 @@ void UIMonsterInfoWnd::Slot15(int, int) { // OFFSET: 0x008A4300 // FUNCTION: fn_11667 -UIPetInfoWnd::UIPetInfoWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), friendlyGauge(nullptr) { +UIPetInfoWnd::UIPetInfoWnd() + : UIFrameWnd(0), friendlyGauge(nullptr) { this->friendlyText.clear(); this->unknown_00E4 = 0; this->unknown_00E8 = 0; @@ -3157,19 +3157,19 @@ UIPetInfoWnd::UIPetInfoWnd(UIWindowContext& windows) // OFFSET: 0x008A43E0 // FUNCTION: fn_11668 -UIReplayButton::UIReplayButton(UIWindowContext& windows) : UIBitmapButton(windows) { +UIReplayButton::UIReplayButton() : UIBitmapButton() { } // OFFSET: 0x008A4440 // FUNCTION: fn_11669 -UIReplayControlWnd::UIReplayControlWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIReplayControlWnd::UIReplayControlWnd() : UIFrameWnd(0) { this->m_paused = false; } // OFFSET: 0x008A4500 // FUNCTION: fn_11670 -UIReplayRECControlWnd::UIReplayRECControlWnd(UIWindowContext& windows, int mode) - : UIFrameWnd(windows, 0), mode(mode), recordStart(0) { +UIReplayRECControlWnd::UIReplayRECControlWnd(int mode) + : UIFrameWnd(0), mode(mode), recordStart(0) { for (int i = 0; i < 10; ++i) { this->options[i] = nullptr; this->recordOptions[i] = 0; @@ -3178,7 +3178,7 @@ UIReplayRECControlWnd::UIReplayRECControlWnd(UIWindowContext& windows, int mode) // OFFSET: 0x008A45A0 // FUNCTION: fn_11671 -UISelectReplayDataWnd::UISelectReplayDataWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UISelectReplayDataWnd::UISelectReplayDataWnd() : UIFrameWnd(0) { this->m_list = nullptr; this->m_serverButton = nullptr; this->m_texts[0] = nullptr; @@ -3189,16 +3189,16 @@ UISelectReplayDataWnd::UISelectReplayDataWnd(UIWindowContext& windows) : UIFrame // OFFSET: 0x008A4640 // FUNCTION: fn_11672 -UISelectServerWnd::UISelectServerWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UISelectServerWnd::UISelectServerWnd() + : UIFrameWnd(0) { this->m_serverList = nullptr; this->m_okButton = nullptr; } // OFFSET: 0x008A46E0 // FUNCTION: fn_11673 -UITalkboxTrapInputWnd::UITalkboxTrapInputWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UITalkboxTrapInputWnd::UITalkboxTrapInputWnd() + : UIFrameWnd(0) { } // OFFSET: 0x008A4E00 @@ -3380,7 +3380,7 @@ int UILoginOTPWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // FUNCTION: fn_11740 void UIHomunInfoWnd::Slot15(int, int) { this->AddCloseButton("", 0); - this->nameEdit = new UIEditCtrl2(*this->m_context); + this->nameEdit = new UIEditCtrl2(); this->nameEdit->SetSize(80, 16); char* const name = reinterpret_cast(&g_session.unknown_5570[0x0C]); if (std::strcmp(name, "") == 0) { @@ -3393,7 +3393,7 @@ void UIHomunInfoWnd::Slot15(int, int) { this->AddChild(this->nameEdit); { const std::string bitmap("유저인터페이스\\btn_del"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((bitmap + ".bmp").c_str(), 0, 0); this->button->SetBitmap((bitmap + "_a.bmp").c_str(), 1, 0); this->button->SetBitmap((bitmap + "_b.bmp").c_str(), 2, 0); @@ -3404,7 +3404,7 @@ void UIHomunInfoWnd::Slot15(int, int) { } { const std::string bitmap("유저인터페이스\\btn_skill"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((bitmap + ".bmp").c_str(), 0, 0); this->button->SetBitmap((bitmap + "_a.bmp").c_str(), 1, 0); this->button->SetBitmap((bitmap + "_b.bmp").c_str(), 2, 0); @@ -3415,7 +3415,7 @@ void UIHomunInfoWnd::Slot15(int, int) { } { const std::string bitmap("유저인터페이스\\btn_feed"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((bitmap + ".bmp").c_str(), 0, 0); this->button->SetBitmap((bitmap + "_a.bmp").c_str(), 1, 0); this->button->SetBitmap((bitmap + "_b.bmp").c_str(), 2, 0); @@ -3427,7 +3427,7 @@ void UIHomunInfoWnd::Slot15(int, int) { } { const std::string bitmap("유저인터페이스\\btn_rewrite"); - this->button = new UIBitmapButton(*this->m_context); + this->button = new UIBitmapButton(); this->button->SetBitmap((bitmap + ".bmp").c_str(), 0, 0); this->button->SetBitmap((bitmap + "_a.bmp").c_str(), 1, 0); this->button->SetBitmap((bitmap + "_b.bmp").c_str(), 2, 0); @@ -3437,27 +3437,27 @@ void UIHomunInfoWnd::Slot15(int, int) { this->AddChild(this->button); } - this->hpBar = new UIBarGraphHomun(*this->m_context); + this->hpBar = new UIBarGraphHomun(); this->hpBar->SetValues([]() -> std::int64_t { return g_session.m_homunHp; }, []() -> std::int64_t { return *reinterpret_cast(g_session.unknown_55C8); }); this->hpBar->SetSize(157, 9); this->hpBar->Move(117, 73); this->AddChild(this->hpBar); - this->spBar = new UIBarGraphHomun(*this->m_context); + this->spBar = new UIBarGraphHomun(); this->spBar->SetValues([]() -> std::int64_t { return g_session.m_homunSp; }, []() -> std::int64_t { return g_session.unknown_55D0; }); this->spBar->SetSize(157, 9); this->spBar->Move(117, 88); this->AddChild(this->spBar); - this->expBar = new UIINT64BarGraph(*this->m_context); + this->expBar = new UIINT64BarGraph(); this->expBar->SetValues(g_session.m_homunExp, g_session.m_homunMaxExp); this->expBar->m_plainColor = 1; this->expBar->SetSize(102, 6); this->expBar->Move(101, 119); this->AddChild(this->expBar); - this->intimacyBar = new UIBarGraph4(*this->m_context); + this->intimacyBar = new UIBarGraph4(); this->intimacyBar->m_plainColor = false; this->intimacyBar->SetSize(102, 6); this->intimacyBar->Move(101, 145); @@ -3465,7 +3465,7 @@ void UIHomunInfoWnd::Slot15(int, int) { this->AddChild(this->intimacyBar); this->m_message0 = 201; - this->unknown_00D4 = new UICheckBox(*this->m_context); + this->unknown_00D4 = new UICheckBox(); this->unknown_00D4->SetSize(12, 12); this->unknown_00D4->Move(210, 142); this->unknown_00D4->SetBitmaps("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp"); @@ -3599,7 +3599,7 @@ int UIHomunInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std: } return 0; case 290: - this->unknown_00D0 = new UINormalMB(*this->m_context); + this->unknown_00D0 = new UINormalMB(); this->unknown_00D0->Create(this, LookupMessage(601), 2, true, nullptr, 280, 120, nullptr); g_windowMgr.AddRendered(this->unknown_00D0); return 0; @@ -3647,7 +3647,7 @@ int UIHomunInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std: // FUNCTION: fn_11747 void UIPetInfoWnd::Slot15(int, int) { this->AddCloseButton("", 0); - this->nameEdit = new UIEditCtrl2(*this->m_context); + this->nameEdit = new UIEditCtrl2(); this->nameEdit->SetSize(80, 16); if (std::strcmp(g_session.unknown_1018, "") == 0) { std::sprintf(g_session.unknown_1018, g_session.GetJobName(g_session.unknown_103C, -1)); @@ -3659,7 +3659,7 @@ void UIPetInfoWnd::Slot15(int, int) { this->AddChild(this->nameEdit); { const std::string prefix("유저인터페이스\\"); - this->unknown_00BC = new UIBitmapButton(*this->m_context); + this->unknown_00BC = new UIBitmapButton(); this->unknown_00BC->SetBitmap((prefix + "btn_rewrite" + ".bmp").c_str(), 0, 0); this->unknown_00BC->SetBitmap((prefix + "btn_rewrite_a" + ".bmp").c_str(), 1, 0); this->unknown_00BC->SetBitmap((prefix + "btn_rewrite_b" + ".bmp").c_str(), 2, 0); @@ -3670,14 +3670,14 @@ void UIPetInfoWnd::Slot15(int, int) { } const char tooltip[] = "Pet Command"; - this->unknown_00C0 = new UINoneVisibleButton(*this->m_context); + this->unknown_00C0 = new UINoneVisibleButton(); this->unknown_00C0->SetSize(120, 18); this->unknown_00C0->Move(150, 44); this->unknown_00C0->SetId(268); this->AddChild(this->unknown_00C0); { const std::string prefix("유저인터페이스\\basic_interface\\"); - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap((prefix + "txtbox_btn_a" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "txtbox_btn_b" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "txtbox_btn_c" + ".bmp").c_str(), 2, 0); @@ -3689,7 +3689,7 @@ void UIPetInfoWnd::Slot15(int, int) { } this->friendlyText = LookupMessage(676); - this->friendlyGauge = new UIPetInfoBarGraph(*this->m_context); + this->friendlyGauge = new UIPetInfoBarGraph(); this->friendlyGauge->SetSize(120, 9); this->friendlyGauge->Move(145, 105); this->AddChild(this->friendlyGauge); @@ -3699,7 +3699,7 @@ void UIPetInfoWnd::Slot15(int, int) { const int petEgg = std::atoi(LookupClientItemByIdentity(g_session.m_inventoryItems, g_activePetEggIndex).itemId.c_str()); this->unknown_00E4 = g_petEvolutionMgr->IsAutoFeeding(petEgg); if (this->unknown_00E4 == true) { - this->unknown_00E8 = new UICheckBox(*this->m_context); + this->unknown_00E8 = new UICheckBox(); this->unknown_00E8->SetSize(12, 12); this->unknown_00E8->Move(this->TextWidth(LookupMessage(2577), 0, 0, 12, 0, 0) + 110, 159); this->unknown_00E8->SetBitmaps("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp"); @@ -3726,7 +3726,7 @@ int UIPetInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(2985)), 255, 0, 0, 0); break; } - this->window_00C4 = new UINormalMB(*this->m_context); + this->window_00C4 = new UINormalMB(); this->window_00C4->Create(this, LookupMessage(601), 2, true, nullptr, 280, 120, nullptr); g_windowMgr.AddRendered(this->window_00C4); g_windowMgr.CloseWindow(260); @@ -3898,7 +3898,7 @@ void UISelectServerWnd::Slot15(int width, int height) { continue; } - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -3923,7 +3923,7 @@ void UIReplayControlWnd::Slot15(int, int) { const char* const names[6] = {"replay_stop_", "replay_end_", "replay_speedadd_", "replay_speedmin_", "replay_start_", "replay_pause_"}; for (int i = 0; i < 4; ++i) { - this->m_buttons[i] = new UIBitmapButton(*this->m_context); + this->m_buttons[i] = new UIBitmapButton(); UIBitmapButton* button = static_cast(this->m_buttons[i]); button->SetBitmap((prefix + names[i] + "a.bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i] + "a.bmp").c_str(), 1, 0); @@ -3934,7 +3934,7 @@ void UIReplayControlWnd::Slot15(int, int) { this->AddChild(button); } - this->m_playButton = new UIReplayButton(*this->m_context); + this->m_playButton = new UIReplayButton(); this->m_playButton->SetBitmap((prefix + names[4] + "a.bmp").c_str(), 0, 0); this->m_playButton->SetBitmap((prefix + names[4] + "a.bmp").c_str(), 1, 0); this->m_playButton->SetBitmap((prefix + names[4] + "b.bmp").c_str(), 2, 0); @@ -3943,7 +3943,7 @@ void UIReplayControlWnd::Slot15(int, int) { this->m_playButton->SetId(ids[4]); this->AddChild(this->m_playButton); - this->m_pauseButton = new UIReplayButton(*this->m_context); + this->m_pauseButton = new UIReplayButton(); this->m_pauseButton->SetBitmap((prefix + names[5] + "a.bmp").c_str(), 0, 0); this->m_pauseButton->SetBitmap((prefix + names[5] + "a.bmp").c_str(), 1, 0); this->m_pauseButton->SetBitmap((prefix + names[5] + "b.bmp").c_str(), 2, 0); @@ -3961,7 +3961,7 @@ void UIReplayControlWnd::Slot15(int, int) { hotkey = GetHotkeyInfo(reinterpret_cast(g_session), 1, 41); static_cast(this->m_buttons[3])->SetTooltip(hotkey.text.c_str()); - this->m_progress = new UIBarGraph4(*this->m_context); + this->m_progress = new UIBarGraph4(); this->m_progress->m_plainColor = true; this->m_progress->SetSize(188, 11); this->m_progress->Move(5, 72); @@ -3970,7 +3970,7 @@ void UIReplayControlWnd::Slot15(int, int) { const int textPositions[4][2] = {{8, 26}, {8, 40}, {-100, -100}, {8, 54}}; for (int i = 0; i < 4; ++i) { - this->m_texts[i] = new UIStaticText(*this->m_context); + this->m_texts[i] = new UIStaticText(); this->m_texts[i]->SetSize(188, 14); this->m_texts[i]->SetText("", 0); this->m_texts[i]->Move(textPositions[i][0], textPositions[i][1]); @@ -4089,7 +4089,7 @@ void UIMessageBoxAutoreturn::Configure(const char* text, int timeout) { this->AddChild(this->viewer); this->viewer->SendMsg(nullptr, 29, reinterpret_cast(this->messageText.c_str()), 38, 0, 0); - this->gauge = new UIBarGraph2(*this->m_context); + this->gauge = new UIBarGraph2(); this->gauge->SetSize(240, 15); this->gauge->Move(20, this->geometry.height - 50); this->gauge->SetValue(0); diff --git a/Source/UI/Window/UIMessageBox.h b/Source/UI/Window/UIMessageBox.h index f0727ffd..d0499feb 100644 --- a/Source/UI/Window/UIMessageBox.h +++ b/Source/UI/Window/UIMessageBox.h @@ -21,7 +21,9 @@ struct UIMessageBoxContext { class UIMessageBox : public UIFrameWnd { public: - UIMessageBox(UIWindowContext& windows, UIMessageBoxContext& dialog); + UIMessageBox(UIMessageBoxContext& dialog); + UIMessageBox(UIWindowContext&, UIMessageBoxContext& dialog) : UIMessageBox(dialog) { + } ~UIMessageBox() override; void Slot18() override; void Slot19() override; diff --git a/Source/UI/Window/UIMessageBoxAutoreturn.h b/Source/UI/Window/UIMessageBoxAutoreturn.h index c55b48a0..2b36ca78 100644 --- a/Source/UI/Window/UIMessageBoxAutoreturn.h +++ b/Source/UI/Window/UIMessageBoxAutoreturn.h @@ -10,7 +10,7 @@ class UIBarGraph2; class UIMessageBoxAutoreturn : public UIFrameWnd { public: - UIMessageBoxAutoreturn(UIWindowContext& windows); + UIMessageBoxAutoreturn(); void Slot19() override; void Paint() override; diff --git a/Source/UI/Window/UIMonsterDisplayWnd.h b/Source/UI/Window/UIMonsterDisplayWnd.h index b920d312..2bf9aa05 100644 --- a/Source/UI/Window/UIMonsterDisplayWnd.h +++ b/Source/UI/Window/UIMonsterDisplayWnd.h @@ -8,7 +8,7 @@ class UIMonsterDisplayWnd : public UIFrameWnd { public: - UIMonsterDisplayWnd(UIWindowContext& windows); + UIMonsterDisplayWnd(); /* 00B4 */ std::string m_name; /* 00CC */ std::string unknown_00CC; /* 00E4 */ unsigned char unknown_00E4; diff --git a/Source/UI/Window/UIMonsterInfoWnd.h b/Source/UI/Window/UIMonsterInfoWnd.h index 01807a22..24056c08 100644 --- a/Source/UI/Window/UIMonsterInfoWnd.h +++ b/Source/UI/Window/UIMonsterInfoWnd.h @@ -22,7 +22,7 @@ struct MonsterInfo { class UIMonsterInfoWnd : public UIFrameWnd { public: - UIMonsterInfoWnd(UIWindowContext& windows); + UIMonsterInfoWnd(); void Slot15(int width, int height) override; void Slot28(int x, int y) override; diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp index 5a0f9691..a6c028e1 100644 --- a/Source/UI/Window/UINavigationWnd.cpp +++ b/Source/UI/Window/UINavigationWnd.cpp @@ -88,7 +88,7 @@ std::vector g_navigationLabels; // OFFSET: 0x00921A70 // FUNCTION: fn_12643 void UINavigationWnd::Slot15(int width, int height) { - this->m_routePanel = new UIListBoxNavi(*this->m_context); + this->m_routePanel = new UIListBoxNavi(); this->m_routePanel->SetSize(215, 96); this->m_routePanel->backgroundRed = 210; this->m_routePanel->backgroundGreen = 210; @@ -97,7 +97,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->m_routePanel->Move(-1000, -1000); this->AddChild(this->m_routePanel); - this->m_searchPanel = new UIListBoxNavi(*this->m_context); + this->m_searchPanel = new UIListBoxNavi(); this->m_searchPanel->SetSize(215, 96); this->m_searchPanel->backgroundRed = 210; this->m_searchPanel->backgroundGreen = 210; @@ -109,7 +109,7 @@ void UINavigationWnd::Slot15(int width, int height) { std::string base = "유저인터페이스\\"; - this->unknown_0128 = new UIResizer(*this->m_context); + this->unknown_0128 = new UIResizer(); this->unknown_0128->SetSize(14, 14); this->unknown_0128->SetDirection(7); this->unknown_0128->SetBitmapName((base + "btn_resize.bmp").c_str()); @@ -127,7 +127,7 @@ void UINavigationWnd::Slot15(int width, int height) { const int ids[6] = {321, 184, 189, 190, 284, 191}; for (int index = 0; index < 6; ++index) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->m_buttons[index] = button; button->SetBitmap((path + names[index] + "_A.bmp").c_str(), 0, 0); button->SetBitmap((path + names[index] + "_B.bmp").c_str(), 1, 0); @@ -142,7 +142,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->m_closeButton = this->AddCloseButton(LookupMessage(0x89A), 0); this->m_minimizeButton = this->AddMinimizeButton("", 0); - this->unknown_0120 = new UIBitmapButton(*this->m_context); + this->unknown_0120 = new UIBitmapButton(); this->unknown_0120->SetBitmap((path + "NaviHelp_off.bmp").c_str(), 0, 0); this->unknown_0120->SetBitmap((path + "NaviHelp_on.bmp").c_str(), 1, 0); this->unknown_0120->SetBitmap((path + "NaviHelp_on.bmp").c_str(), 2, 0); @@ -152,7 +152,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->unknown_0120->SetTooltip(LookupMessage(0x89D)); this->AddChild(this->unknown_0120); - this->unknown_00EC = new UIComboBoxDefWnd(*this->m_context); + this->unknown_00EC = new UIComboBoxDefWnd(); this->unknown_00EC->dropdownHeight = 67; this->unknown_00EC->SetSize(56, 18); this->unknown_00EC->Move(-1000, -1000); @@ -168,7 +168,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->unknown_00EC->AddOption(LookupMessage(0x8A0), 0); this->unknown_00EC->AddOption(LookupMessage(0x8A1), 0); - this->m_titleBar = new UIEditCtrl(*this->m_context); + this->m_titleBar = new UIEditCtrl(); this->m_titleBar->SetSize(226, 18); this->m_titleBar->Move(-1000, -1000); this->m_titleBar->maximum = 60; @@ -186,7 +186,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->m_titleBar->Invalidate(); } - UICheckBox* box = new UICheckBox(*this->m_context); + UICheckBox* box = new UICheckBox(); this->unknown_0118 = box; box->SetSize(this->TextWidth(LookupMessage(0x8A3), 10, 0, 12, 0, 0), 12); path = base; @@ -196,7 +196,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->unknown_0118->SetTooltip(LookupMessage(0x8A4)); this->AddChild(this->unknown_0118); - box = new UICheckBox(*this->m_context); + box = new UICheckBox(); this->unknown_0114 = box; box->SetSize(this->TextWidth(LookupMessage(0x8A5), 10, 0, 12, 0, 0), 12); path = base; @@ -206,7 +206,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->unknown_0114->SetTooltip(LookupMessage(0x8A6)); this->AddChild(this->unknown_0114); - box = new UICheckBox(*this->m_context); + box = new UICheckBox(); this->unknown_011C = box; box->SetSize(this->TextWidth(LookupMessage(0x8A7), 10, 0, 12, 0, 0), 12); path = base; diff --git a/Source/UI/Window/UINewMakeCharWnd.cpp b/Source/UI/Window/UINewMakeCharWnd.cpp index 2e15625e..cee55cb6 100644 --- a/Source/UI/Window/UINewMakeCharWnd.cpp +++ b/Source/UI/Window/UINewMakeCharWnd.cpp @@ -31,7 +31,7 @@ // OFFSET: 0x007D9A50 // FUNCTION: fn_09609 UINewMakeCharWnd::UINewMakeCharWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), + : UIFrameWnd(0), unknown_02C0(0), m_race(0), m_raceViews() { @@ -300,7 +300,7 @@ int UIHairStyleButton::SendMsg(UIWindow* sender, int message, std::intptr_t argu // OFFSET: 0x007DA290 // FUNCTION: fn_09613 void UIHairStyleButton::Slot15(int width, int height) { - this->m_preview = new (std::nothrow) UIHairBitmap(*this->m_context); + this->m_preview = new (std::nothrow) UIHairBitmap(); this->m_preview->SetSize(36, 37); this->AddChild(this->m_preview); this->SendMsg(nullptr, 40, 0, 0, 0, 0); @@ -343,7 +343,7 @@ void UINewMakeCharWnd::sub_7DBFD0() { // OFFSET: 0x007DA340 // FUNCTION: fn_09614 void UINewMakeCharWnd::Slot15(int width, int height) { - UIBitmapButton* closeButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* closeButton = new UIBitmapButton(); closeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_close_normal.bmp", 0, 0); closeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_close_over.bmp", 1, 0); closeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_close_press.bmp", 2, 0); @@ -352,7 +352,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { closeButton->SetId(0xB9); this->AddChild(closeButton); - UIBmpTextButton* makeButton = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* makeButton = new UIBmpTextButton(); makeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_make_normal.bmp", 0, 0); makeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_make_over.bmp", 1, 0); makeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_make_press.bmp", 2, 0); @@ -365,7 +365,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { makeButton->SetId(0xB8); this->AddChild(makeButton); - UIBmpTextButton* cancelButton = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* cancelButton = new UIBmpTextButton(); cancelButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_make_normal.bmp", 0, 0); cancelButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_make_over.bmp", 1, 0); cancelButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_make_press.bmp", 2, 0); @@ -378,7 +378,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { cancelButton->SetId(0xB9); this->AddChild(cancelButton); - this->m_nameEdit = new UIEditCtrl2(*this->m_context); + this->m_nameEdit = new UIEditCtrl2(); this->m_nameEdit->SetSize(0x82, 0x14); this->m_nameEdit->Move(0x1B3, 0x10C); this->m_nameEdit->maximum = 0x17; @@ -411,7 +411,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { this->m_raceViews[1] = doram; this->AddChild(doram); - this->m_genderButtons[1] = new UIBitmapButton(*this->m_context); + this->m_genderButtons[1] = new UIBitmapButton(); this->m_genderButtons[1]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_male_off.bmp", 0, 0); this->m_genderButtons[1]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_male_over.bmp", 1, 0); this->m_genderButtons[1]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_male_press.bmp", 2, 0); @@ -420,7 +420,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { this->m_genderButtons[1]->SetId(0x20D); this->AddChild(this->m_genderButtons[1]); - this->m_genderButtons[0] = new UIBitmapButton(*this->m_context); + this->m_genderButtons[0] = new UIBitmapButton(); this->m_genderButtons[0]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_female_off.bmp", 0, 0); this->m_genderButtons[0]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_female_over.bmp", 1, 0); this->m_genderButtons[0]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_female_press.bmp", 2, 0); @@ -435,7 +435,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { this->m_genderButtons[0]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_female_on.bmp", 0, 0); } - UIBitmapButton* leftTurn = new UIBitmapButton(*this->m_context); + UIBitmapButton* leftTurn = new UIBitmapButton(); leftTurn->SetBitmap("유저인터페이스\\make_character_ver2\\bt_leftTurn_normal.bmp", 0, 0); leftTurn->SetBitmap("유저인터페이스\\make_character_ver2\\bt_leftTurn_over.bmp", 1, 0); leftTurn->SetBitmap("유저인터페이스\\make_character_ver2\\bt_leftTurn_press.bmp", 2, 0); @@ -446,7 +446,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { leftTurn->SetTooltip(LookupMessage(0x87E)); this->AddChild(leftTurn); - UIBitmapButton* rightTurn = new UIBitmapButton(*this->m_context); + UIBitmapButton* rightTurn = new UIBitmapButton(); rightTurn->SetBitmap("유저인터페이스\\make_character_ver2\\bt_rightTurn_normal.bmp", 0, 0); rightTurn->SetBitmap("유저인터페이스\\make_character_ver2\\bt_rightTurn_over.bmp", 1, 0); rightTurn->SetBitmap("유저인터페이스\\make_character_ver2\\bt_rightTurn_press.bmp", 2, 0); @@ -457,7 +457,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { rightTurn->SetTooltip(LookupMessage(0x87F)); this->AddChild(rightTurn); - UIStaticText* hairStyleTitle = new UIStaticText(*this->m_context); + UIStaticText* hairStyleTitle = new UIStaticText(); hairStyleTitle->SetSize(100, 0xF); hairStyleTitle->SetText(LookupMessage(0xD12), 0); hairStyleTitle->SetColor(0x40, 0x40, 0x40); @@ -466,7 +466,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { this->AddChild(hairStyleTitle); for (int index = 0; index < 24; ++index) { - this->m_hairStyleButtons[index] = new UIHairStyleButton(*this->m_context, index, this->m_sex); + this->m_hairStyleButtons[index] = new UIHairStyleButton(index, this->m_sex); this->m_hairStyleButtons[index]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_hairStyle_normal.bmp", 0, 0); this->m_hairStyleButtons[index]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_hairStyle_over.bmp", 1, 0); this->m_hairStyleButtons[index]->SetBitmap("유저인터페이스\\make_character_ver2\\bt_hairStyle_select.bmp", 2, 0); @@ -479,7 +479,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { } } - UIStaticText* hairColorTitle = new UIStaticText(*this->m_context); + UIStaticText* hairColorTitle = new UIStaticText(); hairColorTitle->SetSize(100, 0xF); hairColorTitle->SetText(LookupMessage(0xD13), 0); hairColorTitle->SetColor(0x40, 0x40, 0x40); @@ -490,7 +490,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) { char name[128]; memset(name, 0, sizeof(name)); for (int index = 0; index < 9; ++index) { - UIBmpRadioBtn* button = new UIBmpRadioBtn(*this->m_context); + UIBmpRadioBtn* button = new UIBmpRadioBtn(); memset(name, 0, 0x40); sprintf(name, "유저인터페이스\\make_character_ver2\\color%02d_off.bmp", index + 1); button->SetBitmap(name, 0); diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h index b33364dc..63ae0d75 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Window/UINewMakeCharWnd.h @@ -35,10 +35,6 @@ public: class UIHairStyleButton : public UIBitmapButton { public: - // INLINED - UIHairStyleButton(UIWindowContext& windows, int style, int sex) - : UIBitmapButton(windows), m_style(style), m_sex(sex), m_race(0), m_preview(nullptr), m_selected(false) { - } UIHairStyleButton(int style, int sex); void Slot15(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Window/UINewSelectCharWnd.cpp index 67a7b9cf..fc909555 100644 --- a/Source/UI/Window/UINewSelectCharWnd.cpp +++ b/Source/UI/Window/UINewSelectCharWnd.cpp @@ -93,7 +93,7 @@ static_assert(sizeof(CharacterMovePacket) == 8); // OFFSET: 0x007D4190 // FUNCTION: fn_09577 -UINewSelectCharWnd::UINewSelectCharWnd() : UIFrameWnd(*reinterpret_cast(nullptr), 0) { +UINewSelectCharWnd::UINewSelectCharWnd() : UIFrameWnd(0) { this->m_slotsPerPage = 15; this->m_unknown13C = false; this->m_window100 = nullptr; @@ -193,7 +193,7 @@ void UINewSelectCharWnd::Slot15(int width, int height) { for (int index = 0; index < this->m_slotsPerPage; ++index) { const int slot = this->m_page * this->m_slotsPerPage + index; - UISlotBmpButton* button = new UISlotBmpButton(*this->m_context, index, true); + UISlotBmpButton* button = new UISlotBmpButton(index, true); button->SetBitmap("유저인터페이스\\select_character_ver3\\img_slot2_normal.bmp", 0, 0); button->SetBitmap("유저인터페이스\\select_character_ver3\\img_slot2_over.bmp", 1, 0); button->SetBitmap("유저인터페이스\\select_character_ver3\\img_slot2_press.bmp", 2, 0); @@ -222,7 +222,7 @@ void UINewSelectCharWnd::Slot15(int width, int height) { closeButton->SetId(0xB9); this->AddChild(closeButton); - this->m_textButton = new UIBmpTextButton(*this->m_context); + this->m_textButton = new UIBmpTextButton(); this->m_textButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_normal.bmp", 0, 0); this->m_textButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_over.bmp", 1, 0); this->m_textButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_press.bmp", 2, 0); @@ -236,7 +236,7 @@ void UINewSelectCharWnd::Slot15(int width, int height) { this->m_textButton->Enable(0); this->AddChild(this->m_textButton); - UIBmpTextButton* startButton = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* startButton = new UIBmpTextButton(); this->m_windowC0 = startButton; startButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_normal.bmp", 0, 0); startButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_over.bmp", 1, 0); @@ -256,7 +256,7 @@ void UINewSelectCharWnd::Slot15(int width, int height) { startButton->Invalidate(); } - UIBmpTextButton* cancelDeleteButton = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* cancelDeleteButton = new UIBmpTextButton(); this->m_windowC4 = cancelDeleteButton; cancelDeleteButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_normal.bmp", 0, 0); cancelDeleteButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_over.bmp", 1, 0); @@ -271,7 +271,7 @@ void UINewSelectCharWnd::Slot15(int width, int height) { cancelDeleteButton->Enable(0); this->AddChild(cancelDeleteButton); - UIBmpTextButton* gameStartButton = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* gameStartButton = new UIBmpTextButton(); this->m_windowFC = gameStartButton; gameStartButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_gameStart_off.bmp", 0, 0); gameStartButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_gameStart_over.bmp", 1, 0); @@ -287,7 +287,7 @@ void UINewSelectCharWnd::Slot15(int width, int height) { gameStartButton->AddTextStyle(3, 0x12, 0x7F74DC, 1, 0, -1000, 0x39); this->AddChild(gameStartButton); - UIBmpTextButton* deleteButton = new UIBmpTextButton(*this->m_context); + UIBmpTextButton* deleteButton = new UIBmpTextButton(); this->m_window100 = deleteButton; deleteButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_normal.bmp", 0, 0); deleteButton->SetBitmap("유저인터페이스\\select_character_ver3\\bt_info_over.bmp", 1, 0); diff --git a/Source/UI/Window/UINormalMB.cpp b/Source/UI/Window/UINormalMB.cpp index 14771e43..eb6e6794 100644 --- a/Source/UI/Window/UINormalMB.cpp +++ b/Source/UI/Window/UINormalMB.cpp @@ -12,7 +12,7 @@ // OFFSET: 0x00946C00 // FUNCTION: fn_12851 -UINormalMB::UINormalMB(UIWindowContext& windows) : UIFrameWnd(windows, 0), m_owner(nullptr), m_viewer(nullptr) { +UINormalMB::UINormalMB() : UIFrameWnd(0), m_owner(nullptr), m_viewer(nullptr) { this->m_keepOpen = 0; } @@ -60,7 +60,7 @@ int UINormalMB::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::int // INLINED __forceinline void UINormalMB::AddButton(const char* normal, const char* hover, const char* pressed, int x, int y, int id) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap(normal, 0, 0); button->SetBitmap(hover, 1, 0); button->SetBitmap(pressed, 2, 0); @@ -85,7 +85,7 @@ void UINormalMB::Create(UIWindow* owner, const char* text, int type, bool defaul int inset = 0; if (icon) { - auto* image = new UIStaticBitmap(*this->m_context); + auto* image = new UIStaticBitmap(); image->SetBitmap(icon); image->SetSize(image->geometry.width, image->geometry.height); image->Move(10, 22); @@ -93,7 +93,7 @@ void UINormalMB::Create(UIWindow* owner, const char* text, int type, bool defaul inset = image->geometry.width + image->geometry.x; } - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(inset + 10, 22, width - inset - 20, height - 55, 0); unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); diff --git a/Source/UI/Window/UINormalMB.h b/Source/UI/Window/UINormalMB.h index d4b4bbf0..23d829d7 100644 --- a/Source/UI/Window/UINormalMB.h +++ b/Source/UI/Window/UINormalMB.h @@ -12,7 +12,7 @@ class UINormalMB : public UIFrameWnd { friend class UICashEmotionListWnd; public: - UINormalMB(UIWindowContext& windows); + UINormalMB(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetAction(int id, void (*action)()); diff --git a/Source/UI/Window/UINoticeWnd.h b/Source/UI/Window/UINoticeWnd.h index 05715194..12a54799 100644 --- a/Source/UI/Window/UINoticeWnd.h +++ b/Source/UI/Window/UINoticeWnd.h @@ -5,7 +5,7 @@ class UINoticeWnd : public UIFrameWnd { public: - UINoticeWnd(UIWindowContext& windows); + UINoticeWnd(); void Slot15(int width, int height) override; void Slot18() override; diff --git a/Source/UI/Window/UIPadding.h b/Source/UI/Window/UIPadding.h index be0b358a..ec411db2 100644 --- a/Source/UI/Window/UIPadding.h +++ b/Source/UI/Window/UIPadding.h @@ -8,7 +8,7 @@ class CUIPadding : public CUIControl { public: // INLINED - explicit CUIPadding(UIWindowContext& context) : CUIControl(context), color(0xFFFFFF), left(3), top(3), right(3), bottom(3) { + explicit CUIPadding() : CUIControl(), color(0xFFFFFF), left(3), top(3), right(3), bottom(3) { } bool CanHitTest() override; diff --git a/Source/UI/Window/UIPayConfirmWnd.h b/Source/UI/Window/UIPayConfirmWnd.h index 255df078..10c66e0b 100644 --- a/Source/UI/Window/UIPayConfirmWnd.h +++ b/Source/UI/Window/UIPayConfirmWnd.h @@ -10,7 +10,7 @@ struct BitmapImage; class UIPayConfirmWnd : public UIMessageBox { public: // INLINED - UIPayConfirmWnd(UIWindowContext& windows, UIMessageBoxContext& dialog) : UIMessageBox(windows, dialog) { + UIPayConfirmWnd(UIMessageBoxContext& dialog) : UIMessageBox(dialog) { } void Configure(const std::string& text, int itemId); diff --git a/Source/UI/Window/UIPetInfoWnd.h b/Source/UI/Window/UIPetInfoWnd.h index 9e9ced60..70b5acf5 100644 --- a/Source/UI/Window/UIPetInfoWnd.h +++ b/Source/UI/Window/UIPetInfoWnd.h @@ -17,7 +17,7 @@ struct WindowResponseRecorder; class UIPetInfoWnd : public UIFrameWnd { public: - UIPetInfoWnd(UIWindowContext& windows); + UIPetInfoWnd(); ~UIPetInfoWnd() override; void Slot11() override; diff --git a/Source/UI/Window/UIReplayControlWnd.h b/Source/UI/Window/UIReplayControlWnd.h index 762fe121..93e921e1 100644 --- a/Source/UI/Window/UIReplayControlWnd.h +++ b/Source/UI/Window/UIReplayControlWnd.h @@ -9,7 +9,7 @@ class UIStaticText; class UIReplayControlWnd : public UIFrameWnd { public: - UIReplayControlWnd(UIWindowContext& windows); + UIReplayControlWnd(); bool Slot03() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UIReplayRECControlWnd.h b/Source/UI/Window/UIReplayRECControlWnd.h index 3ee5b578..3276d5f2 100644 --- a/Source/UI/Window/UIReplayRECControlWnd.h +++ b/Source/UI/Window/UIReplayRECControlWnd.h @@ -15,7 +15,7 @@ class UIStaticText; class UIReplayRECControlWnd : public UIFrameWnd { public: - UIReplayRECControlWnd(UIWindowContext& windows, int mode); + UIReplayRECControlWnd(int mode); ~UIReplayRECControlWnd() override; bool Slot03() override; diff --git a/Source/UI/Window/UIResizer.cpp b/Source/UI/Window/UIResizer.cpp index 6d47eb78..31ee21fb 100644 --- a/Source/UI/Window/UIResizer.cpp +++ b/Source/UI/Window/UIResizer.cpp @@ -139,6 +139,6 @@ void UIResizer::SetDirection(int value) { // OFFSET: 0x00850120 // FUNCTION: fn_10671 -UIResizer::UIResizer(UIWindowContext& windows) - : UIWindow(windows, 0), direction(0), parentWidth(0), parentHeight(0), lineColor(0xFFFF00FF), backgroundColor(0xFFFF00FF) { +UIResizer::UIResizer() + : UIWindow(0), direction(0), parentWidth(0), parentHeight(0), lineColor(0xFFFF00FF), backgroundColor(0xFFFF00FF) { } diff --git a/Source/UI/Window/UIResizer.h b/Source/UI/Window/UIResizer.h index c94436a1..c3cd877f 100644 --- a/Source/UI/Window/UIResizer.h +++ b/Source/UI/Window/UIResizer.h @@ -8,7 +8,9 @@ class UIResizer : public UIWindow { public: - explicit UIResizer(UIWindowContext& windows); + UIResizer(); + UIResizer(UIWindowContext&) : UIResizer() { + } void Paint() override; void Slot25(int x, int y) override; void Slot27(int x, int y) override; diff --git a/Source/UI/Window/UIRoulletteWnd.cpp b/Source/UI/Window/UIRoulletteWnd.cpp index f3a1d5d1..06d15587 100644 --- a/Source/UI/Window/UIRoulletteWnd.cpp +++ b/Source/UI/Window/UIRoulletteWnd.cpp @@ -49,7 +49,7 @@ struct RouletteReceiveItemPacket { // OFFSET: 0x0080B930 // FUNCTION: fn_10083 UIRoulletteWnd::UIRoulletteWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), + : UIFrameWnd(0), m_prizeButton(nullptr), m_prizeSprite(nullptr), m_stageArrow(nullptr), @@ -107,7 +107,7 @@ ITEM_INFO UIRoulletteWnd::ItemAt(int x, int y) { void UIRoulletteWnd::Slot15(int, int) { this->AddCloseButton("", 0); - auto* startButton = new UIBitmapButton(*reinterpret_cast(nullptr)); + auto* startButton = new UIBitmapButton(); this->m_startButton = startButton; startButton->SetBitmap("유저인터페이스\\basic_interface\\roullette\\StartRoullette_a.bmp", 0, 0); startButton->SetBitmap("유저인터페이스\\basic_interface\\roullette\\StartRoullette_a.bmp", 1, 0); @@ -118,7 +118,7 @@ void UIRoulletteWnd::Slot15(int, int) { this->AddChild(startButton); if (g_effectDetailLevel == 2) { - auto* startSprite = new UISpriteButton(*reinterpret_cast(nullptr)); + auto* startSprite = new UISpriteButton(); this->m_startSprite = startSprite; startSprite->SetSprite("roullette\\Start.spr"); startSprite->SetActName("roullette\\Start.act"); @@ -129,7 +129,7 @@ void UIRoulletteWnd::Slot15(int, int) { startSprite->unknown_00C4 = 1; this->AddChild(startSprite); - auto* prizeSprite = new UISpriteButton(*reinterpret_cast(nullptr)); + auto* prizeSprite = new UISpriteButton(); this->m_prizeSprite = prizeSprite; prizeSprite->SetSprite("roullette\\GetWinPrize.spr"); prizeSprite->SetActName("roullette\\GetWinPrize.act"); @@ -140,7 +140,7 @@ void UIRoulletteWnd::Slot15(int, int) { prizeSprite->unknown_00C4 = 1; this->AddChild(prizeSprite); - auto* stageArrow = new UISpriteButton(*reinterpret_cast(nullptr)); + auto* stageArrow = new UISpriteButton(); this->m_stageArrow = stageArrow; stageArrow->SetSprite("roullette\\stageArrow.spr"); stageArrow->SetActName("roullette\\stageArrow.act"); @@ -152,7 +152,7 @@ void UIRoulletteWnd::Slot15(int, int) { this->AddChild(stageArrow); } - auto* prizeButton = new UIBitmapButton(*reinterpret_cast(nullptr)); + auto* prizeButton = new UIBitmapButton(); this->m_prizeButton = prizeButton; prizeButton->SetBitmap("유저인터페이스\\basic_interface\\roullette\\GetWinPrize_a.bmp", 0, 0); prizeButton->SetBitmap("유저인터페이스\\basic_interface\\roullette\\GetWinPrize_a.bmp", 1, 0); @@ -162,21 +162,21 @@ void UIRoulletteWnd::Slot15(int, int) { prizeButton->SetId(410); this->AddChild(prizeButton); - auto* goldText = new UIStaticText(*reinterpret_cast(nullptr)); + auto* goldText = new UIStaticText(); this->m_goldText = goldText; goldText->SetSize(25, 12); goldText->Move(575, 134); goldText->SetColor(0, 0, 0); this->AddChild(goldText); - auto* silverText = new UIStaticText(*reinterpret_cast(nullptr)); + auto* silverText = new UIStaticText(); this->m_silverText = silverText; silverText->SetSize(25, 12); silverText->Move(575, 218); silverText->SetColor(0, 0, 0); this->AddChild(silverText); - auto* bronzeText = new UIStaticText(*reinterpret_cast(nullptr)); + auto* bronzeText = new UIStaticText(); this->m_bronzeText = bronzeText; bronzeText->SetSize(25, 12); bronzeText->Move(575, 302); diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp index 694d88f3..88693583 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Window/UISeekPartyListWnd.cpp @@ -46,7 +46,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { { std::string title(LookupMessage(0x699)); - this->m_title = new UIStaticText(*this->m_context); + this->m_title = new UIStaticText(); this->m_title->SetSize(this->geometry.width - 0x20, 0xF); this->m_title->SetTextFitted(title.c_str()); this->m_title->Move(0x10, 2); @@ -58,14 +58,14 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->AddMinimizeButton("", 0); label = "LEVEL"; - this->m_levelLabel = new UIStaticText(*this->m_context); + this->m_levelLabel = new UIStaticText(); this->m_levelLabel->SetSize(this->geometry.width - 10, 0x1E); this->m_levelLabel->SetText(label.c_str(), 1); this->m_levelLabel->Move(10, 0x17); this->m_levelLabel->shadow = 1; this->AddChild(this->m_levelLabel); - this->m_searchEdit = new UIEditCtrl(*this->m_context); + this->m_searchEdit = new UIEditCtrl(); this->m_searchEdit->SetSize(0x28, 0x10); this->m_searchEdit->Move(0x32, 0x14); this->m_searchEdit->maximum = 5; @@ -75,7 +75,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->AddChild(this->m_searchEdit); label = "MAP"; - this->m_mapLabel = new UIStaticText(*this->m_context); + this->m_mapLabel = new UIStaticText(); this->m_mapLabel->SetSize(this->geometry.width - 10, 0x1E); this->m_mapLabel->SetText(label.c_str(), 1); this->m_mapLabel->Move(10, 0x2D); @@ -83,7 +83,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->AddChild(this->m_mapLabel); label = "JOB"; - this->m_jobLabel = new UIStaticText(*this->m_context); + this->m_jobLabel = new UIStaticText(); this->m_jobLabel->SetSize(this->geometry.width - 10, 0x1E); this->m_jobLabel->SetText(label.c_str(), 1); this->m_jobLabel->Move(10, 0x46); @@ -91,41 +91,41 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->AddChild(this->m_jobLabel); label = LookupMessage(0x72A); - this->m_footerText = new UIStaticText(*this->m_context); + this->m_footerText = new UIStaticText(); this->m_footerText->SetSize(this->geometry.width - 10, 0x1E); this->m_footerText->SetText(label.c_str(), 0); this->m_footerText->Move(100, this->geometry.height - 0x14); this->AddChild(this->m_footerText); - this->m_filterLabel0 = new UIStaticText(*this->m_context); + this->m_filterLabel0 = new UIStaticText(); this->m_filterLabel0->SetSize(0x32, 0x14); this->m_filterLabel0->SetText(LookupMessage(0x6A1), 0); this->m_filterLabel0->Move(0x21, 0x68); this->AddChild(this->m_filterLabel0); - this->m_filterLabel1 = new UIStaticText(*this->m_context); + this->m_filterLabel1 = new UIStaticText(); this->m_filterLabel1->SetSize(0x32, 0x14); this->m_filterLabel1->SetText(LookupMessage(0x197), 0); this->m_filterLabel1->Move(0x6A, 0x68); this->AddChild(this->m_filterLabel1); - this->m_filterLabel2 = new UIStaticText(*this->m_context); + this->m_filterLabel2 = new UIStaticText(); this->m_filterLabel2->SetSize(0x32, 0x14); this->m_filterLabel2->SetText(LookupMessage(0x198), 0); this->m_filterLabel2->Move(0xDC, 0x68); this->AddChild(this->m_filterLabel2); - this->m_filterLabel3 = new UIStaticText(*this->m_context); + this->m_filterLabel3 = new UIStaticText(); this->m_filterLabel3->SetSize(0x32, 0x14); this->m_filterLabel3->SetText(LookupMessage(0x6A2), 0); this->m_filterLabel3->Move(0x16D, 0x68); this->AddChild(this->m_filterLabel3); - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(0x203, 0x78, 1, 200); this->AddChild(this->m_scrollBar); - this->m_jobCategoryCombo = new UIComboBoxDefWnd(*this->m_context); + this->m_jobCategoryCombo = new UIComboBoxDefWnd(); this->m_jobCategoryCombo->dropdownHeight = 0x50; this->m_jobCategoryCombo->SetSize(0x96, 0x12); this->m_jobCategoryCombo->Move(0x32, 0x44); @@ -137,7 +137,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_jobCategoryCombo->blue = 0xE8; this->AddChild(this->m_jobCategoryCombo); - this->m_jobCombo = new UIComboBoxDefWnd(*this->m_context); + this->m_jobCombo = new UIComboBoxDefWnd(); this->m_jobCombo->dropdownHeight = 0x50; this->m_jobCombo->SetSize(200, 0x12); this->m_jobCombo->Move(0xDC, 0x44); @@ -149,7 +149,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_jobCombo->blue = 0xE8; this->AddChild(this->m_jobCombo); - this->m_regionCombo = new UIComboBoxDefWnd(*this->m_context); + this->m_regionCombo = new UIComboBoxDefWnd(); this->m_regionCombo->dropdownHeight = 0x50; this->m_regionCombo->SetSize(0x96, 0x12); this->m_regionCombo->Move(0x32, 0x2B); @@ -161,7 +161,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_regionCombo->blue = 0xE8; this->AddChild(this->m_regionCombo); - this->m_mapCombo = new UIComboBoxDefWnd(*this->m_context); + this->m_mapCombo = new UIComboBoxDefWnd(); this->m_mapCombo->dropdownHeight = 0x50; this->m_mapCombo->SetSize(200, 0x12); this->m_mapCombo->Move(0xDC, 0x2B); @@ -173,7 +173,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_mapCombo->blue = 0xE8; this->AddChild(this->m_mapCombo); - this->m_alarmCheck = new UICheckBox(*this->m_context); + this->m_alarmCheck = new UICheckBox(); this->m_alarmCheck->SetSize(0x3C, 0x14); this->m_alarmCheck->SetSize(100, 0xC); this->m_alarmCheck->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(0x69E)); @@ -183,7 +183,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\"; - this->m_okButton = new UIBitmapButton(*this->m_context); + this->m_okButton = new UIBitmapButton(); this->m_okButton->SetBitmap((path + "btn_ok" + ".bmp").c_str(), 0, 0); this->m_okButton->SetBitmap((path + "btn_ok_a" + ".bmp").c_str(), 1, 0); this->m_okButton->SetBitmap((path + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -195,7 +195,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\"; - this->m_findButton = new UIBitmapButton(*this->m_context); + this->m_findButton = new UIBitmapButton(); this->m_findButton->SetBitmap((path + "btn_find" + ".bmp").c_str(), 0, 0); this->m_findButton->SetBitmap((path + "btn_find_a" + ".bmp").c_str(), 1, 0); this->m_findButton->SetBitmap((path + "btn_find_b" + ".bmp").c_str(), 2, 0); @@ -207,7 +207,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\basic_interface\\"; - this->m_chatButton = new UIBitmapButton(*this->m_context); + this->m_chatButton = new UIBitmapButton(); this->m_chatButton->SetBitmap((path + "direct_chat" + ".bmp").c_str(), 0, 0); this->m_chatButton->SetBitmap((path + "direct_chat" + ".bmp").c_str(), 1, 0); this->m_chatButton->SetBitmap((path + "direct_chat" + ".bmp").c_str(), 2, 0); @@ -217,7 +217,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->AddChild(this->m_chatButton); } - this->m_refreshButton = new UITextButton(*this->m_context); + this->m_refreshButton = new UITextButton(); this->m_refreshButton->Configure(LookupMessage(0x6E3), 0, 0, 0xC, 0, 0); this->m_refreshButton->m_hoverColor = 0xEFB700; this->m_refreshButton->SetTooltip(LookupMessage(0x6E4)); @@ -227,7 +227,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\battle_field\\btn_help"; - this->m_tabButton = new UIBitmapButton(*this->m_context); + this->m_tabButton = new UIBitmapButton(); this->m_tabButton->SetBitmap((path + ".bmp").c_str(), 0, 0); this->m_tabButton->SetBitmap((path + "_a.bmp").c_str(), 1, 0); this->m_tabButton->SetBitmap((path + "_b.bmp").c_str(), 2, 0); @@ -706,7 +706,7 @@ void UISeekPartyListWnd::SelectJobCategory(int category) { // OFFSET: 0x00911CD0 // FUNCTION: fn_12523 UISeekPartyListWnd::UISeekPartyListWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), m_title(nullptr), m_levelLabel(nullptr), + : UIFrameWnd(0), m_title(nullptr), m_levelLabel(nullptr), m_mapLabel(nullptr), m_jobLabel(nullptr), m_filterLabel0(nullptr), m_filterLabel1(nullptr), m_filterLabel2(nullptr), m_filterLabel3(nullptr), m_searchEdit(nullptr), m_regionCombo(nullptr), m_mapCombo(nullptr), m_jobCategoryCombo(nullptr), m_jobCombo(nullptr), m_alarmCheck(nullptr), m_findButton(nullptr), m_okButton(nullptr), m_chatButton(nullptr), m_scrollBar(nullptr), m_regionMaps(), m_jobOptions(), m_region(0), diff --git a/Source/UI/Window/UISeekPartyWnd.cpp b/Source/UI/Window/UISeekPartyWnd.cpp index 1c3a2816..206e09e1 100644 --- a/Source/UI/Window/UISeekPartyWnd.cpp +++ b/Source/UI/Window/UISeekPartyWnd.cpp @@ -19,7 +19,7 @@ int g_partyBookingLevelMax; // OFFSET: 0x00912010 // FUNCTION: fn_12525 -UISeekPartyWnd::UISeekPartyWnd() : UIFrameWnd(*reinterpret_cast(nullptr), 0) { +UISeekPartyWnd::UISeekPartyWnd() : UIFrameWnd(0) { this->m_label = nullptr; this->m_cancelButton = nullptr; this->m_level = 1; @@ -40,7 +40,7 @@ void UISeekPartyWnd::Slot15(int, int) { const int maximum = g_partyBookingLevelLimit + 0xF <= g_partyBookingLevelMax ? g_partyBookingLevelLimit + 0xF : g_partyBookingLevelMax; std::sprintf(text, "%s - %d~%d", LookupMessage(0x6DA), g_partyBookingLevelLimit, maximum); - this->m_label = new UIStaticText(*this->m_context); + this->m_label = new UIStaticText(); this->m_label->SetSize(this->geometry.width - 0x20, 0xF); this->m_label->SetTextFitted(text); this->m_label->Move(0x10, 2); @@ -51,7 +51,7 @@ void UISeekPartyWnd::Slot15(int, int) { this->AddMinimizeButton("", 0); const std::string path = "유저인터페이스\\"; - this->m_cancelButton = new UIBitmapButton(*this->m_context); + this->m_cancelButton = new UIBitmapButton(); this->m_cancelButton->SetBitmap((path + "btn_cancel" + ".bmp").c_str(), 0, 0); this->m_cancelButton->SetBitmap((path + "btn_cancel_a" + ".bmp").c_str(), 1, 0); this->m_cancelButton->SetBitmap((path + "btn_cancel_b" + ".bmp").c_str(), 2, 0); @@ -60,7 +60,7 @@ void UISeekPartyWnd::Slot15(int, int) { this->m_cancelButton->SetId(0xC9); this->AddChild(this->m_cancelButton); - this->m_rewriteButton = new UIBitmapButton(*this->m_context); + this->m_rewriteButton = new UIBitmapButton(); this->m_rewriteButton->SetBitmap((path + "btn_rewrite" + ".bmp").c_str(), 0, 0); this->m_rewriteButton->SetBitmap((path + "btn_rewrite_a" + ".bmp").c_str(), 1, 0); this->m_rewriteButton->SetBitmap((path + "btn_rewrite_b" + ".bmp").c_str(), 2, 0); diff --git a/Source/UI/Window/UISelCharForUServerWnd.cpp b/Source/UI/Window/UISelCharForUServerWnd.cpp index 25d0b09e..d7c96701 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.cpp +++ b/Source/UI/Window/UISelCharForUServerWnd.cpp @@ -38,7 +38,7 @@ struct PACKET_CZ_SELECT_CHARACTERS { // OFFSET: 0x009120E0 // FUNCTION: fn_12526 UISelCharForUServerWnd::UISelCharForUServerWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), m_columns(6) { + : UIFrameWnd(0), m_columns(6) { if (g_charViewCount > 12) { this->m_columns = 9; } @@ -197,7 +197,7 @@ void UISelCharForUServerWnd::Slot27(int x, int y) { void UISelCharForUServerWnd::UpdateCharInfoBalloon(int x, int y, std::uint32_t color) { const unsigned char red = (color >> 16) & 0xFF; if (!this->unknown_19E8) { - this->unknown_19E8 = new UICharInfoBalloonText(*this->m_context); + this->unknown_19E8 = new UICharInfoBalloonText(); this->unknown_19E8->SetSize(140, 200); g_windowMgr.AddRendered(this->unknown_19E8); } diff --git a/Source/UI/Window/UISelectReplayDataWnd.h b/Source/UI/Window/UISelectReplayDataWnd.h index aeb109d7..89cac28f 100644 --- a/Source/UI/Window/UISelectReplayDataWnd.h +++ b/Source/UI/Window/UISelectReplayDataWnd.h @@ -9,7 +9,7 @@ class UIStaticText; class UISelectReplayDataWnd : public UIFrameWnd { public: - UISelectReplayDataWnd(UIWindowContext& windows); + UISelectReplayDataWnd(); void Slot15(int width, int height) override; void Slot18() override; diff --git a/Source/UI/Window/UISelectServerWnd.h b/Source/UI/Window/UISelectServerWnd.h index 275ca74e..f2f6990b 100644 --- a/Source/UI/Window/UISelectServerWnd.h +++ b/Source/UI/Window/UISelectServerWnd.h @@ -8,7 +8,7 @@ class UIListBox; class UISelectServerWnd : public UIFrameWnd { public: - UISelectServerWnd(UIWindowContext& windows); + UISelectServerWnd(); void Slot15(int width, int height) override; void Slot18() override; diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Window/UISerachStoreInfoWnd.cpp index a4522f28..f43323a0 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.cpp +++ b/Source/UI/Window/UISerachStoreInfoWnd.cpp @@ -52,7 +52,7 @@ static_assert(sizeof(SearchStoreResult) == sizeof(SessionEntry5BD4)); // OFFSET: 0x009121F0 // FUNCTION: fn_12527 UISerachStoreInfoWnd::UISerachStoreInfoWnd() - : UIFrameWnd(*reinterpret_cast(nullptr), 0), unknown_00DC(1), unknown_00E0(-1), + : UIFrameWnd(0), unknown_00DC(1), unknown_00E0(-1), unknown_00E4(0), unknown_00E8(25), unknown_00EC(0), unknown_00ED(1) { this->unknown_00F0.clear(); } @@ -87,7 +87,7 @@ ITEM_INFO UISerachStoreInfoWnd::ItemAt(int x, int y) { void UISerachStoreInfoWnd::Slot15(int width, int height) { UIRadioBtn** radio = this->m_radios; for (int x = 10; x < 90; x += 40) { - *radio = new UIRadioBtn(*this->m_context); + *radio = new UIRadioBtn(); (*radio)->SetSize(this->geometry.width / 2, 12); (*radio)->Move(x, 40); this->AddChild(*radio); @@ -97,7 +97,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->m_radios[1]->SetText(LookupMessage(0x6F3)); this->m_radios[this->unknown_00E4]->SendMsg(this, 0xD, 1, 0, 0, 0); - this->m_edits[1] = new UIEditCtrl(*this->m_context); + this->m_edits[1] = new UIEditCtrl(); this->m_edits[1]->SetSize(0x4C, 0x10); this->m_edits[1]->Move(100, 0x24); this->m_edits[1]->maximum = 0x32; @@ -106,7 +106,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->m_edits[1]->flat = 0; this->AddChild(this->m_edits[1]); - this->m_edits[0] = new UIEditCtrl(*this->m_context); + this->m_edits[0] = new UIEditCtrl(); this->m_edits[0]->SetSize(0x4C, 0x10); this->m_edits[0]->Move(0xBB, 0x24); this->m_edits[0]->maximum = 0x32; @@ -122,7 +122,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->m_edits[0]->invalidatesParent = 1; this->AddChild(this->m_edits[0]); - this->m_edits[2] = new UIEditCtrl(*this->m_context); + this->m_edits[2] = new UIEditCtrl(); this->m_edits[2]->SetSize(0x4C, 0x10); this->m_edits[2]->Move(0x113, 0x24); this->m_edits[2]->maximum = 0x32; @@ -133,7 +133,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->m_edits[2]->Invalidate(); this->AddChild(this->m_edits[2]); - this->m_edits[3] = new UIEditCtrl(*this->m_context); + this->m_edits[3] = new UIEditCtrl(); this->m_edits[3]->SetSize(0x4C, 0x10); this->m_edits[3]->Move(0x16C, 0x24); this->m_edits[3]->maximum = 0x32; @@ -144,7 +144,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->m_edits[3]->Invalidate(); this->AddChild(this->m_edits[3]); - UICheckBox* check = new UICheckBox(*this->m_context); + UICheckBox* check = new UICheckBox(); check->SetSize(0xA0, 0xC); check->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(0x6FC)); check->Move(100, 0x3C); @@ -153,7 +153,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\"; - this->m_findButton = new UIBitmapButton(*this->m_context); + this->m_findButton = new UIBitmapButton(); this->m_findButton->SetBitmap((path + "btn_find" + ".bmp").c_str(), 0, 0); this->m_findButton->SetBitmap((path + "btn_find_a" + ".bmp").c_str(), 1, 0); this->m_findButton->SetBitmap((path + "btn_find_b" + ".bmp").c_str(), 2, 0); @@ -163,7 +163,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->AddChild(this->m_findButton); } - this->m_prevButton = new UITextButton(*this->m_context); + this->m_prevButton = new UITextButton(); this->m_prevButton->Configure(LookupMessage(0x41D), 0x8E8E8E, 0, 0xC, 0, 0); this->m_prevButton->m_hoverColor = 0xEFB700; this->m_prevButton->Move( @@ -173,7 +173,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { this->m_prevButton->SetId(0x13C); this->AddChild(this->m_prevButton); - this->m_nextButton = new UITextButton(*this->m_context); + this->m_nextButton = new UITextButton(); this->m_nextButton->Configure(LookupMessage(0x41E), 0x8E8E8E, 0, 0xC, 0, 0); this->m_nextButton->m_hoverColor = 0xEFB700; this->m_nextButton->Move(this->geometry.width / 2 + 0x14, this->geometry.height - 0x15); diff --git a/Source/UI/Window/UITab.cpp b/Source/UI/Window/UITab.cpp index 843decf4..b213a83e 100644 --- a/Source/UI/Window/UITab.cpp +++ b/Source/UI/Window/UITab.cpp @@ -62,7 +62,7 @@ int UITab::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std:: // OFFSET: 0x00850680 // FUNCTION: fn_10679 -UITab::UITab(UIWindowContext& context) : UIWindow(context, 0) { +UITab::UITab() : UIWindow(0) { this->geometry.unknown_0030 = 0; this->tabCount = 3; this->style = 0; diff --git a/Source/UI/Window/UITab.h b/Source/UI/Window/UITab.h index 1e2152a5..772f7032 100644 --- a/Source/UI/Window/UITab.h +++ b/Source/UI/Window/UITab.h @@ -5,7 +5,7 @@ class UITab : public UIWindow { public: - explicit UITab(UIWindowContext& context); + UITab(); void Paint() override; void Slot25(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UITalkboxTrapInputWnd.h b/Source/UI/Window/UITalkboxTrapInputWnd.h index 402fd060..073824f8 100644 --- a/Source/UI/Window/UITalkboxTrapInputWnd.h +++ b/Source/UI/Window/UITalkboxTrapInputWnd.h @@ -19,7 +19,7 @@ struct TalkboxTrapRequest { class UITalkboxTrapInputWnd : public UIFrameWnd { public: - UITalkboxTrapInputWnd(UIWindowContext& windows); + UITalkboxTrapInputWnd(); void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 8dd2ab1c..0bf08c7e 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -218,8 +218,8 @@ static const char* FindColorCode(const char* text, const char* end) { // OFFSET: 0x00A79A90 // FUNCTION: fn_16914 -UIWindow::UIWindow(UIWindowContext& context, unsigned char cached) - : parent(nullptr), unknown_0044(0), unknown_0048(0), unknown_004C(4), m_dirty(1), m_uid(++g_windowUid), m_cached(cached), m_clip(0), m_context(&context) { +UIWindow::UIWindow(unsigned char cached) + : parent(nullptr), unknown_0044(0), unknown_0048(0), unknown_004C(4), m_dirty(1), m_uid(++g_windowUid), m_cached(cached), m_clip(0) { } // OFFSET: 0x00A79E90 @@ -1953,7 +1953,7 @@ bool UIWindow::FitSprite(const ActionFrame* frame, const CSprRes* sprite, int wi // OFFSET: 0x005C27E0 // FUNCTION: fn_03535 -UIListBox_NaviSearch::UIListBox_NaviSearch(UIWindowContext& windows) : UIListBox(windows) { +UIListBox_NaviSearch::UIListBox_NaviSearch() : UIListBox() { } // OFFSET: 0x005C3340 @@ -2262,11 +2262,11 @@ int UIWindow::RecordEditTexts(WindowReplayRecorder& recorder) { // OFFSET: 0x005C4C80 // FUNCTION: fn_03579 void UIListBox_NaviSearch::Slot15(int width, int height) { - this->verticalBar = new UIScrollBar_Navi(*this->m_context); + this->verticalBar = new UIScrollBar_Navi(); this->verticalBar->Configure(width - 7, 0, 1, height); this->AddChild(this->verticalBar); - this->horizontalBar = new UIScrollBar(*this->m_context); + this->horizontalBar = new UIScrollBar(); this->horizontalBar->Configure(0, height - 13, 0, width - 13); this->AddChild(this->horizontalBar); } @@ -2330,7 +2330,7 @@ void UIListBox_NaviSearch::Paint() { // OFFSET: 0x005C4EA0 // FUNCTION: fn_03581 void UINavigationV4Wnd::Slot15(int, int) { - UIBitmapButton* closeButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* closeButton = new UIBitmapButton(); this->unknown_00B8 = closeButton; closeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_close_normal.bmp", 0, 0); closeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_close_over.bmp", 1, 0); @@ -2340,7 +2340,7 @@ void UINavigationV4Wnd::Slot15(int, int) { closeButton->SetTooltip(LookupMessage(0x0BE5)); this->AddChild(closeButton); - UIBitmapButton* maximizeButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* maximizeButton = new UIBitmapButton(); this->unknown_00C4 = maximizeButton; maximizeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_maximize_normal.bmp", 0, 0); maximizeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_maximize_over.bmp", 1, 0); @@ -2350,7 +2350,7 @@ void UINavigationV4Wnd::Slot15(int, int) { maximizeButton->SetTooltip(LookupMessage(0x089B)); this->AddChild(maximizeButton); - UICheckBox* minimizeCheck = new UICheckBox(*this->m_context); + UICheckBox* minimizeCheck = new UICheckBox(); this->unknown_00D4 = minimizeCheck; minimizeCheck->SetSize(110, 12); minimizeCheck->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", "Minimize"); @@ -2358,7 +2358,7 @@ void UINavigationV4Wnd::Slot15(int, int) { minimizeCheck->SetTooltip(LookupMessage(0x089C)); this->AddChild(minimizeCheck); - UIBitmapButton* roadIconButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* roadIconButton = new UIBitmapButton(); this->unknown_00C8 = roadIconButton; this->SetRoadIcon(g_navigationRoadIcon); roadIconButton->SetSize(roadIconButton->geometry.width, roadIconButton->geometry.height); @@ -2366,7 +2366,7 @@ void UINavigationV4Wnd::Slot15(int, int) { roadIconButton->SetTooltip(LookupMessage(0x0C8B)); this->AddChild(roadIconButton); - UIBitmapButton* roadListButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* roadListButton = new UIBitmapButton(); this->unknown_00D8 = roadListButton; roadListButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_roadlistwnd_normal.bmp", 0, 0); roadListButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_roadlistwnd_over.bmp", 1, 0); @@ -2376,7 +2376,7 @@ void UINavigationV4Wnd::Slot15(int, int) { roadListButton->SetTooltip(LookupMessage(0x0C85)); this->AddChild(roadListButton); - UIListBox_NaviSearch* roadList = new UIListBox_NaviSearch(*this->m_context); + UIListBox_NaviSearch* roadList = new UIListBox_NaviSearch(); this->unknown_00EC = roadList; roadList->SetSize(138, 244); roadList->backgroundRed = 255; @@ -2385,7 +2385,7 @@ void UINavigationV4Wnd::Slot15(int, int) { roadList->SetId(336); this->AddChild(roadList); - UIListBox_NaviSearch* searchList = new UIListBox_NaviSearch(*this->m_context); + UIListBox_NaviSearch* searchList = new UIListBox_NaviSearch(); this->unknown_00F0 = searchList; searchList->SetSize(132, 80); searchList->backgroundRed = 240; @@ -2394,7 +2394,7 @@ void UINavigationV4Wnd::Slot15(int, int) { searchList->SetId(441); this->AddChild(searchList); - UICheckBox* filterCheck = new UICheckBox(*this->m_context); + UICheckBox* filterCheck = new UICheckBox(); this->unknown_00F4 = filterCheck; filterCheck->SetSize(110, 12); filterCheck->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", "service"); @@ -2403,7 +2403,7 @@ void UINavigationV4Wnd::Slot15(int, int) { filterCheck->SetTooltip(LookupMessage(0x0C8C)); this->AddChild(filterCheck); - UIBitmapButton* shareButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* shareButton = new UIBitmapButton(); this->unknown_00F8 = shareButton; shareButton->SetBitmap("유저인터페이스\\private_airplane\\btn_share_normal.bmp", 0, 0); shareButton->SetBitmap("유저인터페이스\\private_airplane\\btn_share_over.bmp", 1, 0); @@ -2413,7 +2413,7 @@ void UINavigationV4Wnd::Slot15(int, int) { shareButton->SetTooltip(LookupMessage(0x0C86)); this->AddChild(shareButton); - UIBitmapButton* findButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* findButton = new UIBitmapButton(); this->unknown_00FC = findButton; findButton->SetBitmap("유저인터페이스\\private_airplane\\btn_find_normal.bmp", 0, 0); findButton->SetBitmap("유저인터페이스\\private_airplane\\btn_find_over.bmp", 1, 0); @@ -2423,7 +2423,7 @@ void UINavigationV4Wnd::Slot15(int, int) { findButton->SetTooltip(LookupMessage(0x0895)); this->AddChild(findButton); - UIBitmapButton* moveButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* moveButton = new UIBitmapButton(); this->unknown_0100 = moveButton; moveButton->SetBitmap("유저인터페이스\\private_airplane\\btn_move_normal.bmp", 0, 0); moveButton->SetBitmap("유저인터페이스\\private_airplane\\btn_move_over.bmp", 1, 0); @@ -2432,7 +2432,7 @@ void UINavigationV4Wnd::Slot15(int, int) { moveButton->SetId(499); this->AddChild(moveButton); - UIStaticText* label = new UIStaticText(*this->m_context); + UIStaticText* label = new UIStaticText(); this->unknown_00E8 = label; label->SetSize(100, 20); this->AddChild(label); @@ -2442,7 +2442,7 @@ void UINavigationV4Wnd::Slot15(int, int) { this->unknown_00B4 = this->AddCloseButton(LookupMessage(0x0BE5), 0); this->unknown_00BC = this->AddMinimizeButton(LookupMessage(0x089C), 0); - UIBitmapButton* helpButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* helpButton = new UIBitmapButton(); this->unknown_00C0 = helpButton; helpButton->SetBitmap("유저인터페이스\\navigation_interface\\NaviHelp_off.bmp", 0, 0); helpButton->SetBitmap("유저인터페이스\\navigation_interface\\NaviHelp_on.bmp", 1, 0); @@ -2452,7 +2452,7 @@ void UINavigationV4Wnd::Slot15(int, int) { helpButton->SetTooltip(LookupMessage(0x089D)); this->AddChild(helpButton); - UIBitmapButton* dataButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* dataButton = new UIBitmapButton(); 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); @@ -2470,7 +2470,7 @@ void UINavigationV4Wnd::Slot15(int, int) { searchEdit->SetId(516); this->AddChild(searchEdit); - UIBitmapButton* searchButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* searchButton = new UIBitmapButton(); this->unknown_00E4 = searchButton; searchButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_searchbar_normal.bmp", 3, 0); searchButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_searchbar_normal.bmp", 0, 0); @@ -2481,7 +2481,7 @@ void UINavigationV4Wnd::Slot15(int, int) { searchButton->SetTooltip(LookupMessage(0x0894)); this->AddChild(searchButton); - UIBitmapButton* backButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* backButton = new UIBitmapButton(); this->unknown_00D0 = backButton; backButton->SetBitmap("유저인터페이스\\navigation_interface3\\bt_back.bmp", 3, 0); backButton->SetBitmap("유저인터페이스\\navigation_interface3\\bt_back.bmp", 0, 0); @@ -2516,7 +2516,7 @@ void UINavigationV4Wnd::Slot15(int, int) { void UINavigationroadiconWnd::Slot15(int, int) { this->AddCloseButton(LookupMessage(3045), 0); - this->icon = new UIStaticBitmap(*this->m_context); + this->icon = new UIStaticBitmap(); this->icon->SetBitmap("유저인터페이스\\navigation_interface3\\img_roadIocn_bg_select.bmp"); this->icon->SetSize(this->icon->geometry.width, this->icon->geometry.height); @@ -3013,7 +3013,7 @@ int UINavigationroadiconWnd::SendMsg(UIWindow*, int message, std::intptr_t a, st // FUNCTION: fn_03580 void UINavigationRuideWnd::Slot15(int width, int) { this->AddCloseButton(LookupMessage(3045), 0); - this->routeList = new UIListBox_NaviSearch(*this->m_context); + this->routeList = new UIListBox_NaviSearch(); this->routeList->SetSize(width - 4, 293); this->routeList->backgroundRed = 255; this->routeList->backgroundGreen = 255; @@ -3682,7 +3682,7 @@ void UIPrivateAirplaneWnd::Slot15(int, int) { continue; } - UIBasicButton* button = new UIBasicButton(*this->m_context); + UIBasicButton* button = new UIBasicButton(); const std::string text = FormatOwnedString(LookupMessage(0xd01), name); button->Configure(0xc0, text.c_str()); button->Move(8, y); diff --git a/Source/UI/Window/UIWindow.h b/Source/UI/Window/UIWindow.h index 346e83c0..8816cd46 100644 --- a/Source/UI/Window/UIWindow.h +++ b/Source/UI/Window/UIWindow.h @@ -43,7 +43,9 @@ class UIWindow : public UIRPData { friend class UIScrollWnd; public: - explicit UIWindow(UIWindowContext& context, unsigned char cached); + explicit UIWindow(unsigned char cached); + UIWindow(UIWindowContext&, unsigned char cached) : UIWindow(cached) { + } ~UIWindow() override; virtual void Resize(int width, int height); virtual bool Slot02(); diff --git a/Source/UI/Window/UIWindowFactory.cpp b/Source/UI/Window/UIWindowFactory.cpp index f0253e92..27168c35 100644 --- a/Source/UI/Window/UIWindowFactory.cpp +++ b/Source/UI/Window/UIWindowFactory.cpp @@ -14,7 +14,6 @@ #include struct LayoutWindowContexts { - UIWindowContext& windows; UIEntryQueueContext& entryQueue; QuickSlotPainting& quickSlots; }; @@ -43,21 +42,21 @@ UIWindow* UIWindowMgr::CreateLayoutWindow(int id) { LayoutWindowContexts& contexts = *reinterpret_cast(this); switch (id) { case 0x9C: - window = new UIHotKeyWnd(contexts.windows); + window = new UIHotKeyWnd(); this->unknown_0404 = window; break; case 0x9D: - window = new UIEntryQueueWnd(contexts.windows, contexts.entryQueue); + window = new UIEntryQueueWnd(contexts.entryQueue); break; case 0x9F: - window = new UIQuickSlotWnd(contexts.windows, contexts.quickSlots); + window = new UIQuickSlotWnd(contexts.quickSlots); break; case 0xB5: window = new UISerachStoreInfoWnd(); g_searchStoreInfoCreated = true; break; case 0xD1: - window = new UIEntryQueueStandByWnd(contexts.windows, contexts.entryQueue); + window = new UIEntryQueueStandByWnd(contexts.entryQueue); break; } diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index c90c0eeb..bc586a01 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -1717,7 +1717,7 @@ int UIWindowMgr::SendNotice(int selector, std::intptr_t a, std::intptr_t b, std: if (this->namedWindows.find(name) != this->namedWindows.end()) { return 0; } - UIWhisperWnd* window = new UIWhisperWnd(*reinterpret_cast(nullptr)); + UIWhisperWnd* window = new UIWhisperWnd(); window->SetSize(280, 120); this->rendered.push_back(window); window->SendMsg(nullptr, 34, reinterpret_cast(&this->m_whisperPlacement), 0, 0, 0); @@ -3946,7 +3946,7 @@ void UIWindowMgr::ShowWaitDBSaveWindow() { } WindowDialogs& dialogs = *reinterpret_cast(this); - this->window_4F2AC = new UIWaitDBSaveWnd(dialogs.windows); + this->window_4F2AC = new UIWaitDBSaveWnd(); this->window_4F2AC->SetSize(g_renderer->viewport.width, g_renderer->viewport.height); this->window_4F2AC->Move(0, 0); this->window_4F2AC->SetId(10024); diff --git a/Source/UI/Window/UIWindowMgr.h b/Source/UI/Window/UIWindowMgr.h index cc57991c..1107f031 100644 --- a/Source/UI/Window/UIWindowMgr.h +++ b/Source/UI/Window/UIWindowMgr.h @@ -21,7 +21,6 @@ class CWebBrowser; struct MessengerMember; struct ReplayOptions; struct ModeDragState; -struct UIWindowContext; struct WindowTextEntry { /* 0000 */ std::string text; diff --git a/Source/UI/Window/UIWordDisplayWnd.cpp b/Source/UI/Window/UIWordDisplayWnd.cpp index 6af519a9..410e78cb 100644 --- a/Source/UI/Window/UIWordDisplayWnd.cpp +++ b/Source/UI/Window/UIWordDisplayWnd.cpp @@ -59,7 +59,7 @@ int UIWordDisplayWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argum // OFFSET: 0x00850910 // FUNCTION: fn_10682 -UIWordDisplayWnd::UIWordDisplayWnd(UIWindowContext& windowContext) : UIFrameWnd(windowContext, 0), aid(0) { +UIWordDisplayWnd::UIWordDisplayWnd() : UIFrameWnd(0), aid(0) { this->text.clear(); this->SetSize(24, 24); } diff --git a/Source/UI/Window/UIWordDisplayWnd.h b/Source/UI/Window/UIWordDisplayWnd.h index 166f4cd4..0a529842 100644 --- a/Source/UI/Window/UIWordDisplayWnd.h +++ b/Source/UI/Window/UIWordDisplayWnd.h @@ -8,7 +8,7 @@ class UIWordDisplayWnd : public UIFrameWnd { public: - UIWordDisplayWnd(UIWindowContext& windowContext); + UIWordDisplayWnd(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Window/UIZeroChatWnd.cpp b/Source/UI/Window/UIZeroChatWnd.cpp index 6d159d1f..057c7d1c 100644 --- a/Source/UI/Window/UIZeroChatWnd.cpp +++ b/Source/UI/Window/UIZeroChatWnd.cpp @@ -12,7 +12,7 @@ // OFFSET: 0x0094B410 // FUNCTION: fn_12891 void UIBalloonOpenBtn::Slot15(int width, int height) { - this->m_button = new UIBitmapButton(*this->m_context); + this->m_button = new UIBitmapButton(); this->m_button->SetBitmap("유저인터페이스\\basic_interface\\combo_btn_a.bmp", 0, 0); this->m_button->SetBitmap("유저인터페이스\\basic_interface\\combo_btn_b.bmp", 1, 0); this->m_button->SetBitmap("유저인터페이스\\basic_interface\\combo_btn_c.bmp", 2, 0); @@ -25,7 +25,7 @@ void UIBalloonOpenBtn::Slot15(int width, int height) { // OFFSET: 0x0094B500 // FUNCTION: fn_12892 void UIDebuffRemoveWnd::Slot15(int width, int height) { - this->m_button = new UIBasicButton(*this->m_context); + this->m_button = new UIBasicButton(); this->m_button->Configure(0x96, LookupMessage(0x10E6)); this->m_button->Move(0xF, 0x16); this->m_button->SetId(0xB8); @@ -45,25 +45,25 @@ void UIGuild_Storage_Log::Slot15(int width, int height) { int y = 60; for (int row = 0; row < 10; ++row) { - this->m_dateTexts[row] = new UIStaticText(*this->m_context); + this->m_dateTexts[row] = new UIStaticText(); this->m_dateTexts[row]->SetSize(100, 15); this->m_dateTexts[row]->SetTextFitted(""); this->m_dateTexts[row]->Move(50, y); this->AddChild(this->m_dateTexts[row]); - this->m_nameTexts[row] = new UIStaticText(*this->m_context); + this->m_nameTexts[row] = new UIStaticText(); this->m_nameTexts[row]->SetSize(20, 15); this->m_nameTexts[row]->SetTextFitted(""); this->m_nameTexts[row]->Move(150, y); this->AddChild(this->m_nameTexts[row]); - this->m_itemTexts[row] = new UIStaticText(*this->m_context); + this->m_itemTexts[row] = new UIStaticText(); this->m_itemTexts[row]->SetSize(80, 15); this->m_itemTexts[row]->SetTextFitted(""); this->m_itemTexts[row]->Move(190, y); this->AddChild(this->m_itemTexts[row]); - this->m_countTexts[row] = new UIStaticText(*this->m_context); + this->m_countTexts[row] = new UIStaticText(); this->m_countTexts[row]->SetSize(130, 15); this->m_countTexts[row]->SetTextFitted(""); this->m_countTexts[row]->Move(280, y); @@ -74,7 +74,7 @@ void UIGuild_Storage_Log::Slot15(int width, int height) { const std::string prefix = "유저인터페이스\\basic_interface\\"; for (int index = 0; index < 3; ++index) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap((prefix + bitmaps[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + bitmaps[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + bitmaps[index][2] + ".bmp").c_str(), 2, 0); @@ -84,7 +84,7 @@ void UIGuild_Storage_Log::Slot15(int width, int height) { this->AddChild(button); } - this->unknown_0158 = new UITabControl(*this->m_context); + this->unknown_0158 = new UITabControl(); this->unknown_0158->Configure(1, 20, 50, 1, 0, 0, 0, 0, 0, 0, 0, 0); this->unknown_0158->Move(0, 17); this->AddChild(this->unknown_0158); diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp index 78ccbdfc..f5d26171 100644 --- a/Source/UI/Window/WindowMgrState.cpp +++ b/Source/UI/Window/WindowMgrState.cpp @@ -134,7 +134,7 @@ void UIWindowMgr::RestoreMiniPartyWindows() { } const SessionRecord0734 record = g_session.FindRecord0734(member.accountId); - UIMiniPartyWnd* window = new UIMiniPartyWnd(dialogs.windows); + UIMiniPartyWnd* window = new UIMiniPartyWnd(); window->SetSize(174, 52); window->m_cell = record.unknown_0008; this->AddMiniPartyWindow(window); @@ -1167,9 +1167,7 @@ int WindowDialogs::RunEmailAddress() { return 185; } - auto* window = new UIEmailAddressWnd( - this->windows - ); + auto* window = new UIEmailAddressWnd(); window->SetSize(280, 48); window->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); this->dialog.retirement.rendered.push_front(window);