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
|
|
@ -17,91 +17,91 @@ bool UIWindowMgr::ProcessDialogKey(int, int key) {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!this->window_01E8) {
|
||||
if (!this->shortCutWnd) {
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (key) {
|
||||
case 0x100001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 0, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 0, 1, 0, 0);
|
||||
return false;
|
||||
case 0x110001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 1, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 1, 1, 0, 0);
|
||||
return false;
|
||||
case 0x120001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 2, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 2, 1, 0, 0);
|
||||
return false;
|
||||
case 0x130001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 3, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 3, 1, 0, 0);
|
||||
return false;
|
||||
case 0x140001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 4, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 4, 1, 0, 0);
|
||||
return false;
|
||||
case 0x150001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 5, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 5, 1, 0, 0);
|
||||
return false;
|
||||
case 0x160001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 6, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 6, 1, 0, 0);
|
||||
return false;
|
||||
case 0x170001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 7, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 7, 1, 0, 0);
|
||||
return false;
|
||||
case 0x180001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 8, 1, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 8, 1, 0, 0);
|
||||
return false;
|
||||
case 0x1E0001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 0, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 0, 2, 0, 0);
|
||||
return false;
|
||||
case 0x1F0001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 1, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 1, 2, 0, 0);
|
||||
return false;
|
||||
case 0x200001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 2, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 2, 2, 0, 0);
|
||||
return false;
|
||||
case 0x210001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 3, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 3, 2, 0, 0);
|
||||
return false;
|
||||
case 0x220001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 4, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 4, 2, 0, 0);
|
||||
return false;
|
||||
case 0x230001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 5, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 5, 2, 0, 0);
|
||||
return false;
|
||||
case 0x240001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 6, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 6, 2, 0, 0);
|
||||
return false;
|
||||
case 0x250001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 7, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 7, 2, 0, 0);
|
||||
return false;
|
||||
case 0x260001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 8, 2, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 8, 2, 0, 0);
|
||||
return false;
|
||||
case 0x2C0001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 0, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 0, 0, 0, 0);
|
||||
return false;
|
||||
case 0x2D0001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 1, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 1, 0, 0, 0);
|
||||
return false;
|
||||
case 0x2E0001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 2, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 2, 0, 0, 0);
|
||||
return false;
|
||||
case 0x2F0001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 3, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 3, 0, 0, 0);
|
||||
return false;
|
||||
case 0x300001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 4, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 4, 0, 0, 0);
|
||||
return false;
|
||||
case 0x310001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 5, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 5, 0, 0, 0);
|
||||
return false;
|
||||
case 0x320001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 6, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 6, 0, 0, 0);
|
||||
return false;
|
||||
case 0x330001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 7, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 7, 0, 0, 0);
|
||||
return false;
|
||||
case 0x340001:
|
||||
this->window_01E8->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 8, 0, 0, 0);
|
||||
this->shortCutWnd->SendMsg(nullptr, UM_USE_SHORTEN_ITEM, 8, 0, 0, 0);
|
||||
return false;
|
||||
default:
|
||||
return false;
|
||||
|
|
@ -163,7 +163,7 @@ int UIWindowMgr::Confirm(
|
|||
}
|
||||
|
||||
auto* box = new UIMessageBox();
|
||||
this->window_4F16C = box;
|
||||
this->replayMessageBoxWnd = box;
|
||||
box->Configure(text, type, defaultAccept, timeout, caption, width, height, 1, nullptr);
|
||||
|
||||
if (protect == 1) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue