Maintenance: [forced, user-approved] Family D5: remove UITextViewerContext and TextViewerActions entirely. UITextViewer ctor 0x86F0A0
Batch #10206 by ragnarok-clanker: forced by an admin (4 lower score(s), 20 changed function(s)); checked with 36 compiled unit(s), including every includer of Source/UI/Acceptance/UIJoinPartyAcceptWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h, Source/UI/Dialogs/UINoticeConfirmWnd.h, Source/UI/Dialogs/UIWaitWnd.h, Source/UI/EntryQueue/UIEntryQueueWnd.h, Source/UI/Party/UIRequestJoinPartyWnd.h, Source/UI/Text/UITextViewer.h, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINormalMB.h, Source/UI/Window/UIPartyBookingHelpWnd.h.
This commit is contained in:
parent
d95073881e
commit
cc8a43db9f
23 changed files with 56 additions and 90 deletions
|
|
@ -1,4 +1,9 @@
|
|||
#include "UI/Chat/UINewChatWnd.h"
|
||||
#include "Client/Application/ApplicationWindow.h"
|
||||
#include "Client/Mode/CGameMode.h"
|
||||
#include "Client/Mode/ModeMgr.h"
|
||||
#include "Contents/NavigationManager.h"
|
||||
#include "UI/Dialogs/UITipboxWnd.h"
|
||||
#include "UI/Window/UIWindowMgr.h"
|
||||
#include "Contents/Items/ItemInfo.h"
|
||||
#include "UI/Lists/UIScrollBar.h"
|
||||
|
|
@ -30,7 +35,7 @@ void UITextViewer::Activate(UITextButton* button, int id) {
|
|||
switch (id) {
|
||||
case 437:
|
||||
if (!arguments.at(0).empty()) {
|
||||
ShellExecuteA(this->m_text->applicationWindow, "open", arguments[0].c_str(), nullptr, nullptr, SW_SHOWNORMAL);
|
||||
ShellExecuteA(hWnd, "open", arguments[0].c_str(), nullptr, nullptr, SW_SHOWNORMAL);
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
@ -44,7 +49,7 @@ void UITextViewer::Activate(UITextButton* button, int id) {
|
|||
const int y = number(2);
|
||||
|
||||
if (arguments.size() <= 3) {
|
||||
this->m_text->actions.Navigate(map, 2, 5, false, x, y, 1002);
|
||||
g_navigationManager.sub_B99030(map, 2, 5, false, x, y, 1002);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -52,7 +57,7 @@ void UITextViewer::Activate(UITextButton* button, int id) {
|
|||
int policy = number(4);
|
||||
|
||||
if (policy == -222) {
|
||||
this->m_text->actions.NavigateNamed((type == 3 ? "$$DB " : "") + map, type, 0);
|
||||
g_navigationManager.sub_B995D0((type == 3 ? "$$DB " : "") + map, type, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +79,7 @@ void UITextViewer::Activate(UITextButton* button, int id) {
|
|||
flag += 4;
|
||||
}
|
||||
|
||||
this->m_text->actions.Navigate(map, type, flag, option == 0, x, y, target);
|
||||
g_navigationManager.sub_B99030(map, type, flag, option == 0, x, y, target);
|
||||
break;
|
||||
}
|
||||
case 464: {
|
||||
|
|
@ -98,13 +103,13 @@ void UITextViewer::Activate(UITextButton* button, int id) {
|
|||
case 517:
|
||||
if (!arguments.empty()) {
|
||||
if (UIWindow* window = g_windowMgr.EnsureWindow(315)) {
|
||||
this->m_text->actions.OpenTip(*window, number(0));
|
||||
static_cast<UITipboxWnd*>(window)->ShowTip(number(0));
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
case 539:
|
||||
this->m_text->actions.OpenQuest(number(0));
|
||||
static_cast<CGameMode*>(g_modeMgr.GetGameMode())->ReceiveServiceRequest(6, number(0));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue