Decompile 2 functions in Source/UI/Window/UIRodexContentsWnd.cpp, Source/UI/Window/UIRodexContentsWnd.h, ...
Batch #8263 by SapitoSucio: 0 byte-identical, 2 confirmed by peer review. - fn_10020 UIRodexContentsWnd::Slot15: logic confirmed by peer review - fn_10026 UIRodexContentsWnd::SetMailContents: logic confirmed by peer review Peer-reviewed-by: eAthena, System4z Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes).
This commit is contained in:
parent
85bb808203
commit
104c299e2e
4 changed files with 138 additions and 2 deletions
|
|
@ -16,9 +16,12 @@ struct RodexMail {
|
|||
/* 0020 */ int unknown_0020;
|
||||
/* 0024 */ std::string unknown_0024;
|
||||
/* 003C */ std::string unknown_003C;
|
||||
/* 0054 */ std::array<std::byte, 316> unknown_0054;
|
||||
/* 0054 */ unsigned char hasItem;
|
||||
/* 0055 */ std::array<std::byte, 0x133> unknown_0055;
|
||||
/* 0188 */ std::int64_t zeny;
|
||||
/* 0190 */ std::uint8_t unknown_0190;
|
||||
/* 0191 */ std::array<std::byte, 7> unknown_0191;
|
||||
/* 0191 */ std::array<std::byte, 3> unknown_0191;
|
||||
/* 0194 */ int unknown_0194;
|
||||
};
|
||||
|
||||
class RodexMailStore {
|
||||
|
|
@ -65,7 +68,9 @@ public:
|
|||
#if defined(_WIN32) && !defined(_WIN64)
|
||||
static_assert(sizeof(RodexMail) == 0x198);
|
||||
static_assert(offsetof(RodexMail, unknown_0024) == 0x24);
|
||||
static_assert(offsetof(RodexMail, zeny) == 0x188);
|
||||
static_assert(offsetof(RodexMail, unknown_0190) == 0x190);
|
||||
static_assert(offsetof(RodexMail, unknown_0194) == 0x194);
|
||||
static_assert(sizeof(RodexMailStore) == 0x38);
|
||||
static_assert(offsetof(RodexMailStore, m_mails0) == 0x20);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define RAGNAROK_SOURCE_UI_TEXT_NAVIGATIONLINK_H
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
struct NavigationLinkParser {
|
||||
NavigationLinkParser();
|
||||
|
|
@ -19,6 +20,7 @@ extern NavigationLinkParser* g_navigationLinkParser;
|
|||
bool CreateNavigationLinkParser();
|
||||
void DestroyNavigationLinkParser();
|
||||
std::string FormatMessageArguments(std::string value, int messageId);
|
||||
std::pair<bool, std::string> RemoveLineBreakTag(std::string value);
|
||||
int DecodeNavigationNumber(std::string value);
|
||||
std::string EncodeNavigationNumber(int value);
|
||||
bool ParseNavigationLink(std::string value, std::string& name, int& x, int& y);
|
||||
|
|
|
|||
|
|
@ -10,16 +10,20 @@
|
|||
#include "Contents/Items/ItemNaming.h"
|
||||
#include "Contents/PlayerNameDictionary.h"
|
||||
#include "Contents/RodexMailStore.h"
|
||||
#include "Contents/SkinMgr.h"
|
||||
#include "Network/Connection/Connection.h"
|
||||
#include "Network/Packets/PacketLengths.h"
|
||||
#include "Contents/MessageTable.h"
|
||||
#include "Resource/Bitmap/BitmapResource.h"
|
||||
#include "Resource/ResourceMgr.h"
|
||||
#include "Resource/SkinPalette.h"
|
||||
#include "Resource/TextureNames.h"
|
||||
#include "UI/Buttons/UIBasicButton.h"
|
||||
#include "UI/Buttons/UIBitmapButton.h"
|
||||
#include "UI/Edit/UIEditCtrl.h"
|
||||
#include "UI/Rodex/UIRodexComposeWnd.h"
|
||||
#include "UI/Shop/ItemDrawing.h"
|
||||
#include "UI/Text/NavigationLink.h"
|
||||
#include "UI/Window/UIWindowMgr.h"
|
||||
#include "UI/Window/WindowDialogs.h"
|
||||
#include "UI/Window/WindowManagerWindows.h"
|
||||
|
|
@ -95,6 +99,51 @@ void UIRodexContentsWnd::DisableZenyButton() {
|
|||
this->Invalidate();
|
||||
}
|
||||
|
||||
// OFFSET: 0x008020B0
|
||||
// FUNCTION: fn_10020
|
||||
void UIRodexContentsWnd::Slot15(int, int) {
|
||||
this->AddBaseButton(*this->m_controls);
|
||||
this->AddCloseButton(*this->m_controls, "", 0);
|
||||
|
||||
RodexMailStore* store = g_rodexMailStore;
|
||||
std::map<std::int64_t, RodexMail>* mails = nullptr;
|
||||
switch (store->unknown_0010) {
|
||||
case 0:
|
||||
mails = &store->m_mails0;
|
||||
break;
|
||||
case 1:
|
||||
mails = &store->m_mails1;
|
||||
break;
|
||||
case 2:
|
||||
mails = &store->m_mails2;
|
||||
break;
|
||||
}
|
||||
|
||||
if (mails != nullptr) {
|
||||
std::map<std::int64_t, RodexMail>::iterator mail = mails->find(store->currentMailId);
|
||||
if (mail != mails->end()) {
|
||||
this->SetMailContents(mail->second.unknown_0004, mail->second.unknown_0024, mail->second.unknown_003C, mail->second.hasItem, mail->second.zeny,
|
||||
mail->second.unknown_0001);
|
||||
|
||||
if (store->unknown_0010 == 0 && (mail->second.unknown_0001 & 8) == 0 && mail->second.unknown_0194 == 0) {
|
||||
UIBasicButton* report = new UIBasicButton(*this->m_context, *this->m_controls);
|
||||
report->Configure(70, LookupMessage(3548));
|
||||
report->Move(224, 29);
|
||||
report->SetId(310);
|
||||
report->SetDisabled(0);
|
||||
report->Invalidate();
|
||||
this->AddChild(report);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this->unknown_0104 = new UIBasicButton(*this->m_context, *this->m_controls);
|
||||
this->unknown_0104->Configure(50, LookupMessage(3542));
|
||||
this->unknown_0104->Move(6, 376);
|
||||
this->unknown_0104->SetId(211);
|
||||
this->AddChild(this->unknown_0104);
|
||||
}
|
||||
|
||||
// OFFSET: 0x008023F0
|
||||
// FUNCTION: fn_10021
|
||||
void UIRodexContentsWnd::Paint() {
|
||||
|
|
@ -294,6 +343,84 @@ int UIRodexContentsWnd::SendMsg(UIWindow* sender, int message, std::intptr_t arg
|
|||
return 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x008030A0
|
||||
// FUNCTION: fn_10026
|
||||
void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender, std::string body, unsigned char hasItem, std::int64_t zeny, unsigned char flags) {
|
||||
this->m_title = title;
|
||||
this->m_sender = sender;
|
||||
std::string text = body;
|
||||
|
||||
std::pair<bool, std::string> lineBreak = RemoveLineBreakTag(this->m_sender);
|
||||
this->unknown_010C = lineBreak.first;
|
||||
this->m_sender = lineBreak.second;
|
||||
|
||||
this->m_title = g_navigationLinkParser->ExpandMessages(this->m_title);
|
||||
this->m_sender = g_navigationLinkParser->ExpandMessages(this->m_sender);
|
||||
text = g_navigationLinkParser->ExpandMessages(text);
|
||||
|
||||
this->m_contents = new UIRodexEditCtrl3(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
|
||||
this->m_contents->SetSize(267, 192);
|
||||
this->m_contents->invalidatesParent = 1;
|
||||
this->m_contents->Move(15, 81);
|
||||
this->m_contents->maximum = 1000;
|
||||
|
||||
const bool selected = g_skinInfo.Selected();
|
||||
const SkinPaletteCell cell = {1, 2};
|
||||
const std::uint32_t color = SkinPaletteColor(ResourceMgr::Instance(), cell, selected);
|
||||
this->m_contents->Background(color & 0xFF, (color & 0xFFFF) >> 8, (color >> 16) & 0xFF);
|
||||
this->m_contents->TextColor(0x313131, 0xFFFFFFFF);
|
||||
this->m_contents->disabled = 1;
|
||||
this->m_contents->Invalidate();
|
||||
reinterpret_cast<unsigned char*>(&this->m_contents->unknown_0184)[1] = 1;
|
||||
this->m_contents->SetId(504);
|
||||
|
||||
if (text.find("<NAVIL>") == std::string::npos && text.find("</NAVIL>") == std::string::npos) {
|
||||
this->m_contents->SetText(text.c_str());
|
||||
} else {
|
||||
this->m_contents->SendMsg(nullptr, 0x99, reinterpret_cast<std::intptr_t>(text.c_str()), 0, 0, 0);
|
||||
}
|
||||
|
||||
this->m_contents->SetTagColor(0xD630A9);
|
||||
this->AddChild(this->m_contents);
|
||||
|
||||
if (hasItem) {
|
||||
this->m_itemButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
this->m_itemButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_out.bmp", 0, 0);
|
||||
this->m_itemButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_over.bmp", 1, 0);
|
||||
this->m_itemButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_press.bmp", 2, 0);
|
||||
this->m_itemButton->SetSize(this->m_itemButton->BitmapWidth(), this->m_itemButton->BitmapHeight());
|
||||
this->m_itemButton->Move(252, 312);
|
||||
this->m_itemButton->SetId(189);
|
||||
this->AddChild(this->m_itemButton);
|
||||
}
|
||||
|
||||
if (zeny > 0) {
|
||||
this->m_zeny = zeny;
|
||||
this->m_zenyButton = new UIBitmapButton(*this->m_context, *this->m_controls);
|
||||
this->m_zenyButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_out.bmp", 0, 0);
|
||||
this->m_zenyButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_over.bmp", 1, 0);
|
||||
this->m_zenyButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_press.bmp", 2, 0);
|
||||
this->m_zenyButton->SetSize(this->m_zenyButton->BitmapWidth(), this->m_zenyButton->BitmapHeight());
|
||||
this->m_zenyButton->Move(252, 345);
|
||||
this->m_zenyButton->SetId(190);
|
||||
this->AddChild(this->m_zenyButton);
|
||||
}
|
||||
|
||||
if (g_rodexMailStore->unknown_0010 == 0 && (flags & 8) == 0) {
|
||||
this->unknown_0108 = new UIBasicButton(*this->m_context, *this->m_controls);
|
||||
this->unknown_0108->Configure(70, LookupMessage(3543));
|
||||
this->unknown_0108->Move(224, 376);
|
||||
this->unknown_0108->SetId(305);
|
||||
this->unknown_0108->SetDisabled(0);
|
||||
this->unknown_0108->Invalidate();
|
||||
this->AddChild(this->unknown_0108);
|
||||
}
|
||||
|
||||
if (this->unknown_010C == 1) {
|
||||
this->SendMsg(nullptr, 106, 0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
// OFFSET: 0x00803760
|
||||
// FUNCTION: fn_10027
|
||||
void UIRodexContentsWnd::SetItemButtonDisabled(unsigned char disabled) {
|
||||
|
|
|
|||
|
|
@ -18,12 +18,14 @@ public:
|
|||
UIRodexContentsWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls);
|
||||
|
||||
void Paint() override;
|
||||
void Slot15(int width, int height) override;
|
||||
void Slot25(int x, int y) override;
|
||||
void Slot28(int x, int y) override;
|
||||
void Slot32(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;
|
||||
|
||||
void SetContentsText(const char* text);
|
||||
void SetMailContents(std::string title, std::string sender, std::string body, unsigned char hasItem, std::int64_t zeny, unsigned char flags);
|
||||
ITEM_INFO GetItemAtPoint(int x, int y);
|
||||
void DisableItemButton();
|
||||
void DisableZenyButton();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue