Maintenance: Resubmission of 15134 without the 12 struct/type renames (their new names changed mangled symbols in 17 functions). Rena
Batch #15141 by ragnarok-clanker: no function's compiled code changes; checked with 537 compiled unit(s), including every includer of Source/Client/Input/LanguageTC.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Replay.h, Source/Client/Session.h, Source/Contents/AchievementMgr.h, Source/Contents/Actors/CharacterRender.h, Source/Contents/Actors/EffectActors.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/Pc.h, Source/Contents/EnchantMgr.h, Source/Contents/GuildInfo.h, Source/Contents/Messenger/MessengerWindows.h, Source/Contents/Schedule/TimeScheduler.h, Source/Contents/Sound/SoundMgr.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/TableMng.h, Source/Contents/World/SkyBox.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Text/CreateLineInfo.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINewSkillListWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWindowMgr.inl.
This commit is contained in:
parent
82ea40ad5d
commit
c932ad6499
150 changed files with 2713 additions and 2713 deletions
|
|
@ -1439,8 +1439,8 @@ std::string UIWindow::FitDisplayText(int width, const char* text, int family, in
|
|||
display = DisplayItemTextTag(display);
|
||||
display = RemoveTextLinkInfo(display);
|
||||
|
||||
if (g_windowMgr.window_01C8) {
|
||||
display = static_cast<UINewChatWnd*>(g_windowMgr.window_01C8)->ConvertChat(std::move(display));
|
||||
if (g_windowMgr.chatWnd) {
|
||||
display = static_cast<UINewChatWnd*>(g_windowMgr.chatWnd)->ConvertChat(std::move(display));
|
||||
}
|
||||
|
||||
std::string navigation;
|
||||
|
|
@ -1511,8 +1511,8 @@ std::string UIWindow::FitVerticalDisplayText(int height, const char* text, int f
|
|||
display = static_cast<const std::string&>(DisplayItemTextTag(display));
|
||||
display = static_cast<const std::string&>(RemoveTextLinkInfo(display));
|
||||
|
||||
if (g_windowMgr.window_01C8) {
|
||||
display = static_cast<UINewChatWnd*>(g_windowMgr.window_01C8)->ConvertChat(std::move(display));
|
||||
if (g_windowMgr.chatWnd) {
|
||||
display = static_cast<UINewChatWnd*>(g_windowMgr.chatWnd)->ConvertChat(std::move(display));
|
||||
}
|
||||
|
||||
std::string navigation;
|
||||
|
|
@ -2072,8 +2072,8 @@ void UINavigationroadiconWnd::OnLBtnUp(int x, int y) {
|
|||
}
|
||||
|
||||
if (slot != 0) {
|
||||
if (g_windowMgr.window_4F174) {
|
||||
g_windowMgr.window_4F174->SendMsg(nullptr, UM_SETCURITEM, slot, 0, 0, 0);
|
||||
if (g_windowMgr.navigationWnd) {
|
||||
g_windowMgr.navigationWnd->SendMsg(nullptr, UM_SETCURITEM, slot, 0, 0, 0);
|
||||
}
|
||||
|
||||
const int column = slot <= 4 ? slot : slot - 4;
|
||||
|
|
@ -2657,9 +2657,9 @@ int UINavigationV4Wnd::SendMsg(UIWindow* sender, int message, std::intptr_t argu
|
|||
window->SendMsg(nullptr, UM_REFRESHBUTTON, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
g_windowMgr.window_4F258 = window;
|
||||
g_windowMgr.privateAirplaneWnd = window;
|
||||
if (g_windowMgr.RunModal(window) == 0xBC) {
|
||||
g_windowMgr.window_4F258 = nullptr;
|
||||
g_windowMgr.privateAirplaneWnd = nullptr;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue