Decompile 15 functions in Source/Client/Browser/BrowserCursor.cpp, Source/Client/Input/Language.cpp, ...
Batch #12875 by KWDev: 15 byte-identical, 0 confirmed by peer review. - fn_03576 UINavigationV4Wnd::RefreshLayout: byte-identical - fn_05441 CRenewQuestMgr::GetIconTooltip: byte-identical - fn_10202 UIRuneSetReWard::Slot31: byte-identical - fn_13844 UITagButton::Slot31: byte-identical - fn_14354 CUIListBox<AdventureGuide::CUISubTab>::SelectItem: byte-identical - fn_14355 CUIListBox<AdventureGuide::CUITab>::SelectItem: byte-identical - fn_14417 CUIDropDownBox::HasChild: byte-identical - fn_14420 CUIDropDownBox::Attach: byte-identical (already on main) - fn_14685 CUITab::Select: byte-identical - fn_16497 CQuestItemSelector::SetHighlighted: byte-identical - fn_17063 ContainsValue: byte-identical - fn_17764 CLanguageBase::Paste: byte-identical - fn_18377 GetMessageString: byte-identical - fn_19310 Replay::Cipher: byte-identical - fn_45438 CWebBrowser::PollCursor: byte-identical Merged automatically: every function is byte-identical to the original.
This commit is contained in:
parent
ffa8144e18
commit
86a5142dbd
13 changed files with 14 additions and 14 deletions
|
|
@ -29,7 +29,7 @@ void CWebBrowser::SetCursorState(int value) {
|
|||
void CWebBrowser::PollCursor() {
|
||||
POINT point;
|
||||
GetCursorPos(&point);
|
||||
if (WindowFromPoint(point) != hWnd) {
|
||||
if (hWnd != WindowFromPoint(point)) {
|
||||
if (this->cursorState != 1) {
|
||||
this->SetCursorState(1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ void CLanguageBase::CopySelection() {
|
|||
// OFFSET: 0x00ACD540
|
||||
// FUNCTION: fn_17764
|
||||
void CLanguageBase::Paste() {
|
||||
if (g_windowMgr.GetHoverWindow() == g_windowMgr.window_4F1FC || g_windowMgr.LookupWindow(278) || g_windowMgr.LookupWindow(128)) {
|
||||
if (g_windowMgr.window_4F1FC == g_windowMgr.GetHoverWindow() || g_windowMgr.LookupWindow(278) || g_windowMgr.LookupWindow(128)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -392,9 +392,9 @@ bool Replay::Cipher(std::uint32_t bytes, void* data) {
|
|||
|
||||
auto* words = static_cast<std::uint32_t*>(data);
|
||||
this->cipherBase = this->header.key0 >> 5;
|
||||
const int count = bytes / 4;
|
||||
this->cipherIndex = 0;
|
||||
this->cipherKey = this->header.key1 >> 3;
|
||||
const int count = bytes / 4;
|
||||
|
||||
for (int index = 0; index < count; ++index) {
|
||||
++this->cipherIndex;
|
||||
|
|
|
|||
|
|
@ -5061,7 +5061,7 @@ bool IsObfuscatedMessage(int id) {
|
|||
// FUNCTION: fn_18377
|
||||
const char* GetMessageString(int id) {
|
||||
auto found = g_messageStrings.find(id);
|
||||
if (found == g_messageStrings.end()) {
|
||||
if (g_messageStrings.end() == found) {
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ std::string CRenewQuestMgr::GetMonsterConditionText(unsigned int flags, int minL
|
|||
// FUNCTION: fn_05441
|
||||
std::string CRenewQuestMgr::GetIconTooltip(std::string_view icon) {
|
||||
const std::map<std::string, std::string>::const_iterator found = this->m_iconTooltips.find(std::string(icon));
|
||||
return found != this->m_iconTooltips.end() ? found->second : std::string("QUEST");
|
||||
return this->m_iconTooltips.end() != found ? found->second : std::string("QUEST");
|
||||
}
|
||||
|
||||
// OFFSET: 0x006794D0
|
||||
|
|
|
|||
|
|
@ -866,7 +866,7 @@ void CUIListBox<AdventureGuide::CUISubTab>::SelectItem(CUIListItem* item) {
|
|||
return;
|
||||
}
|
||||
for (AdventureGuide::CUISubTab* entry : this->items) {
|
||||
if (entry != item) {
|
||||
if (item != entry) {
|
||||
entry->SetSelected(false);
|
||||
}
|
||||
}
|
||||
|
|
@ -890,7 +890,7 @@ void CUIListBox<AdventureGuide::CUITab>::SelectItem(CUIListItem* item) {
|
|||
return;
|
||||
}
|
||||
for (AdventureGuide::CUITab* entry : this->items) {
|
||||
if (entry != item) {
|
||||
if (item != entry) {
|
||||
entry->SetSelected(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ void UITagButton::Slot31(int x, int y) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (g_windowMgr.Capture() != this) {
|
||||
if (this != g_windowMgr.Capture()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ void CUIDropDownBox::Detach() {
|
|||
// OFFSET: 0x009E3460
|
||||
// FUNCTION: fn_14417
|
||||
bool CUIDropDownBox::HasChild(const UIWindow* window) const {
|
||||
return std::find(this->m_children.begin(), this->m_children.end(), window) != this->m_children.end();
|
||||
return this->m_children.end() != std::find(this->m_children.begin(), this->m_children.end(), window);
|
||||
}
|
||||
|
||||
// OFFSET: 0x009E3490
|
||||
|
|
|
|||
|
|
@ -813,7 +813,7 @@ private:
|
|||
void CQuestItemSelector::SetHighlighted(CUIListItem* const& item) {
|
||||
CUIListItem* highlighted = item;
|
||||
for (RenewQuestUI::CUIQuestItem* entry : this->listBox->items) {
|
||||
entry->SetHighlighted(static_cast<CUIListItem*>(entry) == highlighted);
|
||||
entry->SetHighlighted(highlighted == static_cast<CUIListItem*>(entry));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ void UIRuneSetReWard::Slot31(int x, int y) {
|
|||
g_windowMgr.SendNotice(1, reinterpret_cast<std::intptr_t>(LookupMessage(4201)), 0xFF, 0, 0, 0);
|
||||
}
|
||||
|
||||
if (g_windowMgr.Capture() == this) {
|
||||
if (this == g_windowMgr.Capture()) {
|
||||
g_windowMgr.ReleaseCapture();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -277,5 +277,5 @@ std::string StripColorCodes(const char* text, unsigned bytes) {
|
|||
// OFFSET: 0x00A874B0
|
||||
// FUNCTION: fn_17063
|
||||
bool ContainsValue(const std::deque<int>& values, const int& value) {
|
||||
return std::find(values.begin(), values.end(), value) != values.end();
|
||||
return values.end() != std::find(values.begin(), values.end(), value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1044,7 +1044,7 @@ void CUITab::Select(CUITabButton* button) {
|
|||
|
||||
this->current = button;
|
||||
for (UIWindow* child : this->m_children) {
|
||||
if (child != this->current) {
|
||||
if (this->current != child) {
|
||||
static_cast<CUITabButton*>(child)->SetSelected(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3393,7 +3393,7 @@ void UINavigationV4Wnd::InsertNavigationLink(std::string name, int x, int y) {
|
|||
// OFFSET: 0x005C4830
|
||||
// FUNCTION: fn_03576
|
||||
void UINavigationV4Wnd::RefreshLayout() {
|
||||
if (g_navigationManager.unknown_1254) {
|
||||
if (g_navigationManager.unknown_1254 == true) {
|
||||
this->Resize(134, 61);
|
||||
this->unknown_00B8->Move((this->geometry.width - 15), 2);
|
||||
this->unknown_00C4->Move((this->geometry.width - 32), 2);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue