Decompile 5 functions in Source/UI/Acceptance/UIChooseSellBuyWnd.cpp, Source/UI/Window/UIMessageBox.cpp, ...
Batch #1872 by Yommy: 5 byte-identical, 0 confirmed by peer review. - fn_12215 UIChooseWarpWnd::Paint: byte-identical - fn_12216 UIChooseWnd::Paint: byte-identical - fn_12241 UIPasswordWnd::Paint: byte-identical - fn_12247 UISayDialogWnd::Paint: byte-identical - fn_12257 UIToolTipWnd::Paint: byte-identical Merged automatically: every function is byte-identical to the original.
This commit is contained in:
parent
81e812ea39
commit
7f865917a0
13 changed files with 171 additions and 2 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
#include "Client/Application/ApplicationWindow.h"
|
#include "Client/Application/ApplicationWindow.h"
|
||||||
|
#include "Contents/Configuration/ServiceConfiguration.h"
|
||||||
#include "Client/Mode/ActiveGameMode.h"
|
#include "Client/Mode/ActiveGameMode.h"
|
||||||
#include "Client/Mode/CGameMode.h"
|
#include "Client/Mode/CGameMode.h"
|
||||||
#include "Client/Mode/ModeEvents.h"
|
#include "Client/Mode/ModeEvents.h"
|
||||||
|
|
@ -12,12 +13,17 @@
|
||||||
#include "UI/Buttons/UIBitmapButton.h"
|
#include "UI/Buttons/UIBitmapButton.h"
|
||||||
#include "UI/Chat/UIWhisperWnd.h"
|
#include "UI/Chat/UIWhisperWnd.h"
|
||||||
#include "UI/Dialogs/UIBookWnd.h"
|
#include "UI/Dialogs/UIBookWnd.h"
|
||||||
|
#include "UI/Dialogs/UIChooseWarpWnd.h"
|
||||||
|
#include "UI/Dialogs/UIChooseWnd.h"
|
||||||
#include "UI/Dialogs/UIDisconnectedServerMsgWnd.h"
|
#include "UI/Dialogs/UIDisconnectedServerMsgWnd.h"
|
||||||
|
#include "UI/Dialogs/UIEmailAddressWnd.h"
|
||||||
#include "UI/Dialogs/UIGraffiStrboxWnd.h"
|
#include "UI/Dialogs/UIGraffiStrboxWnd.h"
|
||||||
#include "UI/Dialogs/UILoadingWnd.h"
|
#include "UI/Dialogs/UILoadingWnd.h"
|
||||||
#include "UI/Dialogs/UIMenuWnd.h"
|
#include "UI/Dialogs/UIMenuWnd.h"
|
||||||
#include "UI/Dialogs/UIMinimapZoomWnd.h"
|
#include "UI/Dialogs/UIMinimapZoomWnd.h"
|
||||||
#include "UI/Dialogs/UINoticeConfirmWnd.h"
|
#include "UI/Dialogs/UINoticeConfirmWnd.h"
|
||||||
|
#include "UI/Dialogs/UINpcEditDialogWnd.h"
|
||||||
|
#include "UI/Dialogs/UIPasswordWnd.h"
|
||||||
#include "UI/Dialogs/UINotifyLevelUpWnd.h"
|
#include "UI/Dialogs/UINotifyLevelUpWnd.h"
|
||||||
#include "UI/Dialogs/UINotifyQuestWnd.h"
|
#include "UI/Dialogs/UINotifyQuestWnd.h"
|
||||||
#include "UI/Dialogs/UIPetTamingDeceiveWnd.h"
|
#include "UI/Dialogs/UIPetTamingDeceiveWnd.h"
|
||||||
|
|
@ -26,11 +32,13 @@
|
||||||
#include "UI/Dialogs/UISayDialogWnd.h"
|
#include "UI/Dialogs/UISayDialogWnd.h"
|
||||||
#include "UI/Dialogs/UISelectCartWnd.h"
|
#include "UI/Dialogs/UISelectCartWnd.h"
|
||||||
#include "UI/Dialogs/UITipOfTheDayWnd.h"
|
#include "UI/Dialogs/UITipOfTheDayWnd.h"
|
||||||
|
#include "UI/Dialogs/UIToolTipWnd.h"
|
||||||
#include "UI/Dialogs/UIWaitWnd.h"
|
#include "UI/Dialogs/UIWaitWnd.h"
|
||||||
#include "UI/Items/UIEquipWnd.h"
|
#include "UI/Items/UIEquipWnd.h"
|
||||||
#include "UI/Items/UIExchangeWnd.h"
|
#include "UI/Items/UIExchangeWnd.h"
|
||||||
#include "UI/Items/UIItemCollectionWnd.h"
|
#include "UI/Items/UIItemCollectionWnd.h"
|
||||||
#include "UI/Items/UIItemIdentifyWnd.h"
|
#include "UI/Items/UIItemIdentifyWnd.h"
|
||||||
|
#include "UI/Items/UIItemParamChangeDisplayWnd.h"
|
||||||
#include "UI/Items/UINotifyItemObtainWnd.h"
|
#include "UI/Items/UINotifyItemObtainWnd.h"
|
||||||
#include "UI/Lists/UIComboBoxWnd.h"
|
#include "UI/Lists/UIComboBoxWnd.h"
|
||||||
#include "UI/Lists/UIListBox.h"
|
#include "UI/Lists/UIListBox.h"
|
||||||
|
|
@ -38,6 +46,7 @@
|
||||||
#include "UI/Shop/ItemDrawing.h"
|
#include "UI/Shop/ItemDrawing.h"
|
||||||
#include "UI/Shop/UInCash_CallWnd.h"
|
#include "UI/Shop/UInCash_CallWnd.h"
|
||||||
#include "UI/Skill/UISkillDescribeWnd.h"
|
#include "UI/Skill/UISkillDescribeWnd.h"
|
||||||
|
#include "UI/Skill/UISkillNameChangeWnd.h"
|
||||||
#include "UI/Status/UIStatusWnd.h"
|
#include "UI/Status/UIStatusWnd.h"
|
||||||
#include "UI/Text/UITextViewer.h"
|
#include "UI/Text/UITextViewer.h"
|
||||||
#include "UI/Window/UIWindowMgr.h"
|
#include "UI/Window/UIWindowMgr.h"
|
||||||
|
|
@ -112,6 +121,18 @@ void UIChooseSellBuyWnd::Paint() {
|
||||||
this->DrawBitmap(0, 0, bitmap ? &bitmap->image : nullptr, false);
|
this->DrawBitmap(0, 0, bitmap ? &bitmap->image : nullptr, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008ED170
|
||||||
|
// FUNCTION: fn_12215
|
||||||
|
void UIChooseWarpWnd::Paint() {
|
||||||
|
this->DrawBorder(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008ED180
|
||||||
|
// FUNCTION: fn_12216
|
||||||
|
void UIChooseWnd::Paint() {
|
||||||
|
this->DrawBorder(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
// OFFSET: 0x008ED190
|
// OFFSET: 0x008ED190
|
||||||
// FUNCTION: fn_12217
|
// FUNCTION: fn_12217
|
||||||
void UIComboBoxIDWnd::Paint() {
|
void UIComboBoxIDWnd::Paint() {
|
||||||
|
|
@ -131,6 +152,8 @@ void UIDisconnectedServerMsgWnd::Paint() {
|
||||||
this->DrawBitmap(0, 0, bitmap ? &bitmap->image : nullptr, false);
|
this->DrawBitmap(0, 0, bitmap ? &bitmap->image : nullptr, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008ED1F0
|
||||||
|
|
||||||
// OFFSET: 0x008EE230
|
// OFFSET: 0x008EE230
|
||||||
// FUNCTION: fn_12223
|
// FUNCTION: fn_12223
|
||||||
void UIGraffiStrboxWnd::Paint() {
|
void UIGraffiStrboxWnd::Paint() {
|
||||||
|
|
@ -142,6 +165,8 @@ void UIGraffiStrboxWnd::Paint() {
|
||||||
this->DrawTextAt(controls.fonts, controls.locale, 16, 22, controls.services.MessageText(436), 0, 0, 12, 0, 0, 0);
|
this->DrawTextAt(controls.fonts, controls.locale, 16, 22, controls.services.MessageText(436), 0, 0, 12, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008EE9D0
|
||||||
|
|
||||||
// OFFSET: 0x008EECD0
|
// OFFSET: 0x008EECD0
|
||||||
// FUNCTION: fn_12228
|
// FUNCTION: fn_12228
|
||||||
void UILoadingWnd::Paint() {
|
void UILoadingWnd::Paint() {
|
||||||
|
|
@ -177,6 +202,8 @@ void UINotifyLevelUpWnd::Paint() {
|
||||||
void UINotifyQuestWnd::Paint() {
|
void UINotifyQuestWnd::Paint() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008EF810
|
||||||
|
|
||||||
// OFFSET: 0x008EF9A0
|
// OFFSET: 0x008EF9A0
|
||||||
// FUNCTION: fn_12239
|
// FUNCTION: fn_12239
|
||||||
void UIPartyInvitationToWnd::Paint() {
|
void UIPartyInvitationToWnd::Paint() {
|
||||||
|
|
@ -205,6 +232,12 @@ void UIPartySettingWnd::Paint() {
|
||||||
this->DrawTextAt(controls.fonts, controls.locale, 10, this->m_mode + 17, controls.services.MessageText(293), 0, 0, 12, 0, 0, 0);
|
this->DrawTextAt(controls.fonts, controls.locale, 10, this->m_mode + 17, controls.services.MessageText(293), 0, 0, 12, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008EFAF0
|
||||||
|
// FUNCTION: fn_12241
|
||||||
|
void UIPasswordWnd::Paint() {
|
||||||
|
this->DrawBorder(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
// OFFSET: 0x008EFF60
|
// OFFSET: 0x008EFF60
|
||||||
// FUNCTION: fn_12245
|
// FUNCTION: fn_12245
|
||||||
void UIQuitWnd::Paint() {
|
void UIQuitWnd::Paint() {
|
||||||
|
|
@ -219,6 +252,12 @@ void UIRestartWnd::Paint() {
|
||||||
this->DrawBitmap(0, 0, bitmap ? &bitmap->image : nullptr, false);
|
this->DrawBitmap(0, 0, bitmap ? &bitmap->image : nullptr, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008EFFE0
|
||||||
|
// FUNCTION: fn_12247
|
||||||
|
void UISayDialogWnd::Paint() {
|
||||||
|
this->DrawBorder(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
// OFFSET: 0x008F0350
|
// OFFSET: 0x008F0350
|
||||||
// FUNCTION: fn_12249
|
// FUNCTION: fn_12249
|
||||||
void UISelectCartWnd::Paint() {
|
void UISelectCartWnd::Paint() {
|
||||||
|
|
@ -246,6 +285,8 @@ void UISkillDescribeWnd::Paint() {
|
||||||
DrawRoundedBorder(*this, 2, 2, this->geometry.width - 4, this->geometry.height - 4, 0xFFFFFF);
|
DrawRoundedBorder(*this, 2, 2, this->geometry.width - 4, this->geometry.height - 4, 0xFFFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008F04B0
|
||||||
|
|
||||||
// OFFSET: 0x008F2460
|
// OFFSET: 0x008F2460
|
||||||
// FUNCTION: fn_12255
|
// FUNCTION: fn_12255
|
||||||
void UITipOfTheDayWnd::Paint() {
|
void UITipOfTheDayWnd::Paint() {
|
||||||
|
|
@ -284,6 +325,12 @@ void UITipOfTheDayWnd::Paint() {
|
||||||
this->FillRegion(72, 17, columns * 32 - 32, slots * 32, RGB(red, green, blue));
|
this->FillRegion(72, 17, columns * 32 - 32, slots * 32, RGB(red, green, blue));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFFSET: 0x008F2A80
|
||||||
|
// FUNCTION: fn_12257
|
||||||
|
void UIToolTipWnd::Paint() {
|
||||||
|
this->DrawBorder(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
// OFFSET: 0x008F2A90
|
// OFFSET: 0x008F2A90
|
||||||
// FUNCTION: fn_12258
|
// FUNCTION: fn_12258
|
||||||
void UIWaitWnd::Paint() {
|
void UIWaitWnd::Paint() {
|
||||||
|
|
|
||||||
11
Source/UI/Dialogs/UIChooseWarpWnd.h
Normal file
11
Source/UI/Dialogs/UIChooseWarpWnd.h
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UICHOOSEWARPWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_DIALOGS_UICHOOSEWARPWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
class UIChooseWarpWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
void Paint() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
11
Source/UI/Dialogs/UIChooseWnd.h
Normal file
11
Source/UI/Dialogs/UIChooseWnd.h
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UICHOOSEWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_DIALOGS_UICHOOSEWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
class UIChooseWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
void Paint() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
16
Source/UI/Dialogs/UIEmailAddressWnd.h
Normal file
16
Source/UI/Dialogs/UIEmailAddressWnd.h
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIEMAILADDRESSWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_DIALOGS_UIEMAILADDRESSWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
struct UIButtonContext;
|
||||||
|
|
||||||
|
class UIEmailAddressWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
void Paint() override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
UIButtonContext* m_controls;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
16
Source/UI/Dialogs/UINpcEditDialogWnd.h
Normal file
16
Source/UI/Dialogs/UINpcEditDialogWnd.h
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UINPCEDITDIALOGWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_DIALOGS_UINPCEDITDIALOGWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
struct UIButtonContext;
|
||||||
|
|
||||||
|
class UINpcEditDialogWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
void Paint() override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
UIButtonContext* m_controls;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
14
Source/UI/Dialogs/UIPasswordWnd.h
Normal file
14
Source/UI/Dialogs/UIPasswordWnd.h
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UIPASSWORDWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_DIALOGS_UIPASSWORDWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
class UIItemDropCntWnd : public UIFrameWnd {
|
||||||
|
};
|
||||||
|
|
||||||
|
class UIPasswordWnd : public UIItemDropCntWnd {
|
||||||
|
public:
|
||||||
|
void Paint() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -12,6 +12,7 @@ public:
|
||||||
|
|
||||||
void Resize(int width, int height) override;
|
void Resize(int width, int height) override;
|
||||||
void Slot19() override;
|
void Slot19() override;
|
||||||
|
void Paint() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
11
Source/UI/Dialogs/UIToolTipWnd.h
Normal file
11
Source/UI/Dialogs/UIToolTipWnd.h
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_DIALOGS_UITOOLTIPWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_DIALOGS_UITOOLTIPWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
class UIToolTipWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
void Paint() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
21
Source/UI/Items/UIItemParamChangeDisplayWnd.h
Normal file
21
Source/UI/Items/UIItemParamChangeDisplayWnd.h
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_ITEMS_UIITEMPARAMCHANGEDISPLAYWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_ITEMS_UIITEMPARAMCHANGEDISPLAYWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
struct UIButtonContext;
|
||||||
|
|
||||||
|
class UIItemParamChangeDisplayWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
/* 00B4 */ int m_before;
|
||||||
|
/* 00B8 */ int m_after;
|
||||||
|
/* 00BC */ int m_beforeSecond;
|
||||||
|
/* 00C0 */ int m_afterSecond;
|
||||||
|
|
||||||
|
void Paint() override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
UIButtonContext* m_controls;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
21
Source/UI/Skill/UISkillNameChangeWnd.h
Normal file
21
Source/UI/Skill/UISkillNameChangeWnd.h
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
#ifndef RAGNAROK_SOURCE_UI_SKILL_UISKILLNAMECHANGEWND_H
|
||||||
|
#define RAGNAROK_SOURCE_UI_SKILL_UISKILLNAMECHANGEWND_H
|
||||||
|
|
||||||
|
#include "UI/Window/UIFrameWnd.h"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
struct UIButtonContext;
|
||||||
|
|
||||||
|
class UISkillNameChangeWnd : public UIFrameWnd {
|
||||||
|
public:
|
||||||
|
/* 00B4 */ unsigned char unknown_00B4[0x08];
|
||||||
|
/* 00BC */ std::string m_name;
|
||||||
|
|
||||||
|
void Paint() override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
UIButtonContext* m_controls;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -7,7 +7,6 @@
|
||||||
class UICntWnd : public UIFrameWnd {
|
class UICntWnd : public UIFrameWnd {
|
||||||
public:
|
public:
|
||||||
void Paint() override;
|
void Paint() override;
|
||||||
void DrawBorder(int x, int y, int width, int height);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ public:
|
||||||
std::vector<std::uint32_t> Slot44() override;
|
std::vector<std::uint32_t> Slot44() override;
|
||||||
int Slot46() override;
|
int Slot46() override;
|
||||||
UIBitmapButton* AddCloseButton(UIButtonContext& controls, const char* tooltip, int width);
|
UIBitmapButton* AddCloseButton(UIButtonContext& controls, const char* tooltip, int width);
|
||||||
|
void DrawBorder(int x, int y, int width, int height);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/* 007C */ int m_dragX;
|
/* 007C */ int m_dragX;
|
||||||
|
|
|
||||||
|
|
@ -349,7 +349,7 @@ void UICntWnd::Paint() {
|
||||||
|
|
||||||
// OFFSET: 0x008A91E0
|
// OFFSET: 0x008A91E0
|
||||||
// FUNCTION: fn_11721
|
// FUNCTION: fn_11721
|
||||||
void UICntWnd::DrawBorder(int x, int y, int width, int height) {
|
void UIFrameWnd::DrawBorder(int x, int y, int width, int height) {
|
||||||
if (width == 0) {
|
if (width == 0) {
|
||||||
width = this->geometry.width;
|
width = this->geometry.width;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue