diff --git a/Source/ActorPickNode.cpp b/Source/ActorPickNode.cpp index 397c9327d..842bc5cce 100644 --- a/Source/ActorPickNode.cpp +++ b/Source/ActorPickNode.cpp @@ -221,5 +221,5 @@ void CView::Reset() { // OFFSET: 0x00ADC1D0 // FUNCTION: fn_17929 -void CView::Slot2() { +void CView::OnExitFrame() { } diff --git a/Source/Client/Mode/CGameMode.h b/Source/Client/Mode/CGameMode.h index 0bcc91a20..a361aa25d 100644 --- a/Source/Client/Mode/CGameMode.h +++ b/Source/Client/Mode/CGameMode.h @@ -605,7 +605,7 @@ public: void Update() override; void ProcessIncomingPackets(); void TargetActorByAid(int aid); - void Slot7(int value) override; + void OnChangeState(int value) override; void PlaceWindowAtActor(UIWindow* window, CGameActor* actor); void ReceiveSummonHpInit(const unsigned char* buffer); void ReceiveSummonHpUpdate(const unsigned char* buffer); diff --git a/Source/Client/Mode/CLoginMode.h b/Source/Client/Mode/CLoginMode.h index 2ede46b8d..a93b88628 100644 --- a/Source/Client/Mode/CLoginMode.h +++ b/Source/Client/Mode/CLoginMode.h @@ -144,9 +144,9 @@ public: void Initialize(const char* name) override; void End() override; void Update() override; - void Slot5(int value) override; + void OnUpdateEx(int value) override; int SendMsg(int event, int argument1, int argument2, int argument3, int argument4) override; - void Slot7(int value) override; + void OnChangeState(int value) override; void SubD8D4F0(int); void SubD8D500(const char* packet); diff --git a/Source/Client/Mode/CMode.h b/Source/Client/Mode/CMode.h index a49f7626a..b7a7c5cac 100644 --- a/Source/Client/Mode/CMode.h +++ b/Source/Client/Mode/CMode.h @@ -34,9 +34,9 @@ public: virtual void Initialize(const char* name); virtual void End(); virtual void Update(); - virtual void Slot5(int value); + virtual void OnUpdateEx(int value); virtual int SendMsg(int event, int argument1, int argument2, int argument3, int argument4); - virtual void Slot7(int value); + virtual void OnChangeState(int value); CMode(); std::uint32_t ClearTooltip(); diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index ce418fcce..de6a8f9f5 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -2355,7 +2355,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i UIWindow* window = g_windowMgr.LookupWindow(this->drag.source == 0x10 ? 0x9F : 0x24); if (window) { window->RecordDrop(argument1, argument2, this->drag, -1); - window->Slot10(argument1, argument2, reinterpret_cast(&this->drag)); + window->DragAndDrop(argument1, argument2, reinterpret_cast(&this->drag)); } } else { ITEM_INFO item = LookupClientItemByIdentity(g_session.m_inventoryItems, this->drag.id); @@ -3374,7 +3374,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i return 0; } ITEM_INFO item = LookupClientItemByIdentity(g_session.m_inventoryItems, argument1); - const std::uint32_t state = this->scene->player->Slot13(); + const std::uint32_t state = this->scene->player->GetStateFlags(); const int bodyState = this->scene->player->bodyState; if (StateFlag01(state) || ((bodyState == 4 || bodyState == 1) && item.GetItemId() != 0x31B5)) { return 0; @@ -3402,7 +3402,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(0x1070)), 0xFF, 0, 0, 0); return 0; } - if (this->scene->player->Slot50() > 0 || g_session.PartyCount() > 0) { + if (this->scene->player->GetGdid() > 0 || g_session.PartyCount() > 0) { g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(0x1023)), 0xFF, 0, 0, 0); return 0; } @@ -3583,7 +3583,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i case 4: if (this->unknown_024C == 1 || g_windowMgr.unknown_01F0 || g_windowMgr.unknown_01F8 || g_windowMgr.unknown_01F4) { g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(0x783)), 0xFFFFFF, 0, 0, 0); - } else if (static_cast(g_modeMgr.GetGameMode())->scene->player->Slot13() != 2) { + } else if (static_cast(g_modeMgr.GetGameMode())->scene->player->GetStateFlags() != 2) { this->SendMsg(0x31, this->unknown_02E0, 0, 0, 0); } return 0; @@ -3611,7 +3611,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i (g_session.IsGuildMemberAccount(this->unknown_02E0) ? "GuildMember" : nullptr); std::string code; if (auto* actor = dynamic_cast(this->scene->GetGameActorByAID(this->unknown_02E0))) { - code = ShortcutFilename(actor->Slot42()); + code = ShortcutFilename(actor->GetPkState()); } g_windowMgr.SendNotice(0xE, reinterpret_cast(name.c_str()), reinterpret_cast(category), reinterpret_cast(code.c_str()), 0, 0); @@ -3732,7 +3732,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i if (!actor) { return 0; } - const std::string code = ShortcutFilename(actor->Slot42()); + const std::string code = ShortcutFilename(actor->GetPkState()); HGLOBAL memory = GlobalAlloc(0x42, code.size() + 1); void* destination = GlobalLock(memory); std::memcpy(destination, code.data(), code.size()); @@ -3921,7 +3921,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i message = 0xF84; } else if (this->unknown_0250) { message = 0xBB7; - } else if (StateFlag01(this->scene->player->Slot13())) { + } else if (StateFlag01(this->scene->player->GetStateFlags())) { message = 0xF83; } if (message) { @@ -4705,7 +4705,7 @@ void CGameMode::PlaceWindowAtActor(UIWindow* window, CGameActor* actor) { // OFFSET: 0x00CDD790 // FUNCTION: fn_21318 -void CGameMode::Slot7(int value) { +void CGameMode::OnChangeState(int value) { } // OFFSET: 0x00CDFA00 @@ -5603,7 +5603,7 @@ int CGameMode::Run() { this->cursorType = this->pendingCursorType; this->cursorFrame = 0; this->pendingCursorType = -1; - this->Slot7(this->cursorType); + this->OnChangeState(this->cursorType); } } @@ -5658,9 +5658,9 @@ void CGameMode::TargetActorByAid(int aid) { if (scene->unknown_0048 == 0 && scene->unknown_0054 == 0) { if (scene->unknown_004C != 0) { CGameActor* actor = static_cast(scene->GetGameActorByAID(aid)); - if (actor != nullptr && !g_session.IsLocalPlayerAid(actor->Slot50())) { + if (actor != nullptr && !g_session.IsLocalPlayerAid(actor->GetGdid())) { GuildInfo* guildInfo = &g_guildInfo; - if (!guildInfo->HasRelatedGuild(actor->Slot50())) { + if (!guildInfo->HasRelatedGuild(actor->GetGdid())) { force = 1; } } @@ -5788,7 +5788,7 @@ unsigned CGameMode::ReadReplayGuildInfo(const std::vector& data) int emblemVersion = 0; std::memcpy(&emblemVersion, data.data() + offset, header.size); offset += header.size; - this->scene->player->Slot49(guildId, emblemVersion); + this->scene->player->SetGuildInfo(guildId, emblemVersion); g_guildInfo.m_guildId = guildId; break; } @@ -5825,27 +5825,27 @@ std::vector CGameMode::SaveNameCardState() { } { - const int emblemVersion = g_guildMgr->GetEmblemVersion(this->scene->player->Slot50()); - if (this->AppendGuildEmblem(buffer, names, this->scene->player->Slot50(), emblemVersion)) { + const int emblemVersion = g_guildMgr->GetEmblemVersion(this->scene->player->GetGdid()); + if (this->AppendGuildEmblem(buffer, names, this->scene->player->GetGdid(), emblemVersion)) { const std::vector chunk = MakeDataChunk(13002, buffer); data.insert(data.end(), chunk.begin(), chunk.end()); } } { - const std::vector chunk = MakeRecordChunk(13004, this->scene->player->Slot50()); + const std::vector chunk = MakeRecordChunk(13004, this->scene->player->GetGdid()); data.insert(data.end(), chunk.begin(), chunk.end()); } { - const std::vector chunk = MakeRecordChunk(13005, g_guildMgr->GetEmblemVersion(this->scene->player->Slot50())); + const std::vector chunk = MakeRecordChunk(13005, g_guildMgr->GetEmblemVersion(this->scene->player->GetGdid())); data.insert(data.end(), chunk.begin(), chunk.end()); } for (CRenderObject* object : this->scene->actors) { CGameActor* actor = static_cast(object); - const int emblemVersion = g_guildMgr->GetEmblemVersion(actor->Slot50()); - if (this->AppendGuildEmblem(buffer, names, actor->Slot50(), emblemVersion)) { + const int emblemVersion = g_guildMgr->GetEmblemVersion(actor->GetGdid()); + if (this->AppendGuildEmblem(buffer, names, actor->GetGdid(), emblemVersion)) { const std::vector chunk = MakeDataChunk(13002, buffer); data.insert(data.end(), chunk.begin(), chunk.end()); } @@ -5958,7 +5958,7 @@ std::vector CGameMode::SaveActorStates() { stored->value000A = static_cast(actor->unknown_0158[5]); stored->value000C = static_cast(*reinterpret_cast(actor->unknown_0170)); stored->value000F = static_cast(pc->unknown_0440); - const std::int64_t value = actor->Slot35(); + const std::int64_t value = actor->GetWeapon(); stored->value0011 = static_cast(value); stored->value0015 = static_cast(value >> 32); stored->value0019 = static_cast(pc->unknown_0450); @@ -5967,7 +5967,7 @@ std::vector CGameMode::SaveActorStates() { stored->value001F = static_cast(pc->unknown_0444); stored->value0021 = static_cast(actor->render.unknown_0048); stored->value0023 = static_cast(pc->unknown_049C); - stored->value003D = static_cast(actor->Slot46()); + stored->value003D = static_cast(actor->GetBodyCostume()); { std::string name = this->nameCard.Name(actor->render.accountId); std::memcpy(stored->text, name.c_str(), sizeof(stored->text)); @@ -6012,7 +6012,7 @@ std::vector CGameMode::SaveActorStates() { data.insert(data.end(), chunk.begin(), chunk.end()); } - const int count = actor->Slot56(); + const int count = actor->GetMadogearType(); if (count > 0) { GameModeStoredRecord0191 record; record.value000C = 9999; @@ -6317,7 +6317,7 @@ void CGameMode::ReceiveUiDragMessage(const unsigned char* message) { } if (window != nullptr) { - window->Slot10(packet->x, packet->y, reinterpret_cast(&drag)); + window->DragAndDrop(packet->x, packet->y, reinterpret_cast(&drag)); } const int kind = packet->windowId; @@ -6434,7 +6434,7 @@ void __stdcall OpenWordDisplay(CGameActor* actor) { } if (!IsAdminAccount(g_session.m_aid)) { - if (StateFlag02(actor->Slot13()) || StateFlag01(actor->Slot13()) || StateFlag06(actor->Slot13())) { + if (StateFlag02(actor->GetStateFlags()) || StateFlag01(actor->GetStateFlags()) || StateFlag06(actor->GetStateFlags())) { return; } } @@ -6697,7 +6697,7 @@ void CGameMode::End() { } if (this->camera) { - this->camera->Slot2(); + this->camera->OnExitFrame(); delete this->camera; } @@ -8134,12 +8134,13 @@ void CGameMode::ProcessActorClick(int& handled, ActorPickInfo* pick, CGameActor* if (actor->unknown_0314 == 7) { this->SetCursorAction(0); } else if (g_session.GetMapProperty08() != 0 || this->scene->unknown_004C != 0) { - if (g_session.IsLocalPlayerAid(actor->Slot50())) { + if (g_session.IsLocalPlayerAid(actor->GetGdid())) { attack = 0; this->SetCursorAction(0); } } else { this->SetCursorAction(5); + } } @@ -8316,8 +8317,8 @@ __forceinline void CGameMode::ShowHoverActorName(CGameActor* actor) { this->itemNameBalloon->SetIcon(FormatOwnedString("유저인터페이스\\group\\group_%d.bmp", card.unknown_0094).c_str(), 0); } else if (g_session.IsAllyActor(actor->render.accountId, actor->GetEffectiveJob(-1)) && card.unknown_0094) { this->nameBalloon->SetIcon(FormatOwnedString("유저인터페이스\\group\\group_%d.bmp", card.unknown_0094).c_str(), 0); - } else if (actor->Slot50() && showEmblem) { - std::string emblem = g_guildMgr->GetEmblemFilename(actor->Slot50()); + } else if (actor->GetGdid() && showEmblem) { + std::string emblem = g_guildMgr->GetEmblemFilename(actor->GetGdid()); const unsigned char framedEmblem = g_serviceOptions.Get(0xF3); this->itemNameBalloon->SetIcon(emblem.c_str(), static_cast(g_modeMgr.GetGameMode())->scene->unknown_004C == 1 && framedEmblem ? 1 : 0); } else { @@ -9076,7 +9077,7 @@ void CGameMode::UpdateHoverNameBalloon() { return; } - if (actor->render.visible == 1 && actor->render.enabled == 1 && !StateFlag02(actor->Slot13())) { + if (actor->render.visible == 1 && actor->render.enabled == 1 && !StateFlag02(actor->GetStateFlags())) { this->ShowHoverActorName(actor); } } else { @@ -9090,14 +9091,14 @@ void CGameMode::UpdateHoverNameBalloon() { return; } - if (!actor->unknown_0314 && actor->render.visible == 1 && actor->render.enabled == 1 && !StateFlag02(actor->Slot13())) { + if (!actor->unknown_0314 && actor->render.visible == 1 && actor->render.enabled == 1 && !StateFlag02(actor->GetStateFlags())) { *reinterpret_cast(&this->unknown_02B8[0x10]) = 0; this->ShowHoverActorName(actor); } } if (actor->GetEffectiveJob(-1) != 45 && - (actor->unknown_0314 || (actor->render.visible == 1 && actor->render.enabled == 1 && !StateFlag02(actor->Slot13())))) { + (actor->unknown_0314 || (actor->render.visible == 1 && actor->render.enabled == 1 && !StateFlag02(actor->GetStateFlags())))) { this->SendMsg(4, static_cast(actor->render.position.x), static_cast(actor->render.position.z), 0, 0); return; } @@ -10130,7 +10131,7 @@ void CGameMode::ProcessActorPick(int& handled, ActorPickInfo* pick, CGameActor* attack = 1; } } else if (g_session.GetMapProperty08()) { - if (!g_session.IsLocalPlayerAid(actor->Slot50())) { + if (!g_session.IsLocalPlayerAid(actor->GetGdid())) { attack = 1; } } @@ -10156,14 +10157,14 @@ void CGameMode::ProcessActorPick(int& handled, ActorPickInfo* pick, CGameActor* CGameActor* summoner = static_cast(scene->GetGameActorByAID(actor->unknown_02EC)); if (!summoner) { known = this->scene->player->render.accountId == static_cast(actor->unknown_02EC); - } else if (!g_session.IsLocalPlayerAid(summoner->Slot50())) { - friendly = guildInfo->HasRelatedGuild(summoner->Slot50()); + } else if (!g_session.IsLocalPlayerAid(summoner->GetGdid())) { + friendly = guildInfo->HasRelatedGuild(summoner->GetGdid()); } break; } default: - if (!g_session.IsLocalPlayerAid(actor->Slot50())) { - friendly = guildInfo->HasRelatedGuild(actor->Slot50()); + if (!g_session.IsLocalPlayerAid(actor->GetGdid())) { + friendly = guildInfo->HasRelatedGuild(actor->GetGdid()); } break; } @@ -10304,7 +10305,7 @@ void CGameMode::ProcessActorPick(int& handled, ActorPickInfo* pick, CGameActor* return; } this->SendMsg(0x1A, 1, 0, 0, 0); - g_hoverActorGid = actor->Slot42(); + g_hoverActorGid = actor->GetPkState(); *reinterpret_cast(&this->unknown_00EC[0x0C]) = 0; } @@ -10548,14 +10549,14 @@ int CGameMode::HandleActorPick(ActorPickInfo* pick, int result) { attack = 1; } } else if (g_session.GetMapProperty08() && actor != nullptr) { - if (!g_session.IsLocalPlayerAid(actor->Slot50())) { + if (!g_session.IsLocalPlayerAid(actor->GetGdid())) { attack = 1; } } if (this->scene->unknown_004C != 0) { if (actor != nullptr) { - if (!g_session.IsLocalPlayerAid(actor->Slot50()) && !guildInfo->HasRelatedGuild(actor->Slot50())) { + if (!g_session.IsLocalPlayerAid(actor->GetGdid()) && !guildInfo->HasRelatedGuild(actor->GetGdid())) { attack = 1; } else { attack = 0; @@ -10615,10 +10616,10 @@ int CGameMode::HandleActorPick(ActorPickInfo* pick, int result) { } CGameActor* actor = static_cast(this->scene->GetGameActorByAID(pick->accountId)); - if (g_session.GetMapProperty08() && actor != nullptr && g_session.IsLocalPlayerAid(actor->Slot50())) { + if (g_session.GetMapProperty08() && actor != nullptr && g_session.IsLocalPlayerAid(actor->GetGdid())) { attack = 0; } - if (this->scene->unknown_004C != 0 && actor != nullptr && g_session.IsLocalPlayerAid(actor->Slot50())) { + if (this->scene->unknown_004C != 0 && actor != nullptr && g_session.IsLocalPlayerAid(actor->GetGdid())) { attack = 0; } @@ -10746,7 +10747,7 @@ int CGameMode::HandleActorPick(ActorPickInfo* pick, int result) { if (scene->unknown_0048 == 1 || siegeMode == 1 || scene->unknown_004C == 1) { if (scene->unknown_004C == 1) { CGameActor* owner = static_cast(scene->GetGameActorByAID(actor->unknown_02EC)); - if (owner == nullptr || g_session.IsLocalPlayerAid(owner->Slot50()) == 1 || guildInfo->HasRelatedGuild(owner->Slot50()) == true) { + if (owner == nullptr || g_session.IsLocalPlayerAid(owner->GetGdid()) == 1 || guildInfo->HasRelatedGuild(owner->GetGdid()) == true) { break; } } diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index 02a8259cf..106fb84ff 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -1715,7 +1715,7 @@ void CGameMode::ReceiveRuneRewardPacket(const unsigned char* packet) { CEffect* effect = g_effectMgr->Spawn(g_session.m_aid, 2399, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); const vector3d offset = {598.0f, 219.0f, 0.0f}; const int* words = reinterpret_cast(&offset); - effect->Slot24(words[0], words[1], words[2], 1, 361); + effect->SetWindowOffset(words[0], words[1], words[2], 1, 361); if (UIWindow* window = g_windowMgr.LookupWindow(361)) { window->SendMsg(window, 0x3C, 0, 0, 0, 0); } @@ -1945,12 +1945,12 @@ void CGameMode::ReceiveRuneGradeResult(int result, int tagId, int type, std::int CEffect* effect = g_effectMgr->Spawn(g_session.m_aid, 2397, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); const vector3d offset = {784.0f, 161.0f, 0.0f}; const int* words = reinterpret_cast(&offset); - effect->Slot24(words[0], words[1], words[2], 1, 361); + effect->SetWindowOffset(words[0], words[1], words[2], 1, 361); } else if (state == 1) { CEffect* effect = g_effectMgr->Spawn(g_session.m_aid, 2398, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); const vector3d offset = {784.0f, 161.0f, 0.0f}; const int* words = reinterpret_cast(&offset); - effect->Slot24(words[0], words[1], words[2], 1, 361); + effect->SetWindowOffset(words[0], words[1], words[2], 1, 361); } else { CEffect* effect = g_effectMgr->Spawn(g_session.m_aid, type != 0 ? 2395 : 2396, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); vector3d offset = {0.0f, 0.0f, 0.0f}; @@ -1962,7 +1962,7 @@ void CGameMode::ReceiveRuneGradeResult(int result, int tagId, int type, std::int offset.y = 271.0f; } const int* words = reinterpret_cast(&offset); - effect->Slot24(words[0], words[1], words[2], 1, 361); + effect->SetWindowOffset(words[0], words[1], words[2], 1, 361); } if (RuneSetData* runeSet = g_runeSystemMgr->GetCurRuneSet()) { @@ -2135,7 +2135,7 @@ void CGameMode::ReceiveGradeEnchantResult(const unsigned char* packet) { case 0: window->SetResult(2, 0); g_effectMgr->Spawn(g_session.m_aid, 1607, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); - g_effectMgr->Spawn(g_session.m_aid, 1608, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)->Slot16(2800); + g_effectMgr->Spawn(g_session.m_aid, 1608, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)->SetDelay(2800); break; case 1: case 2: @@ -2143,7 +2143,7 @@ void CGameMode::ReceiveGradeEnchantResult(const unsigned char* packet) { case 4: window->SetResult(2, result); g_effectMgr->Spawn(g_session.m_aid, 1607, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); - g_effectMgr->Spawn(g_session.m_aid, 1609, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)->Slot16(2800); + g_effectMgr->Spawn(g_session.m_aid, 1609, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)->SetDelay(2800); break; } } @@ -2327,7 +2327,7 @@ void CGameMode::ReceiveGuildEmblemVersion(std::uint32_t aid, int guildId, int em if (this->scene) { CRenderObject* actor = this->scene->GetGameActorByAID(aid); if (actor) { - static_cast(actor)->Slot48(guildId); + static_cast(actor)->SetGdid(guildId); } } diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index fb154efca..664567a4c 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -1200,7 +1200,7 @@ void CGameMode::ReceiveActorEffect228(const unsigned char* data) { } auto* gameActor = static_cast(actor); - if (StateFlag01(gameActor->Slot13()) == true || StateFlag02(gameActor->Slot13()) == true) { + if (StateFlag01(gameActor->GetStateFlags()) == true || StateFlag02(gameActor->GetStateFlags()) == true) { actor->SendMsg(nullptr, 109, 0, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } @@ -4098,18 +4098,18 @@ void CGameMode::ReceiveNotifyGroundSkill(const unsigned char* packet) { if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(0, 0x5AE, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } effect = g_effectMgr->Spawn(0, 0x5AF, position.x, position.y, position.z, 0, -1, 0, 0); } else { effect = g_effectMgr->Spawn(0, 0x508, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } effect = g_effectMgr->Spawn(0, 0x509, position.x, position.y, position.z, 0, -1, 0, 0); } if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } } break; @@ -4133,13 +4133,13 @@ void CGameMode::ReceiveNotifyGroundSkill(const unsigned char* packet) { position.z = rotation.values[2] * radius + rotation.values[5] * 0.0f + rotation.values[8] * 0.0f + rotation.values[11] + z; CEffect* effect = g_effectMgr->Spawn(0, 0x5B9, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot22(0.5f); - effect->Slot16(delay); + effect->SetScale(0.5f); + effect->SetDelay(delay); } effect = g_effectMgr->Spawn(0, 0x656, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot22(0.5f); - effect->Slot16(delay); + effect->SetScale(0.5f); + effect->SetDelay(delay); } delay += 70; } @@ -4308,18 +4308,18 @@ void CGameMode::ReceiveNotifyGroundSkill(const unsigned char* packet) { if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(0, 0x5AE, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } effect = g_effectMgr->Spawn(0, 0x5AF, position.x, position.y, position.z, 0, -1, 0, 0); } else { effect = g_effectMgr->Spawn(0, 0x508, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } effect = g_effectMgr->Spawn(0, 0x509, position.x, position.y, position.z, 0, -1, 0, 0); } if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } } } @@ -4664,36 +4664,36 @@ void CGameMode::ReceiveSpriteChange(const unsigned char* data) { switch (packet->type) { case 0: actor->SetActorJob(packet->value); - actor->Slot30(); - actor->Slot31(); - actor->Slot32(); + actor->SetImfFileName(); + actor->SetHeadPaletteName(); + actor->SetBodyPaletteName(); break; case 1: - actor->Slot22(packet->value); - actor->Slot30(); - actor->Slot31(); - actor->Slot60(); + actor->SetSprHead(packet->value); + actor->SetImfFileName(); + actor->SetHeadPaletteName(); + actor->RefreshAccessory3(); break; case 2: - actor->Slot23(packet->value, 0); + actor->SetSprWeapon(packet->value, 0); break; case 3: - actor->Slot25(packet->value); + actor->SetSprAccessory(packet->value); break; case 4: - actor->Slot26(packet->value); + actor->SetSprAccessory2(packet->value); break; case 5: - actor->Slot27(packet->value); + actor->SetSprAccessory3(packet->value); break; case 6: - actor->Slot34(packet->value); + actor->SetHeadPalette(packet->value); break; case 7: - actor->Slot33(packet->value); + actor->SetBodyPalette(packet->value); break; case 8: - actor->Slot28(packet->value); + actor->SetSprShield(packet->value); break; } } @@ -4756,7 +4756,7 @@ void CGameMode::ReceiveSpriteChange2(const unsigned char* data) { break; case 14: g_session.SetFlag(static_cast(value)); - actor->Slot62(value); + actor->SetSex(value); g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(4137)), 0, 0, 0, 0); break; } @@ -4781,17 +4781,17 @@ void CGameMode::ReceiveSpriteChange2(const unsigned char* data) { case 0: actor->SetActorJob(value); if (packet->aid == g_session.m_aid) { - actor->Slot33(g_session.m_bodyStyle); + actor->SetBodyPalette(g_session.m_bodyStyle); } - actor->Slot30(); - actor->Slot31(); - actor->Slot32(); + actor->SetImfFileName(); + actor->SetHeadPaletteName(); + actor->SetBodyPaletteName(); break; case 1: - actor->Slot22(value); - actor->Slot30(); - actor->Slot31(); - actor->Slot60(); + actor->SetSprHead(value); + actor->SetImfFileName(); + actor->SetHeadPaletteName(); + actor->RefreshAccessory3(); break; case 2: { const int shield = static_cast(packet->value >> 32); @@ -4805,57 +4805,57 @@ void CGameMode::ReceiveSpriteChange2(const unsigned char* data) { case 0xFE1: case 0x1005: case 0x109E: - actor->Slot24(value, shield); + actor->SetSprWeapon2(value, shield); break; default: - actor->Slot24(weapon, static_cast(static_cast(weapon) >> 32)); + actor->SetSprWeapon2(weapon, static_cast(static_cast(weapon) >> 32)); break; } if (view == -1 || shield == 0) { - actor->Slot28(shield); + actor->SetSprShield(shield); } break; } case 3: - actor->Slot25(value); + actor->SetSprAccessory(value); break; case 4: - actor->Slot26(value); + actor->SetSprAccessory2(value); break; case 5: - actor->Slot27(value); + actor->SetSprAccessory3(value); break; case 6: - actor->Slot34(value); + actor->SetHeadPalette(value); break; case 7: - actor->Slot33(value); + actor->SetBodyPalette(value); break; case 9: - actor->Slot29(value); + actor->SetSprShoe(value); break; case 11: - actor->Slot25(0); - actor->Slot26(0); - actor->Slot27(0); - actor->Slot43(0, 0); + actor->SetSprAccessory(0); + actor->SetSprAccessory2(0); + actor->SetSprAccessory3(0); + actor->SetSprRobe(0, 0); break; case 12: - actor->Slot43(value, 0); + actor->SetSprRobe(value, 0); break; case 13: - actor->Slot44(value, 1); - if (StateFlag04(actor->Slot13())) { + actor->SetBodyCostume(value, 1); + if (StateFlag04(actor->GetStateFlags())) { actor->SendMsg(nullptr, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); actor->SendMsg(nullptr, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } - if (StateFlag20(actor->Slot13())) { + if (StateFlag20(actor->GetStateFlags())) { actor->SendMsg(nullptr, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); actor->SendMsg(nullptr, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } break; case 14: - actor->Slot62(value); + actor->SetSex(value); break; } } @@ -6218,14 +6218,14 @@ void CGameMode::ReceiveStatusChangeNotice(const unsigned char* data) { break; case 933: if (packet->aid == g_session.m_aid) { - this->scene->player->Slot15(48, 1); + this->scene->player->SetState(48, 1); this->scene->player->render.isMotionFreezed = true; } break; case 893: if (packet->aid == g_session.m_aid) { this->scene->GetGameActorByAID(packet->aid); - this->scene->player->Slot15(47, 1); + this->scene->player->SetState(47, 1); } break; case 1013: @@ -6331,7 +6331,7 @@ void CGameMode::ReceiveStatusChangeNotice(const unsigned char* data) { case 29: std::sprintf(message, ""); if (packet->aid == g_session.m_aid) { - this->scene->player->Slot15(0, 1); + this->scene->player->SetState(0, 1); this->scene->player->render.isMotionFreezed = false; } break; @@ -6875,13 +6875,13 @@ void CGameMode::ReceiveStatusChangeNotice(const unsigned char* data) { break; case 933: if (packet->aid == g_session.m_aid) { - this->scene->player->Slot15(0, 1); + this->scene->player->SetState(0, 1); this->scene->player->render.isMotionFreezed = false; } break; case 893: if (packet->aid == g_session.m_aid && !this->scene->player->render.unknown_0114) { - this->scene->player->Slot15(0, 1); + this->scene->player->SetState(0, 1); } break; case 1013: @@ -6904,7 +6904,7 @@ void CGameMode::ReceiveStatusChangeNotice(const unsigned char* data) { if (!actor) { break; } - actor->Slot57(0); + actor->SetMadogearType(0); if (packet->aid == g_session.m_aid) { g_session.unknown_8074 = 0; } @@ -7167,7 +7167,7 @@ void CGameMode::ReceiveGuildMemberLeft(const unsigned char* data) { guildInfo->Init(); g_windowMgr.CloseWindow(59); g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(489)), 0xFF, 4, 0, 0); - this->scene->player->Slot49(0, 0); + this->scene->player->SetGuildInfo(0, 0); this->SendMsg(172, 0, 0, 0, 0); return; } @@ -7229,7 +7229,7 @@ void CGameMode::ReceiveGuildExpulsion2(const unsigned char* data) { g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(490)), 0xFF, 4, 0, 0); this->SendMsg(172, 0, 0, 0, 0); if (this->scene != nullptr && this->scene->player != nullptr) { - this->scene->player->Slot48(0); + this->scene->player->SetGdid(0); } guildInfo->ClearUnknown0114(); return; @@ -7275,7 +7275,7 @@ void CGameMode::ReceiveGuildLeave2(const unsigned char* data) { guildInfo->Init(); g_windowMgr.CloseWindow(59); g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(489)), 0xFF, 4, 0, 0); - this->scene->player->Slot49(0, 0); + this->scene->player->SetGuildInfo(0, 0); this->SendMsg(172, 0, 0, 0, 0); return; } @@ -7305,7 +7305,7 @@ void CGameMode::ReceiveGuildLeave2(const unsigned char* data) { g_windowMgr.SendNotice(1, reinterpret_cast(message), 0xFFFF, 4, 0, 0); if (CRenderObject* actor = this->scene->GetGameActorByAID(packet->characterId)) { - static_cast(actor)->Slot49(0, 0); + static_cast(actor)->SetGuildInfo(0, 0); } } diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index 7f4ae97b6..1b26b47f1 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -2271,7 +2271,7 @@ void CGameMode::ApplyActorStatusEffects(std::uint32_t aid, int state, int flag, } if (actor->IsPlayerClass(actor->GetEffectiveJob(-1))) { - if (StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { actor->SendMsg(nullptr, 109, 0, 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); actor->SendMsg(nullptr, 109, 0, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); actor->SendMsg(nullptr, 109, 0, 1132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -2374,7 +2374,7 @@ void CGameMode::ApplyActorStatusEffects(std::uint32_t aid, int state, int flag, return; } - if (StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { actor->SendMsg(nullptr, 109, 0, 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); actor->SendMsg(nullptr, 109, 0, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); actor->SendMsg(nullptr, 109, 0, 1132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -2757,7 +2757,7 @@ __declspec(noinline) void CGameMode::ReceivePacket0B73(const unsigned char* data return; } - if (StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { g_effectMgr->Retire(actor->render.accountId, 1225); } @@ -2770,7 +2770,7 @@ __declspec(noinline) void CGameMode::ReceivePacket0B73(const unsigned char* data } effect->unknown_00B0 = packet->value; - effect->Slot01(); + effect->Open(); } // OFFSET: 0x00D25850 @@ -2962,13 +2962,13 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { const int duration = static_cast(source->render.speed * 100.0f + 100.0f); CEffect* effect = g_effectMgr->Spawn(target->render.accountId, effectId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } break; } case 0x2C4: target->LaunchEffect(0x5C, origin, 0.0f); - source->Slot15(7, 1); + source->SetState(7, 1); break; case 0x2ED: if (source == this->scene->player) { @@ -2985,7 +2985,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { } break; case 0x7D3: - source->Slot15(2, 1); + source->SetState(2, 1); target->LaunchEffect(0xB7, origin, 0.0f); break; case 0x8A5: @@ -2997,7 +2997,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { effectId = 0x586; } g_effectMgr->Spawn(target->render.accountId, effectId, origin.x, origin.y, origin.z, 0, -1, 0, 0); - source->Slot15(7, 1); + source->SetState(7, 1); break; case 0x996: g_effectMgr->Spawn(target->render.accountId, 0x619, origin.x, origin.y, origin.z, 0, -1, 0, 0); @@ -3008,31 +3008,31 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(source->render.accountId, 0x5DA, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } effect = g_effectMgr->Spawn(target->render.accountId, 0x5D8, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(400); + effect->SetDelay(400); } effectId = 0x5D9; } else { effect = g_effectMgr->Spawn(source->render.accountId, 0x550, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } effect = g_effectMgr->Spawn(source->render.accountId, 0x551, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } effect = g_effectMgr->Spawn(target->render.accountId, 0x54E, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(400); + effect->SetDelay(400); } effectId = 0x54F; } effect = g_effectMgr->Spawn(target->render.accountId, effectId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(400); + effect->SetDelay(400); } break; } @@ -3051,7 +3051,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { const float angle = 360.0f - (heading / 3.141592f * 180.0f + yaw); CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x91F, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot17(angle); + effect->SetAngle(angle); } break; } @@ -3059,7 +3059,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { } if (source != nullptr && skillId == 0x89B) { - source->Slot15(7, 1); + source->SetState(7, 1); } if (target != nullptr) { @@ -3096,7 +3096,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { if (g_effectMgr->Find(source->render.accountId, directionId) == nullptr) { effect = g_effectMgr->Spawn(source->render.accountId, directionId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } } effectId = 0x5F0; @@ -3104,18 +3104,18 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { if (g_effectMgr->Find(source->render.accountId, directionId) == nullptr) { effect = g_effectMgr->Spawn(source->render.accountId, directionId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } } effect = g_effectMgr->Spawn(target->render.accountId, 0x562, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(350); + effect->SetDelay(350); } effectId = 0x563; } effect = g_effectMgr->Spawn(target->render.accountId, effectId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(350); + effect->SetDelay(350); } g_soundMgr->PlayWave("effect\\폭염룡.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); break; @@ -3146,7 +3146,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { if (g_effectMgr->Find(source->render.accountId, directionId) == nullptr) { effect = g_effectMgr->Spawn(source->render.accountId, directionId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } } effectId = 0x5F6; @@ -3154,18 +3154,18 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { if (g_effectMgr->Find(source->render.accountId, directionId) == nullptr) { effect = g_effectMgr->Spawn(source->render.accountId, directionId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } } effect = g_effectMgr->Spawn(target->render.accountId, 0x56A, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(350); + effect->SetDelay(350); } effectId = 0x56B; } effect = g_effectMgr->Spawn(target->render.accountId, effectId, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(350); + effect->SetDelay(350); } g_soundMgr->PlayWave("effect\\폭염룡.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); break; @@ -3252,19 +3252,19 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(0, 0x5D2, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } effectId = 0x5D3; } else { effect = g_effectMgr->Spawn(0, 0x54B, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } effectId = 0x54C; } effect = g_effectMgr->Spawn(0, effectId, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } } @@ -3292,7 +3292,7 @@ void CGameMode::ReceiveNotifySkill(const unsigned char* packet) { case 0x919: { CEffect* effect = g_effectMgr->Spawn(target->render.accountId, 0x624, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(100); + effect->SetDelay(100); } break; } @@ -3520,7 +3520,7 @@ void CGameMode::ReceiveDispel(const unsigned char* packet) { this->scene->player->SendMsg(nullptr, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); CPlayer* player = this->scene->player; if (player->render.unknown_0070 == 8) { - player->Slot15(0, 1); + player->SetState(0, 1); } return; } @@ -3535,7 +3535,7 @@ void CGameMode::ReceiveDispel(const unsigned char* packet) { actor->SendMsg(nullptr, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); g_effectMgr->Retire(dispel->aid, 1114); if (actor->render.unknown_0070 == 8) { - actor->Slot15(0, 1); + actor->SetState(0, 1); } } @@ -3849,7 +3849,7 @@ void CGameMode::Zc_Spirits2(const unsigned char* data) { return; } - if (StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { int effectId; switch (actor->GetEffectiveJob(-1)) { case 24: @@ -3952,7 +3952,7 @@ void CGameMode::UpdateActorSpiritCount(std::uint32_t aid, std::int16_t count) { break; } - if (StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { switch (job) { case 4252: case 4265: @@ -3983,7 +3983,7 @@ void CGameMode::UpdateActorSpiritCount(std::uint32_t aid, std::int16_t count) { return; } static_cast(coins)->unknown_00E4 = count; - coins->Slot01(); + coins->Open(); return; } case 4252: @@ -5709,14 +5709,14 @@ void CGameMode::ApplyStatusChange( break; case 933: if (aid == g_session.m_aid) { - this->scene->player->Slot15(48, 1); + this->scene->player->SetState(48, 1); this->scene->player->render.isMotionFreezed = true; } break; case 893: if (aid == g_session.m_aid) { this->scene->GetGameActorByAID(aid); - this->scene->player->Slot15(47, 1); + this->scene->player->SetState(47, 1); } break; case 373: @@ -5754,12 +5754,12 @@ void CGameMode::ApplyStatusChange( } if (value1 == 2) { - actor->Slot57(2); + actor->SetMadogearType(2); if (aid == g_session.m_aid) { g_session.unknown_8074 = 2; } } else { - actor->Slot57(1); + actor->SetMadogearType(1); if (aid == g_session.m_aid) { g_session.unknown_8074 = 1; } @@ -5947,7 +5947,7 @@ void CGameMode::ApplyStatusChange( case 29: std::sprintf(message, ""); if (aid == g_session.m_aid) { - this->scene->player->Slot15(0, 1); + this->scene->player->SetState(0, 1); this->scene->player->render.isMotionFreezed = false; } break; @@ -6359,13 +6359,13 @@ void CGameMode::ApplyStatusChange( break; case 933: if (aid == g_session.m_aid) { - this->scene->player->Slot15(0, 1); + this->scene->player->SetState(0, 1); this->scene->player->render.isMotionFreezed = false; } break; case 893: if (aid == g_session.m_aid) { - this->scene->player->Slot15(0, 1); + this->scene->player->SetState(0, 1); } break; case 1013: @@ -6874,7 +6874,7 @@ void CGameMode::ReceiveHomunculusChange(const unsigned char* packet) { g_session.unknown_55D8 = *reinterpret_cast(packet + 8); } else { g_session.unknown_55D8 = 0; - actor->Slot21(actor->GetEffectiveJob(-1)); + actor->SetSprJob(actor->GetEffectiveJob(-1)); } if (g_session.IsHomunAid(*reinterpret_cast(packet + 4)) && g_windowMgr.window_03C0) { g_windowMgr.window_03C0->Invalidate(); @@ -9107,7 +9107,7 @@ void CGameMode::ReceivePetChangeState(const unsigned char* data) { g_session.unknown_1038 = packet->value; } else { g_session.unknown_1038 = 0; - actor->Slot21(actor->GetEffectiveJob(-1)); + actor->SetSprJob(actor->GetEffectiveJob(-1)); } if (packet->aid == g_session.unknown_1010 && g_windowMgr.window_038C) { g_windowMgr.window_038C->Invalidate(); @@ -9116,7 +9116,7 @@ void CGameMode::ReceivePetChangeState(const unsigned char* data) { case 4: if (actor) { actor->SetUnknown02C8(packet->value); - actor->Slot15(0, 1); + actor->SetState(0, 1); } break; case 6: @@ -10132,7 +10132,7 @@ void CGameMode::ReceiveEffectNumber(const unsigned char* data) { this->scene->player->unknown_0494 = packet->count; } else { actor = static_cast(this->scene->GetGameActorByAID(packet->aid)); - const std::uint32_t state = actor->Slot13(); + const std::uint32_t state = actor->GetStateFlags(); if (StateFlag02(state) || StateFlag01(state) || StateFlag06(state)) { return; } @@ -10463,7 +10463,7 @@ void CGameMode::ReceiveActorDisappear(const unsigned char* data) { break; case 3: if (CGameActor* actor = static_cast(this->scene->GetGameActorByAID(packet->aid))) { - if (!StateFlag06(actor->Slot13())) { + if (!StateFlag06(actor->GetStateFlags())) { this->LaunchDummyEffect(&actor->render.position, 0x130, 300, 0); } } @@ -11209,7 +11209,7 @@ void LaunchSkillCastEffect(CGameMode* mode, CGameActor* source, CGameActor* targ if (skillId == 0x14A4) { effect = g_effectMgr->Spawn(target->render.accountId, 0x78A, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; } @@ -11226,11 +11226,11 @@ void LaunchSkillCastEffect(CGameMode* mode, CGameActor* source, CGameActor* targ effect = g_effectMgr->Spawn(target->render.accountId, 0x635, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); const int duration = static_cast(speed * 150.0f + 200.0f) + delay; if (effect) { - effect->Slot14(duration); + effect->SetLifeTime(duration); } effect = g_effectMgr->Spawn(target->render.accountId, 0x636, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(duration); + effect->SetLifeTime(duration); } return; } @@ -11246,7 +11246,7 @@ void LaunchSkillCastEffect(CGameMode* mode, CGameActor* source, CGameActor* targ target->SendMsg(nullptr, 0x57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); effect = g_effectMgr->Spawn(target->render.accountId, 0x673, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8D3: @@ -11403,7 +11403,7 @@ void CGameMode::NotifySkillCasting( if (delay == 0 && skillId == 0xA04) { CEffect* effect = g_effectMgr->Find(source->render.accountId, 0x474); if (effect) { - effect->Slot01(); + effect->Open(); } else { g_effectMgr->Spawn(source->render.accountId, 0x474, source->render.position.x, source->render.position.y, source->render.position.z, 0, -1, 0, 0); } @@ -11436,7 +11436,7 @@ void CGameMode::NotifySkillCasting( int effectId = 0; int motion = 0; g_session.GetSkillActionInfo(skillId, effectId, motion, property, source->GetEffectiveJob(-1)); - source->Slot15(motion, 1); + source->SetState(motion, 1); if (skillId != 0x3E && skillId != 0x39 && delay != 0) { source->SendMsg(nullptr, 0x52, 0, delay, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -12577,8 +12577,8 @@ void CGameMode::ReceiveActorTypedEntry(const unsigned char* data) { if ((actorJob > JT_WARPNPC && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t guildId = (packet->accessory2 << 16) | packet->accessory3; const int guildVersion = packet->shield; - if (guildId > 0 && !actor->Slot50()) { - actor->Slot49(guildId, guildVersion); + if (guildId > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(guildId, guildVersion); } } if (packet->objectType == 7) { @@ -12635,7 +12635,7 @@ void CGameMode::ReceiveActorTypedEntry(const unsigned char* data) { if ((actorJob > JT_WARPNPC && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t guildId = (packet->accessory2 << 16) | packet->accessory3; if (guildId > 0) { - actor->Slot49(guildId, packet->shield); + actor->SetGuildInfo(guildId, packet->shield); } } } @@ -12686,7 +12686,7 @@ void CGameMode::ReceiveNpcStandEntry(const unsigned char* data) { if ((actorJob > JT_WARPNPC && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t guildId = (packet->accessory2 << 16) | packet->accessory3; if (guildId > 0) { - actor->Slot49(guildId, packet->shield); + actor->SetGuildInfo(guildId, packet->shield); } } actor->unknown_0210 = packet->unknown_002A; @@ -12699,8 +12699,8 @@ void CGameMode::ReceiveNpcStandEntry(const unsigned char* data) { if ((actorJob > JT_WARPNPC && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t guildId = (packet->accessory2 << 16) | packet->accessory3; const int guildVersion = packet->shield; - if (guildId > 0 && !actor->Slot50()) { - actor->Slot49(guildId, guildVersion); + if (guildId > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(guildId, guildVersion); } } actor->unknown_0210 = packet->unknown_002A; @@ -12945,7 +12945,7 @@ void CGameMode::ReceiveActorMoveEntryLegacy(const unsigned char* data) { if (g_session.IsPetAid(packet->aid)) { g_session.unknown_1038 = entry.accessory; } - if (entry.accessory && !actor->Slot50()) { + if (entry.accessory && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.accessory)); } } else if (packet->objectType == 8 && g_session.IsHomunAid(packet->aid)) { @@ -13079,7 +13079,7 @@ void CGameMode::SpawnMovingActor( if (g_session.IsPetAid(aid)) { g_session.unknown_1038 = entry.accessory; } - if (entry.accessory && !actor->Slot50()) { + if (entry.accessory && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.accessory)); } } else if (objectType == 8 && g_session.IsHomunAid(aid)) { @@ -13192,7 +13192,7 @@ void CGameMode::ReceiveActorMoveEntryOld(const unsigned char* data) { if (g_session.unknown_1010 == packet->aid) { g_session.unknown_1038 = entry.accessory; } - if (entry.accessory && !actor->Slot50()) { + if (entry.accessory && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.accessory)); } } @@ -13326,7 +13326,7 @@ void CGameMode::ReceiveActorMoveEntryOld2(const unsigned char* data) { if (g_session.unknown_1010 == packet->aid) { g_session.unknown_1038 = entry.accessory; } - if (entry.accessory && !actor->Slot50()) { + if (entry.accessory && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.accessory)); } } @@ -13473,7 +13473,7 @@ void CGameMode::ReceiveActorMoveEntryNamed(const unsigned char* data) { if (g_session.unknown_1010 == packet->aid) { g_session.unknown_1038 = entry.accessory; } - if (entry.accessory && !actor->Slot50()) { + if (entry.accessory && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.accessory)); } } @@ -13608,14 +13608,14 @@ void CGameMode::ReceiveActorMoveEntryOld0(const unsigned char* data) { if ((actorJob > 45 && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t emblem = (packet->accessory2 << 16) | packet->accessory3; if (emblem > 0) { - actor->Slot49(emblem, packet->shield); + actor->SetGuildInfo(emblem, packet->shield); } } if (entry.head == 0x2E) { if (g_session.unknown_1010 == packet->aid) { g_session.unknown_1038 = entry.accessory; } - if (entry.accessory && !actor->Slot50()) { + if (entry.accessory && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.accessory)); } } @@ -13648,8 +13648,8 @@ void CGameMode::ReceiveActorMoveEntryOld0(const unsigned char* data) { const int actorJob = actor->GetEffectiveJob(-1); if ((actorJob > 45 && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t emblem = (packet->accessory2 << 16) | packet->accessory3; - if (emblem > 0 && !actor->Slot50()) { - actor->Slot49(emblem, packet->shield); + if (emblem > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(emblem, packet->shield); } } } @@ -13948,7 +13948,7 @@ void CGameMode::ReceiveActorStandEntryLegacy(const unsigned char* data) { if (g_session.IsPetAid(packet->aid)) { g_session.unknown_1038 = entry.unknown_0030; } - if (entry.unknown_0030 && !actor->Slot50()) { + if (entry.unknown_0030 && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.unknown_0030)); } } else if (packet->objectType == 8 && g_session.IsHomunAid(packet->aid)) { @@ -13982,8 +13982,8 @@ void CGameMode::ReceiveActorStandEntryLegacy(const unsigned char* data) { if (packet->objectType != 0) { const std::uint32_t guildId = (packet->accessory2 << 16) | packet->accessory3; - if (guildId > 0 && !actor->Slot50()) { - actor->Slot49(guildId, packet->guildVersion); + if (guildId > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(guildId, packet->guildVersion); } } this->ApplyActorStatusEffects(packet->aid, packet->effectState, packet->level, packet->virtue); @@ -14131,10 +14131,10 @@ void CGameMode::ReceiveActorStandEntryNamedOld(const unsigned char* data) { const int guildId = (packet->accessory2 << 16) | packet->accessory3; if (created) { if (guildId != 0) { - actor->Slot49(guildId, packet->guildVersion); + actor->SetGuildInfo(guildId, packet->guildVersion); } - } else if (guildId != 0 && !actor->Slot50()) { - actor->Slot49(guildId, packet->guildVersion); + } else if (guildId != 0 && !actor->GetGdid()) { + actor->SetGuildInfo(guildId, packet->guildVersion); } } @@ -14593,8 +14593,8 @@ void CGameMode::ReceiveActorStandEntryOld0(const unsigned char* data) { const int actorJob = actor->GetEffectiveJob(-1); if ((actorJob > 45 && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t emblem = (packet->accessory2 << 16) | packet->accessory3; - if (emblem > 0 && !actor->Slot50()) { - actor->Slot49(emblem, packet->shield); + if (emblem > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(emblem, packet->shield); } } if (entry.unknown_0024 == 0x2E) { @@ -14638,7 +14638,7 @@ void CGameMode::ReceiveActorStandEntryOld0(const unsigned char* data) { if ((actorJob >= 45 && actorJob < 1000) || (actorJob > 1000 && actorJob < 3999) || static_cast(actorJob - 20021) <= 11978) { const std::uint32_t emblem = (packet->accessory2 << 16) | packet->accessory3; if (emblem > 0) { - actor->Slot49(emblem, packet->shield); + actor->SetGuildInfo(emblem, packet->shield); } } if (isPc && !IsAdminAccount(packet->aid) && !StateFlag06(packet->effectState)) { @@ -14792,10 +14792,10 @@ void CGameMode::ReceiveActorStateEntryNamedOld(const unsigned char* data) { const int guildId = (packet->accessory2 << 16) | packet->accessory3; if (created) { if (guildId != 0) { - actor->Slot49(guildId, packet->guildVersion); + actor->SetGuildInfo(guildId, packet->guildVersion); } - } else if (guildId != 0 && !actor->Slot50()) { - actor->Slot49(guildId, packet->guildVersion); + } else if (guildId != 0 && !actor->GetGdid()) { + actor->SetGuildInfo(guildId, packet->guildVersion); } } @@ -15026,7 +15026,7 @@ void CGameMode::SpawnStandingActor( if (g_session.IsPetAid(aid)) { g_session.unknown_1038 = entry.unknown_0030; } - if (entry.unknown_0030 && !actor->Slot50()) { + if (entry.unknown_0030 && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.unknown_0030)); } } else if (objectType == 8 && g_session.IsHomunAid(aid)) { @@ -15060,8 +15060,8 @@ void CGameMode::SpawnStandingActor( if (objectType != 0) { const std::uint32_t emblemGuildId = (accessory2 << 16) | accessory3; - if (emblemGuildId > 0 && !actor->Slot50()) { - actor->Slot49(emblemGuildId, guildVersion); + if (emblemGuildId > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(emblemGuildId, guildVersion); } this->ApplyActorStatusEffects(aid, effectState, level, virtue); } else { @@ -15307,7 +15307,7 @@ void CGameMode::SpawnStateActor( if (g_session.IsPetAid(aid)) { g_session.unknown_1038 = entry.unknown_0030; } - if (entry.unknown_0030 && !actor->Slot50()) { + if (entry.unknown_0030 && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.unknown_0030)); } } else if (objectType == 8 && g_session.IsHomunAid(aid)) { @@ -15340,7 +15340,7 @@ void CGameMode::SpawnStateActor( } if (objectType != 0 && job == 0x2D2) { - actor->Slot49(actor->Slot50(), guildVersion); + actor->SetGuildInfo(actor->GetGdid(), guildVersion); this->ApplyActorStatusEffects(aid, effectState, level, virtue); } else { this->ApplyActorStatusEffects(aid, effectState, level, virtue); @@ -15769,7 +15769,7 @@ void CGameMode::ReceiveActorStateEntryLegacy(const unsigned char* data) { if (g_session.IsPetAid(packet->aid)) { g_session.unknown_1038 = entry.unknown_0030; } - if (entry.unknown_0030 && !actor->Slot50()) { + if (entry.unknown_0030 && !actor->GetGdid()) { actor->SetActionName(ResourceMgr::Instance(), g_session.GetPetAccActName(entry.unknown_0030)); } } else if (packet->objectType == 8 && g_session.IsHomunAid(packet->aid)) { @@ -15803,8 +15803,8 @@ void CGameMode::ReceiveActorStateEntryLegacy(const unsigned char* data) { if (packet->objectType != 0) { const std::uint32_t guildId = (packet->accessory2 << 16) | packet->accessory3; - if (guildId > 0 && !actor->Slot50()) { - actor->Slot49(guildId, packet->guildVersion); + if (guildId > 0 && !actor->GetGdid()) { + actor->SetGuildInfo(guildId, packet->guildVersion); } } this->ApplyActorStatusEffects(packet->aid, packet->effectState, packet->level, packet->virtue); @@ -16105,13 +16105,13 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s if (primaryEffects.find(key) != primaryEffects.end()) { effect = g_effectMgr->Spawn(actor->render.accountId, static_cast(primaryEffects[key]), position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } } if (secondaryEffects.find(key) != secondaryEffects.end()) { effect = g_effectMgr->Spawn(actor->render.accountId, static_cast(secondaryEffects[key]), position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } } return; @@ -16119,7 +16119,7 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s case 0x7D6: effect = g_effectMgr->Spawn(actor->render.accountId, 0x65A, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x7F0: @@ -16132,87 +16132,87 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x5A0, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x597, origin.x, origin.y, origin.z, 0, -1, 0, 0); } else { effect = g_effectMgr->Spawn(actor->render.accountId, 0x4FD, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x4ED, origin.x, origin.y, origin.z, 0, -1, 0, 0); } if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8A5: if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x600, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x603, origin.x, origin.y, origin.z, 0, -1, 0, 0); } else { effect = g_effectMgr->Spawn(actor->render.accountId, 0x587, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x58D, origin.x, origin.y, origin.z, 0, -1, 0, 0); } if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x89C: effect = g_effectMgr->Spawn(actor->render.accountId, g_serviceOptions.Get(0xE5) ? 0x607 : 0x5A6, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8A4: effect = g_effectMgr->Spawn(actor->render.accountId, 0x610, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x804: effect = g_effectMgr->Spawn(actor->render.accountId, 0x617, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x89A: effect = g_effectMgr->Spawn(actor->render.accountId, 0x633, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x634, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x7F6: effect = g_effectMgr->Spawn(actor->render.accountId, 0x65D, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x65E, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8A6: g_effectMgr->Spawn(actor->render.accountId, 0x663, origin.x, origin.y, origin.z, 0, -1, 0, 0); effect = g_effectMgr->Spawn(actor->render.accountId, 0x664, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8BC: effect = g_effectMgr->Spawn(actor->render.accountId, 0x671, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8D5: { @@ -16268,7 +16268,7 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s position.y = static_cast(g_modeMgr.GetGameMode())->scene->terrain->Height(position.x, position.z); effect = g_effectMgr->Spawn(0, g_serviceOptions.Get(0xE5) ? 0x5AC : 0x504, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; } @@ -16279,7 +16279,7 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s position.y = static_cast(g_modeMgr.GetGameMode())->scene->terrain->Height(position.x, position.z); effect = g_effectMgr->Spawn(0, g_serviceOptions.Get(0xE5) ? 0x5B0 : 0x50A, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; } @@ -16287,41 +16287,41 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s if (g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x5DB, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x5DC, origin.x, origin.y, origin.z, 0, -1, 0, 0); } else { effect = g_effectMgr->Spawn(actor->render.accountId, 0x58E, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x58F, origin.x, origin.y, origin.z, 0, -1, 0, 0); } if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x2E1: case 0x911: effect = g_effectMgr->Spawn(actor->render.accountId, 0x591, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x592, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x996: if (!g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x61B, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } } effect = g_effectMgr->Spawn(actor->render.accountId, 0x61C, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x8FE: @@ -16330,271 +16330,271 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s case 0x927: effect = g_effectMgr->Spawn(actor->render.accountId, 0x625, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x9D5: effect = g_effectMgr->Spawn(actor->render.accountId, 0x62A, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x62B, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x96D: effect = g_effectMgr->Spawn(actor->render.accountId, 0x62D, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x62E, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x9B2: effect = g_effectMgr->Spawn(actor->render.accountId, 0x654, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } if (g_serviceOptions.Get(0xE5)) { return; } effect = g_effectMgr->Spawn(actor->render.accountId, 0x655, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x9BC: effect = g_effectMgr->Spawn(actor->render.accountId, 0x669, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x97D: effect = g_effectMgr->Spawn(actor->render.accountId, 0x66A, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x66B, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x90D: effect = g_effectMgr->Spawn(actor->render.accountId, 0x697, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } if (g_serviceOptions.Get(0xE5)) { return; } effect = g_effectMgr->Spawn(actor->render.accountId, 0x698, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x145E: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6CA, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6CB, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x145F: case 0x1472: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6C6, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6C7, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); effect->AddEvent(0, "effect\\EF_BeginSpell.wav", 0, 0); } return; case 0x1464: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6CE, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6CF, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1471: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6D3, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6D4, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1460: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6D9, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6DA, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1473: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6DD, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6DE, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1462: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6E1, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6E2, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x146E: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6E9, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6EA, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1461: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6ED, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6EE, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x146B: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6F2, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6F3, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1475: effect = g_effectMgr->Spawn(actor->render.accountId, 0x6F6, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x6F7, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1470: g_effectMgr->Spawn(actor->render.accountId, 0x70A, origin.x, origin.y, origin.z, 0, -1, 0, 0); effect = g_effectMgr->Spawn(actor->render.accountId, 0x70B, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(200); - effect->Slot14(delay - 200); + effect->SetDelay(200); + effect->SetLifeTime(delay - 200); } return; case 0x146D: effect = g_effectMgr->Spawn(actor->render.accountId, 0x70D, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x70E, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1466: effect = g_effectMgr->Spawn(actor->render.accountId, 0x704, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x705, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x147E: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7B8, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x147F: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7BB, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1486: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7BF, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1495: effect = g_effectMgr->Spawn(actor->render.accountId, 0x711, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1497: effect = g_effectMgr->Spawn(actor->render.accountId, 0x714, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1498: effect = g_effectMgr->Spawn(actor->render.accountId, 0x716, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x149B: effect = g_effectMgr->Spawn(actor->render.accountId, 0x718, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1499: effect = g_effectMgr->Spawn(actor->render.accountId, 0x71F, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } if (g_serviceOptions.Get(0xE5)) { return; } effect = g_effectMgr->Spawn(actor->render.accountId, 0x71E, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x149E: { if (!g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x73B, actor->render.position.x, actor->render.position.y, actor->render.position.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } } @@ -16617,181 +16617,181 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s case 0x1469: effect = g_effectMgr->Spawn(actor->render.accountId, 0x740, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x741, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14B8: effect = g_effectMgr->Spawn(actor->render.accountId, 0x76D, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14A1: effect = g_effectMgr->Spawn(actor->render.accountId, 0x745, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14D7: effect = g_effectMgr->Spawn(actor->render.accountId, 0x781, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14D3: effect = g_effectMgr->Spawn(actor->render.accountId, 0x751, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14D5: effect = g_effectMgr->Spawn(actor->render.accountId, 0x755, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14D4: effect = g_effectMgr->Spawn(actor->render.accountId, 0x758, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x759, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14C6: effect = g_effectMgr->Spawn(actor->render.accountId, 0x84F, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x850, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14A2: if (!g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x760, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } } effect = g_effectMgr->Spawn(actor->render.accountId, 0x761, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x149F: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7A6, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14A0: if (!g_serviceOptions.Get(0xE5)) { effect = g_effectMgr->Spawn(actor->render.accountId, 0x785, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } } effect = g_effectMgr->Spawn(actor->render.accountId, 0x786, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1465: effect = g_effectMgr->Spawn(actor->render.accountId, 0x762, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x763, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14B9: effect = g_effectMgr->Spawn(actor->render.accountId, 0x774, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14B6: effect = g_effectMgr->Spawn(actor->render.accountId, 0x78F, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14B7: effect = g_effectMgr->Spawn(actor->render.accountId, 0x77C, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14D1: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7B1, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14F8: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7C9, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x7CA, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14F7: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7D4, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x7D5, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1503: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7DA, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x7DB, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14C4: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7DE, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x7DF, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x1500: effect = g_effectMgr->Spawn(actor->render.accountId, 0x7E5, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x7E6, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } return; case 0x14F3: effect = g_effectMgr->Spawn(actor->render.accountId, 0x81C, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay); + effect->SetLifeTime(delay); } effect = g_effectMgr->Spawn(actor->render.accountId, 0x81D, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { @@ -16801,13 +16801,13 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s case 0x14F1: effect = g_effectMgr->Spawn(actor->render.accountId, 0x84B, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay + 50); + effect->SetLifeTime(delay + 50); } return; case 0x1F79: effect = g_effectMgr->Spawn(actor->render.accountId, 0x91D, origin.x, origin.y, origin.z, 0, -1, 0, 0); if (effect) { - effect->Slot14(delay + 50); + effect->SetLifeTime(delay + 50); } return; } @@ -16825,7 +16825,7 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t int action = -1; if (source != nullptr) { if (skillId == 0xF9 || skillId == 0x201C) { - source->Slot15(2, 1); + source->SetState(2, 1); } if (g_session.IsMonsterActor(source) == 0 && skillId != 9) { if (skillId == 0x14E || skillId == 0x14F) { @@ -16862,15 +16862,15 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t int motion; g_session.GetSkillActionInfo2(skillId, effectId, motion); if (source->render.unknown_0070 != 1 && motion == 1) { - source->Slot15(7, motion); + source->SetState(7, motion); } else { if (motion == 2 || motion == 9) { source->SendMsg(nullptr, 0x51, 0, targetAid, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); if (CSkillActionMgr::GetInstance()->ActionSlot06(skillId)) { - source->Slot59(true); + source->SetArrowEffectSuppressed(true); } } - source->Slot15(motion, 1); + source->SetState(motion, 1); } break; } @@ -17003,7 +17003,7 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t case 0x3D: if (source != nullptr) { source->SendMsg(nullptr, 0x52, 0, level * 400, (level * 400) >> 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - source->Slot15(13, 1); + source->SetState(13, 1); if (sourceAid != g_session.m_aid) { source->SendMsg(nullptr, 0x53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } @@ -18526,7 +18526,7 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t const std::uint32_t accountId = target->render.accountId; CEffect* effect = g_effectMgr->Spawn(accountId, 0x54D, source->render.position.x, source->render.position.y, source->render.position.z, accountId, -1, 0, 0); if (effect) { - effect->Slot16(200); + effect->SetDelay(200); } g_soundMgr->PlayWave("effect\\mon_침투경.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); } @@ -18936,11 +18936,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t } CEffect* effect = g_effectMgr->Spawn(0, 0x6AA, source->render.position.x, source->render.position.y, source->render.position.z, 0, -1, 0, 0); if (effect) { - effect->Slot22(scale); + effect->SetScale(scale); } effect = g_effectMgr->Spawn(0, 0x6AB, position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot22(scale); + effect->SetScale(scale); } } break; @@ -19257,11 +19257,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t g_effectMgr->Spawn(source->render.accountId, 0x6BB, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(target->render.accountId, 0x6BC, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(100); + effect->SetDelay(100); } effect = g_effectMgr->Spawn(target->render.accountId, 0x6BD, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(100); + effect->SetDelay(100); } } break; @@ -19311,7 +19311,7 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t g_effectMgr->Spawn(source->render.accountId, 0x7B9, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x7B7, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(1000); + effect->SetDelay(1000); } } break; @@ -19321,11 +19321,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t g_effectMgr->Spawn(source->render.accountId, 0x7BC, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x7BA, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(1000); + effect->SetDelay(1000); } effect = g_effectMgr->Spawn(source->render.accountId, 0x7BD, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(1000); + effect->SetDelay(1000); } } break; @@ -19335,11 +19335,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t g_effectMgr->Spawn(source->render.accountId, 0x7C0, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x7BE, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(1000); + effect->SetDelay(1000); } effect = g_effectMgr->Spawn(source->render.accountId, 0x7C1, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(1000); + effect->SetDelay(1000); } } break; @@ -19493,11 +19493,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t g_effectMgr->Spawn(targetAid, 0x71B, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(targetAid, 0x71C, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(500); + effect->SetDelay(500); } effect = g_effectMgr->Spawn(targetAid, 0x719, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(1430); + effect->SetDelay(1430); } break; } @@ -19516,11 +19516,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t if (source != nullptr) { CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x794, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot22(scale); + effect->SetScale(scale); } effect = g_effectMgr->Spawn(source->render.accountId, 0x795, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot22(scale); + effect->SetScale(scale); } g_effectMgr->Spawn( source->render.accountId, source->render.previousAnimation - source->render.animation + 0x796, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 @@ -19536,11 +19536,11 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t if (target != nullptr) { CEffect* effect = g_effectMgr->Spawn(target->render.accountId, 0x823, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(500); + effect->SetDelay(500); } effect = g_effectMgr->Spawn(target->render.accountId, 0x824, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(500); + effect->SetDelay(500); } } break; @@ -19552,18 +19552,18 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t g_effectMgr->Spawn(source->render.accountId, 0x728, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x729, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(500); + effect->SetDelay(500); } effect = g_effectMgr->Spawn(source->render.accountId, 0x72A, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(500); + effect->SetDelay(500); effect->AddEvent(0, "effect\\CD_REPARATIO1.wav", 0x1F, 0); } } if (target != nullptr) { CEffect* effect = g_effectMgr->Spawn(target->render.accountId, 0x72B, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(800); + effect->SetDelay(800); effect->AddEvent(0, "effect\\CD_REPARATIO2.wav", 0x32, 0); } } @@ -19573,7 +19573,7 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t if (source != nullptr) { CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 0x784, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot16(400); + effect->SetDelay(400); } if (target != nullptr) { if (source->render.accountId != target->render.accountId) { @@ -19651,7 +19651,7 @@ void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t case 0x14C2: if (source != nullptr) { g_effectMgr->Spawn(source->render.accountId, 0x7AE, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); - source->Slot15(2, 1); + source->SetState(2, 1); } break; case 0x14D1: @@ -22657,7 +22657,7 @@ void CGameMode::ProcessIncomingPackets() { const int version = *reinterpret_cast(packet + 8); g_session.StoreEmblem(packet + 0x0C, *reinterpret_cast(packet + 2) - 12, guildId, version); if (g_guildInfo.m_guildId == guildId) { - this->scene->player->Slot49(guildId, version); + this->scene->player->SetGuildInfo(guildId, version); if (g_windowMgr.window_0320) { g_windowMgr.window_0320->SendMsg(nullptr, 60, 0, 0, 0, 0); } @@ -22768,7 +22768,7 @@ void CGameMode::ProcessIncomingPackets() { g_guildInfo.m_guildId = guildId; g_guildInfo.unknown_00B0 = (flags >> 4) & 1; g_guildInfo.unknown_00B4 = packet[0x0E]; - this->scene->player->Slot49(guildId, *reinterpret_cast(packet + 6)); + this->scene->player->SetGuildInfo(guildId, *reinterpret_cast(packet + 6)); if (g_guildInfo.unknown_00C8 == 0) { g_guildInfo.unknown_00C8 = 1; g_modeMgr.gameMode->SendMsg(107, 3, 0, 0, 0); @@ -23034,7 +23034,7 @@ void CGameMode::ProcessIncomingPackets() { case 0x1AB: if (CGameActor *actor = static_cast(this->scene->GetGameActorByAID(*reinterpret_cast(g_gameModePacketBuffer + 2)))) { if (*reinterpret_cast(g_gameModePacketBuffer + 6) == 4) { - actor->Slot40(*reinterpret_cast(g_gameModePacketBuffer + 8)); + actor->SetHonor(*reinterpret_cast(g_gameModePacketBuffer + 8)); } } break; @@ -23066,7 +23066,7 @@ void CGameMode::ProcessIncomingPackets() { } case 0x1B0: if (CGameActor *actor = static_cast(this->scene->GetGameActorByAID(*reinterpret_cast(g_gameModePacketBuffer + 2)))) { - actor->Slot18(*reinterpret_cast(g_gameModePacketBuffer + 7), 0, 0); + actor->SetSprAct(*reinterpret_cast(g_gameModePacketBuffer + 7), 0, 0); } break; case 0x1B1: { @@ -23111,7 +23111,7 @@ void CGameMode::ProcessIncomingPackets() { } case 0x1B4: if (CGameActor *actor = static_cast(this->scene->GetGameActorByAID(*reinterpret_cast(g_gameModePacketBuffer + 2)))) { - actor->Slot49(*reinterpret_cast(g_gameModePacketBuffer + 6), *reinterpret_cast(g_gameModePacketBuffer + 0xA)); + actor->SetGuildInfo(*reinterpret_cast(g_gameModePacketBuffer + 6), *reinterpret_cast(g_gameModePacketBuffer + 0xA)); } break; case 0x1C2: { @@ -23689,7 +23689,7 @@ void CGameMode::ProcessIncomingPackets() { if (CPlayer *player = this->scene->player) { player->SendMsg(nullptr, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); if (*reinterpret_cast(&player->render.unknown_0060) == 8) { - player->Slot15(0, 1); + player->SetState(0, 1); } } break; @@ -23700,7 +23700,7 @@ void CGameMode::ProcessIncomingPackets() { g_guildInfo.m_guildId = *reinterpret_cast(g_gameModePacketBuffer + 2); g_guildInfo.unknown_00B0 = (flags >> 4) & 1; g_guildInfo.unknown_00D0 = *reinterpret_cast(g_gameModePacketBuffer + 0x2B); - this->scene->player->Slot49(*reinterpret_cast(g_gameModePacketBuffer + 2), *reinterpret_cast(g_gameModePacketBuffer + 6)); + this->scene->player->SetGuildInfo(*reinterpret_cast(g_gameModePacketBuffer + 2), *reinterpret_cast(g_gameModePacketBuffer + 6)); if (!g_guildInfo.unknown_00C8) { g_guildInfo.unknown_00C8 = 1; g_modeMgr.gameMode->SendMsg(107, 3, 0, 0, 0); diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp index c3c8a2e14..475c8664d 100644 --- a/Source/Client/Mode/LoginMode.cpp +++ b/Source/Client/Mode/LoginMode.cpp @@ -981,7 +981,7 @@ void CLoginMode::End() { // OFFSET: 0x00D975C0 // FUNCTION: fn_22301 -void CLoginMode::Slot5(int value) { +void CLoginMode::OnUpdateEx(int value) { if (value != 0) { GetRagConnection().UpdateStatus(); } else if (this->running == 0 || g_modalImmediate != 0) { @@ -1527,7 +1527,7 @@ int CLoginMode::Run() { this->cursorType = this->pendingCursorType; this->cursorFrame = 0; this->pendingCursorType = -1; - this->Slot7(this->cursorType); + this->OnChangeState(this->cursorType); } } @@ -1804,7 +1804,7 @@ void CLoginMode::Initialize(const char* name) { this->cursorType = g_loginStartMode; this->cursorFrame = 0; this->pendingCursorType = -1; - this->Slot7(g_loginStartMode); + this->OnChangeState(g_loginStartMode); g_loginStartMode = 3; g_isStopByLogin = 1; g_session.ClearItemContainers(); @@ -3635,7 +3635,7 @@ void __stdcall LoadCustomServerList(CLoginMode* mode) { // OFFSET: 0x00D93B20 // FUNCTION: fn_22297 -void CLoginMode::Slot7(int value) { +void CLoginMode::OnChangeState(int value) { this->otpStarted = timeGetTime(); g_windowMgr.Shutdown(); this->tooltip = nullptr; diff --git a/Source/Client/Mode/ModeMgr.cpp b/Source/Client/Mode/ModeMgr.cpp index 59fdc6a10..89671d1c4 100644 --- a/Source/Client/Mode/ModeMgr.cpp +++ b/Source/Client/Mode/ModeMgr.cpp @@ -50,7 +50,7 @@ void CModeMgr::Run(int mode, const char* name) { // OFFSET: 0x00AD66D0 // FUNCTION: fn_17835 -void CMode::Slot7(int) { +void CMode::OnChangeState(int) { } // OFFSET: 0x00AD66E0 @@ -65,7 +65,7 @@ void CMode::Initialize(const char*) { // OFFSET: 0x00AD6700 // FUNCTION: fn_17838 -void CMode::Slot5(int) { +void CMode::OnUpdateEx(int) { } // OFFSET: 0x00AD6720 diff --git a/Source/Client/SessionPredicates.cpp b/Source/Client/SessionPredicates.cpp index 44575353a..827277230 100644 --- a/Source/Client/SessionPredicates.cpp +++ b/Source/Client/SessionPredicates.cpp @@ -77,7 +77,7 @@ int CSession::IsLocalPlayerAid(std::uint32_t aid) const { } CPlayer* player = static_cast(g_modeMgr.GetGameMode())->scene->player; - if (player && aid == static_cast(player->Slot50())) { + if (player && aid == static_cast(player->GetGdid())) { return 1; } return 0; diff --git a/Source/Contents/ActorGeometry.cpp b/Source/Contents/ActorGeometry.cpp index caf58161e..0a775cb8f 100644 --- a/Source/Contents/ActorGeometry.cpp +++ b/Source/Contents/ActorGeometry.cpp @@ -71,7 +71,7 @@ float CRenderObject::CalcDist(float x, float y, float z) const { // OFFSET: 0x00CA9770 // FUNCTION: fn_21011 -bool CRenderObject::Slot09( +bool CRenderObject::PrepareSprite( int unused, int layer, float scale, const SpriteFrameCell& cell, float x, float y, const float* position, float shift, float* bottomDepth, float* topDepth, const SpriteRleImage* image, SpriteQuad* quad, int* bounds, std::uint32_t* color, int offsetX, int offsetY, int flags ) { @@ -170,7 +170,7 @@ bool CRenderObject::Slot09( if (this->render.unknown_00B4 == 1 && g_serviceOptions.Get(0x77)) { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); GroundGeometry* ground = mode->scene->ground; - if (ground->Slot10()) { + if (ground->IsNewVer()) { int column = 0; int row = 0; mode->WorldCell(this->render.position.x, this->render.position.z, column, row); diff --git a/Source/Contents/Actors/GameActor.cpp b/Source/Contents/Actors/GameActor.cpp index 47d78a661..3f27e9e75 100644 --- a/Source/Contents/Actors/GameActor.cpp +++ b/Source/Contents/Actors/GameActor.cpp @@ -111,7 +111,7 @@ void CGameActor::ProcessDamageMessages() { // OFFSET: 0x00CB2040 // FUNCTION: fn_21100 -void CGameActor::Slot16() { +void CGameActor::RegisterPos() { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); int column; int row; @@ -122,7 +122,7 @@ void CGameActor::Slot16() { // OFFSET: 0x00CB0FD0 // FUNCTION: fn_21097 #pragma auto_inline(off) -bool CGameActor::Slot14() { +bool CGameActor::ProcessState() { if (static_cast(this->unknown_0278) > 0 && timeGetTime() > static_cast(this->unknown_0278)) { this->render.isMotionFreezed = false; this->unknown_0278 = 0; @@ -146,7 +146,7 @@ bool CGameActor::Slot14() { if (this->unknown_0178 == 0) { this->unknown_0178 = 1; if (g_session.IsPlayerJobId(this->GetEffectiveJob(-1)) != 0) { - if (IsJobWeaponAllowed(this->GetEffectiveJob(-1), this->unknown_0260, this->Slot35())) { + if (IsJobWeaponAllowed(this->GetEffectiveJob(-1), this->unknown_0260, this->GetWeapon())) { this->SetAction(0x58, 4, 1); } else { this->SetAction(0x50, 4, 1); @@ -159,17 +159,17 @@ bool CGameActor::Slot14() { if (timeGetTime() >= this->unknown_0280) { this->unknown_0178 = 0; this->render.isMotionFreezed = false; - this->Slot15(0, 1); + this->SetState(0, 1); this->SendMsg(nullptr, 0x53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } - this->Slot08(); + this->ProcessMotion(); this->unknown_0244 = timeGetTime(); this->unknown_0258 = serverTime; return true; case 0: if (this->render.unknown_006C == 1 && this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } else if (this->unknown_0314 == 7 && this->render.accountId == g_session.unknown_1010 && static_cast(this->unknown_027C) > 0 && timeGetTime() > static_cast(this->unknown_027C) + 3000) { if (rand() % 100 < 25) { @@ -182,7 +182,7 @@ bool CGameActor::Slot14() { } this->unknown_027C = 0; } - this->Slot08(); + this->ProcessMotion(); this->unknown_0244 = timeGetTime(); this->unknown_0258 = serverTime; return true; @@ -236,7 +236,7 @@ bool CGameActor::Slot14() { const float movedX = this->render.position.x - old.x; this->unknown_0240 += SquareRoot(movedX * movedX + (this->render.position.z - old.z) * (this->render.position.z - old.z)); if (this->unknown_0238 == 0) { - this->Slot36(); + this->ProcessMotionWithDist(); } if (this->unknown_023C != -1 || serverTime < nextTick) { if (previousIndex != this->unknown_023C) { @@ -254,7 +254,7 @@ bool CGameActor::Slot14() { this->render.position.x = destX; this->render.position.z = destZ; this->NotifyCellMove(&this->render.position.x, &this->render.position.z); - this->Slot15(0, 1); + this->SetState(0, 1); this->unknown_0238 = 0; this->render.isMotionFreezed = false; if (this->unknown_0184 != 0) { @@ -277,9 +277,9 @@ bool CGameActor::Slot14() { case 0x39: case 0x3A: case 0x3B: - this->Slot08(); + this->ProcessMotion(); if (this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } this->unknown_0244 = timeGetTime(); this->unknown_0258 = serverTime; @@ -287,7 +287,7 @@ bool CGameActor::Slot14() { case 8: this->unknown_0178 = 0; - this->Slot08(); + this->ProcessMotion(); { const int frames = static_cast(this->GetElapsedFrames()); if (this->hitTargetAid != 0) { @@ -307,9 +307,9 @@ bool CGameActor::Slot14() { case 7: case 0x2D: this->unknown_0178 = 0; - this->Slot08(); + this->ProcessMotion(); if (this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } this->unknown_0244 = timeGetTime(); this->unknown_0258 = serverTime; @@ -317,7 +317,7 @@ bool CGameActor::Slot14() { case 4: this->unknown_0178 = 0; - this->Slot08(); + this->ProcessMotion(); { const vector3d old = this->render.position; const float deltaX = this->unknown_02D0 - this->render.position.x; @@ -335,7 +335,7 @@ bool CGameActor::Slot14() { this->render.position.x = this->unknown_02D0; this->render.position.z = this->unknown_02D4; moved = 1; - this->Slot15(0, 1); + this->SetState(0, 1); } } break; @@ -346,13 +346,13 @@ bool CGameActor::Slot14() { this->render.unknown_00DC = 0; this->render.isMotionFreezed = false; this->unknown_0178 = 0; - this->Slot08(); + this->ProcessMotion(); if (this->render.isMotionFinished && this->unknown_02A8.size() == 0) { mode->SendMsg(0xD, static_cast(this->render.accountId), 0, 0, 0); const int job = this->GetEffectiveJob(-1); if ((job > 31 && job < 1000) || g_session.IsMonsterClass(job) || this->unknown_0314 == 9 || g_session.IsSkillIdInRange6001(job)) { - this->Slot38(); + this->MakeCorpse(); return false; } } @@ -396,7 +396,7 @@ bool CGameActor::Slot14() { case 0x33: case 0x37: this->unknown_0178 = 0; - this->Slot08(); + this->ProcessMotion(); this->unknown_0244 = timeGetTime(); this->unknown_0258 = serverTime; return true; @@ -482,7 +482,7 @@ void CGameActor::ResetState() { this->unknown_02B0 = 0; this->bodyState = 0; this->stateFlags = 0; - this->Slot47(0); + this->SetRiding(0); this->unknown_02C4 = 0; this->unknown_02C8 = 0; this->unknown_02DC = 0; @@ -585,7 +585,7 @@ void CGameActor::UpdateGaugePositions() { if (timeGetTime() > this->unknown_0280) { this->SendMsg(nullptr, 0x53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); if (this->render.unknown_0070 == 8) { - this->Slot15(0, 1); + this->SetState(0, 1); } } else { reinterpret_cast(this->unknown_0264[3])->Move( @@ -719,7 +719,7 @@ void CGameActor::UpdateHpGauge() { // OFFSET: 0x00CB0A90 // FUNCTION: fn_21095 -void CGameActor::Slot36() { +void CGameActor::ProcessMotionWithDist() { const int frames = static_cast(this->render.action->FrameCount(this->render.previousAnimation)); this->render.curMotion = static_cast(this->unknown_0240 * 0.37f * 4.0f / this->render.speed) % frames; } @@ -1155,11 +1155,11 @@ void __stdcall CreateHallucinationPc( pc->unknown_0260 = sex & 1; pc->SetActorJob(job); - pc->Slot22(head); - pc->Slot30(); - pc->Slot33(weapon); - pc->Slot34(shield); - pc->Slot44(bodyPalette, 0); + pc->SetSprHead(head); + pc->SetImfFileName(); + pc->SetBodyPalette(weapon); + pc->SetHeadPalette(shield); + pc->SetBodyCostume(bodyPalette, 0); CHalluPC* hallu = new CHalluPC(pc); hallu->render.position = *position; diff --git a/Source/Contents/Actors/GameActor.h b/Source/Contents/Actors/GameActor.h index ee8a823d3..187dd3c22 100644 --- a/Source/Contents/Actors/GameActor.h +++ b/Source/Contents/Actors/GameActor.h @@ -170,56 +170,56 @@ public: void SetRenderInfo(const float* bounds, float x, float y) override; void SetAction(unsigned animation, int motion, int repeat) override; - std::uint32_t Slot13() override; - virtual bool Slot14(); - virtual void Slot15(int first, int second); - virtual void Slot16(); - virtual void Slot17(); - virtual void Slot18(int first, int second, int third); - virtual void Slot19(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh); - virtual void Slot20(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh); - virtual void Slot21(int value); - virtual void Slot22(int value); - virtual void Slot23(int first, int second); - virtual void Slot24(int first, int second); - virtual void Slot25(int value); - virtual void Slot26(int value); - virtual void Slot27(int value); - virtual void Slot28(int value); - virtual void Slot29(int value) {} - virtual void Slot30(); - virtual void Slot31(); - virtual void Slot32(); - virtual void Slot33(int value); - virtual void Slot34(int value); - virtual std::int64_t Slot35(); - virtual void Slot36(); - virtual int Slot37(); - virtual void Slot38(); - virtual void Slot39(int value); - virtual void Slot40(int value); - virtual void Slot41(int first, int second); - virtual int Slot42(); - virtual void Slot43(int first, int second); - virtual void Slot44(int first, int second); - virtual int Slot45(); - virtual int Slot46(); - virtual void Slot47(unsigned char value); - virtual void Slot48(int value); - virtual void Slot49(int guildId, int version); - virtual int Slot50(); - virtual float* Slot51(int index); + std::uint32_t GetStateFlags() override; + virtual bool ProcessState(); + virtual void SetState(int first, int second); + virtual void RegisterPos(); + virtual void UnRegisterPos(); + virtual void SetSprAct(int first, int second, int third); + virtual void SetSprActFull(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh); + virtual void SetSprAct2(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh); + virtual void SetSprJob(int value); + virtual void SetSprHead(int value); + virtual void SetSprWeapon(int first, int second); + virtual void SetSprWeapon2(int first, int second); + virtual void SetSprAccessory(int value); + virtual void SetSprAccessory2(int value); + virtual void SetSprAccessory3(int value); + virtual void SetSprShield(int value); + virtual void SetSprShoe(int value) {} + virtual void SetImfFileName(); + virtual void SetHeadPaletteName(); + virtual void SetBodyPaletteName(); + virtual void SetBodyPalette(int value); + virtual void SetHeadPalette(int value); + virtual std::int64_t GetWeapon(); + virtual void ProcessMotionWithDist(); + virtual int GetAttackMotion(); + virtual void MakeCorpse(); + virtual void SetModifyFactorOfmotionSpeed(int value); + virtual void SetHonor(int value); + virtual void SetPropensityInfo(int first, int second); + virtual int GetPkState(); + virtual void SetSprRobe(int first, int second); + virtual void SetBodyCostume(int first, int second); + virtual int GetNpcLocationRadius(); + virtual int GetBodyCostume(); + virtual void SetRiding(unsigned char value); + virtual void SetGdid(int value); + virtual void SetGuildInfo(int guildId, int version); + virtual int GetGdid(); + virtual float* GetMsg2AI(int index); virtual void SetUnknown0318(const float* value, int index); - virtual float* Slot53(int index); + virtual float* GetResMsg2AI(int index); virtual void SetUnknown0330(const float* value, int index); - virtual int Slot55(); - virtual int Slot56(); - virtual void Slot57(int value); - virtual bool Slot58(); - virtual void Slot59(bool value); - virtual void Slot60(); + virtual int GetMonsterTransformJob(); + virtual int GetMadogearType(); + virtual void SetMadogearType(int value); + virtual bool IsArrowEffectSuppressed(); + virtual void SetArrowEffectSuppressed(bool value); + virtual void RefreshAccessory3(); virtual float* GetExtent(float* extent) const; - virtual void Slot62(int value); + virtual void SetSex(int value); void SetUnknown0305(unsigned char value, int extra); void RaiseUnknown03C8(int value); diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index d87431a42..b49ecdddb 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -307,7 +307,7 @@ void CRenderObject::DrawSprite(int argument, bool seasonal, float offset) { SpriteQuad quad; int box[4]; std::uint32_t color; - if (!static_cast(this)->Slot09( + if (!static_cast(this)->PrepareSprite( index, index, distanceScale, cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0 )) { continue; @@ -661,7 +661,7 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { SpriteQuad quad; int box[4]; std::uint32_t color; - if (!this->Slot09(index, index, distanceScale, cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, offsetX, offsetY, 0)) { + if (!this->PrepareSprite(index, index, distanceScale, cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, offsetX, offsetY, 0)) { continue; } @@ -926,12 +926,12 @@ void CGameActor::ApplyPendingUnknown0408() { } else { value = this->unknown_025C; } - this->Slot21(value); - this->Slot32(); + this->SetSprJob(value); + this->SetBodyPaletteName(); if (this->render.unknown_0070 != 3) { this->render.unknown_0070 = 0; - this->Slot15(0, 1); + this->SetState(0, 1); } } @@ -1451,14 +1451,14 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->unknown_03B0.push_back(effect); effect->SendMsg(this, 0x32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); this->unknown_037C[5] = reinterpret_cast(effect); - this->Slot15(10, 1); + this->SetState(10, 1); break; } case 70: if (this->unknown_037C[5] != 0) { reinterpret_cast(this->unknown_037C[5])->SendMsg(nullptr, 0x35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); this->unknown_037C[5] = 0; - this->Slot15(this->render.unknown_0074, 1); + this->SetState(this->render.unknown_0074, 1); } break; case 71: { @@ -1584,7 +1584,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->unknown_02B0 = 1; break; } - this->Slot15(3, 1); + this->SetState(3, 1); break; case 134: { if (this->unknown_037C[11] != 0) { @@ -1622,7 +1622,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, if (this->render.unknown_0070 == 3) { break; } - this->Slot15(3, 1); + this->SetState(3, 1); break; case 96: case 97: { @@ -1667,7 +1667,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, } if (attacker != nullptr) { job = attacker->GetEffectiveJob(-1); - weapon = attacker->Slot35(); + weapon = attacker->GetWeapon(); } if (id == 94) { @@ -1773,7 +1773,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, position.y -= static_cast(offsetY); } CEffect* effect = g_effectMgr->Spawn(0, 1567, position.x, position.y, position.z, 0, -1, 0, 0); - effect->Slot17(static_cast(std::max(rand() % 360, 0))); + effect->SetAngle(static_cast(std::max(rand() % 360, 0))); } else if (hitEffect == 2132) { const vector3d& playerPosition = static_cast(g_modeMgr.GetGameMode())->scene->player->render.position; g_soundMgr->PlayWave("effect\\ABC_DEFT_STAB2.wav", playerPosition.x - this->render.position.x, 0.0f, playerPosition.z - this->render.position.z, 250, 40, 1.0f, 0); @@ -1858,7 +1858,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, if (this->render.unknown_0070 != 3) { if (isPlayer) { if (this->render.unknown_0070 != 2 && id != 39 && id != 97) { - this->Slot15(4, 1); + this->SetState(4, 1); if (motionSpeed > 1.0f) { this->render.unknown_0060 = motionSpeed; } else { @@ -1867,7 +1867,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, } } else if (id != 39 && id != 97) { if (!g_session.IsMonsterActor(this) || !(motionSpeed < -0.00001f)) { - this->Slot15(4, 1); + this->SetState(4, 1); if (motionSpeed > 1.0f) { this->render.unknown_0060 = motionSpeed; } else { @@ -1886,9 +1886,9 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, break; } case 108: - this->Slot15(2, 1); - this->unknown_0378 = static_cast(this->Slot37()); - this->Slot16(); + this->SetState(2, 1); + this->unknown_0378 = static_cast(this->GetAttackMotion()); + this->RegisterPos(); this->render.unknown_008C = timeGetTime(); this->render.curMotion = 4; this->SetAnimationSpeed(1.0f); @@ -1962,8 +1962,8 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, *reinterpret_cast(this->unknown_0170) = entry->cellY; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); - this->Slot15(0, 1); - this->Slot49(entry->guildId, entry->guildVersion); + this->SetState(0, 1); + this->SetGuildInfo(entry->guildId, entry->guildVersion); break; } case 4: { @@ -1979,7 +1979,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, } this->render.accountId = entry->aid; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot18(entry->job, entry->unknown_0008, 0); + this->SetSprAct(entry->job, entry->unknown_0008, 0); mode->CellCenter(entry->cellX, entry->cellY, this->render.position.x, this->render.position.z); this->render.position.y = mode->scene->terrain->Height(this->render.position.x, this->render.position.z); @@ -2000,23 +2000,23 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, if (Replay::Instance().state == 6) { switch (entry->state) { case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } } else { - this->Slot15(0, 1); + this->SetState(0, 1); } this->unknown_02C8 = entry->unknown_0044; if (entry->job == 0x2D2 || entry->job == 0x508) { - this->Slot49(entry->guildId, entry->guildVersion); + this->SetGuildInfo(entry->guildId, entry->guildVersion); } - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); if ((static_cast(e) << 32 | static_cast(d)) == 1) { this->render.color = 0x44FFFFFF; } else if ((static_cast(e) << 32 | static_cast(d)) == 2 && !StateFlag06(entry->stateFlags)) { @@ -2039,11 +2039,11 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->render.accountId = entry->aid; entry->job = MountedJob(entry->job, entry->stateFlags); *reinterpret_cast(this->unknown_029C) = entry->unknown_002C; - this->Slot18(entry->job, entry->unknown_0008, 0); + this->SetSprAct(entry->job, entry->unknown_0008, 0); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->unknown_02C8 = entry->unknown_0048; - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); *reinterpret_cast(&this->unknown_0170[4]) = entry->speed; this->routeStartTick = entry->moveStartTick; CGameMode* gameMode = static_cast(g_modeMgr.GetGameMode()); @@ -2055,10 +2055,10 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { - this->Slot15(0, 1); + this->SetState(0, 1); } break; } @@ -2078,15 +2078,15 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->routeStartTick = entry->moveStartTick; entry->job = MountedJob(entry->job, entry->stateFlags); *reinterpret_cast(this->unknown_029C) = entry->unknown_002C; - this->Slot18(entry->job, entry->unknown_0008, 1); + this->SetSprAct(entry->job, entry->unknown_0008, 1); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->unknown_02C8 = entry->unknown_0048; - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } break; @@ -2097,10 +2097,10 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, if (this->FindRoute(route[1], route[2], route[3], route[4], route[5], route[6], *reinterpret_cast(&this->unknown_0170[4]))) { this->unknown_0158[5] = route[5]; *reinterpret_cast(this->unknown_0170) = route[6]; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { - this->Slot15(0, 1); + this->SetState(0, 1); } break; } @@ -2233,12 +2233,12 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, gameMode->CellCenter(b, d, this->render.position.x, this->render.position.z); this->render.position.y = gameMode->scene->terrain->Height(this->render.position.x, this->render.position.z); - this->Slot17(); + this->UnRegisterPos(); if (lying == true) { this->unknown_02D0 = this->render.position.x; this->unknown_02D4 = this->render.position.z; } - this->Slot15(1, lying); + this->SetState(1, lying); this->unknown_023C = 0; if (f == 0) { this->unknown_0238 = 1; @@ -2257,7 +2257,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, g_session.unknown_56A0 = 0; g_session.unknown_56A4 = 0; } - this->Slot15(0, lying); + this->SetState(0, lying); } break; } @@ -2271,7 +2271,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->render.isLieOnGround = false; this->render.unknown_00A4Bytes[1] = 1; static_cast(g_modeMgr.GetGameMode())->unknown_02CC = 0; - this->Slot15(0, 1); + this->SetState(0, 1); break; case 99: this->render.accountId = 0xFFFFFFFF; @@ -2796,7 +2796,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, case 0x1D: if (on) { this->unknown_017C = 1; - if (this->Slot55() > 0) { + if (this->GetMonsterTransformJob() > 0) { this->SetAction(0x20, 4, 1); } else { this->SetAction(this->WeaponActionBase(3), 4, 1); @@ -2807,7 +2807,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->render.unknown_0070 = 0; this->render.isLieOnGround = false; this->render.unknown_00A4Bytes[1] = 1; - this->Slot15(0, 1); + this->SetState(0, 1); this->render.isMotionFreezed = false; } break; @@ -3241,19 +3241,19 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, break; case 0x265: { if (this->render.unknown_0070 == 25) { - this->Slot15(0, 1); + this->SetState(0, 1); } int job; if ((static_cast(e) << 32 | static_cast(d)) > 0) { - this->Slot47(1); + this->SetRiding(1); job = this->GetEffectiveJob(-1); } else { - this->Slot47(0); + this->SetRiding(0); job = JobNames::BaseJob(this->GetEffectiveJob(-1)); } this->SetActorJob(job); - this->Slot33(this->render.unknown_0048); - this->Slot43(0, 1); + this->SetBodyPalette(this->render.unknown_0048); + this->SetSprRobe(0, 1); break; } case 0x26D: @@ -3582,10 +3582,10 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, case 0x358: g_session.unknown_6184 = g_session.m_aid == this->render.accountId ? f : g_session.unknown_6184; this->unknown_03DC = f; - this->Slot21(this->GetEffectiveJob(-1)); - this->Slot30(); - this->Slot31(); - this->Slot32(); + this->SetSprJob(this->GetEffectiveJob(-1)); + this->SetImfFileName(); + this->SetHeadPaletteName(); + this->SetBodyPaletteName(); break; case 0x35B: if ((static_cast(e) << 32 | static_cast(d)) != 0) { @@ -3626,23 +3626,23 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, break; case 0x3A5: if (on == true) { - this->Slot15(0x30, 1); + this->SetState(0x30, 1); this->render.isMotionFreezed = true; this->render.unknown_0114 = 1; } else { this->render.unknown_0070 = 0; this->render.isLieOnGround = false; this->render.unknown_00A4Bytes[1] = 1; - this->Slot15(0, 1); + this->SetState(0, 1); this->render.isMotionFreezed = false; this->render.unknown_0114 = 0; } break; case 0x37D: if (on == true) { - this->Slot15(0x2F, 1); + this->SetState(0x2F, 1); } else if (this->render.unknown_0114 == 0) { - this->Slot15(0, 1); + this->SetState(0, 1); } break; case 0x397: @@ -3861,19 +3861,19 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, } if ((static_cast(e) << 32 | static_cast(d)) == 1) { if ((static_cast(g) << 32 | static_cast(f)) == 2) { - target->Slot57(2); + target->SetMadogearType(2); if (this->render.accountId == g_session.m_aid) { g_session.unknown_8074 = 2; } } else { - target->Slot57(1); + target->SetMadogearType(1); if (this->render.accountId == g_session.m_aid) { g_session.unknown_8074 = 1; } } target->SendMsg(nullptr, 0x69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } else { - target->Slot57(0); + target->SetMadogearType(0); if (this->render.accountId == g_session.m_aid) { g_session.unknown_8074 = 0; } @@ -4069,10 +4069,10 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, CEffect* const second = g_effectMgr->Spawn(this->render.accountId, 0x803, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* const third = g_effectMgr->Spawn(this->render.accountId, 0x804, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (second) { - second->Slot16(1000); + second->SetDelay(1000); } if (third) { - third->Slot16(1000); + third->SetDelay(1000); } } else { g_effectMgr->Retire(this->render.accountId, 0x803); @@ -4086,10 +4086,10 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, CEffect* const second = g_effectMgr->Spawn(this->render.accountId, 0x81e, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* const third = g_effectMgr->Spawn(this->render.accountId, 0x81f, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (second) { - second->Slot16(1000); + second->SetDelay(1000); } if (third) { - third->Slot16(1000); + third->SetDelay(1000); } } else { g_effectMgr->Retire(this->render.accountId, 0x821); diff --git a/Source/Contents/Actors/GrannyGameActor.h b/Source/Contents/Actors/GrannyGameActor.h index ad244c865..9400637ca 100644 --- a/Source/Contents/Actors/GrannyGameActor.h +++ b/Source/Contents/Actors/GrannyGameActor.h @@ -25,16 +25,16 @@ class C3dGrannyGameActor : public CGameActor { public: explicit C3dGrannyGameActor(const char* name); void SetAction(unsigned animation, int motion, int repeat) override; - void Slot08() override; - void Slot36() override; - int Slot37() override; + void ProcessMotion() override; + void ProcessMotionWithDist() override; + int GetAttackMotion() override; void Unused6860(int value); void Unused7950(int value); - void Slot18(int job, int value, int unused) override; + void SetSprAct(int job, int value, int unused) override; void Render(int argument) override; void RenderLit(int argument, const GrannyActorLight& light); void RenderShadowed(int argument); - void Slot38() override; + void MakeCorpse() override; bool OnProcess() override; /* 0410 */ CTexture* emblemTexture; diff --git a/Source/Contents/Actors/MercenaryAI.cpp b/Source/Contents/Actors/MercenaryAI.cpp index 8cd24d51b..54067090e 100644 --- a/Source/Contents/Actors/MercenaryAI.cpp +++ b/Source/Contents/Actors/MercenaryAI.cpp @@ -64,7 +64,7 @@ bool IsLocalPlayerAid(std::uint32_t aid) { if (!player) { return false; } - return player->Slot50() == static_cast(aid); + return player->GetGdid() == static_cast(aid); } // INLINED @@ -102,7 +102,7 @@ int ClampTargetAttackRange(std::uint32_t aid, int distance) { static_cast(g_modeMgr.GetGameMode())->scene->GetGameActorByAID(*reinterpret_cast(&actor->unknown_0318[5])) ); if (target) { - return distance < target->Slot42() ? target->Slot42() : distance; + return distance < target->GetPkState() ? target->GetPkState() : distance; } } return distance; @@ -159,7 +159,7 @@ int CMercenaryAI::Process(std::uint32_t aid) { if (!actor->render.isMotionFinished) { return 0; } - actor->Slot15(0, 1); + actor->SetState(0, 1); } if (this->actionStarted == 0) { @@ -183,7 +183,7 @@ int CMercenaryAI::Process(std::uint32_t aid) { return 0; } } else if (GetTickCount() - this->actionStarted > this->actionDuration) { - actor->Slot15(0, 1); + actor->SetState(0, 1); if (this->kind == 0) { g_session.m_homunActionState = 0; } else if (this->kind == 1) { @@ -280,7 +280,7 @@ int AiHomunAttack(lua_State* state) { if (!actor || !targetActor) { return 0; } - if (StateFlag06(targetActor->Slot13()) || StateFlag01(targetActor->Slot13()) || StateFlag02(targetActor->Slot13())) { + if (StateFlag06(targetActor->GetStateFlags()) || StateFlag01(targetActor->GetStateFlags()) || StateFlag02(targetActor->GetStateFlags())) { return 0; } @@ -317,7 +317,7 @@ int AiMercenaryAttack(lua_State* state) { if (!actor || !targetActor) { return 0; } - if (StateFlag06(targetActor->Slot13()) || StateFlag01(targetActor->Slot13()) || StateFlag02(targetActor->Slot13())) { + if (StateFlag06(targetActor->GetStateFlags()) || StateFlag01(targetActor->GetStateFlags()) || StateFlag02(targetActor->GetStateFlags())) { return 0; } @@ -388,7 +388,7 @@ int AiHomunGetV(lua_State* state) { case 13: if (actor) { if (aid != g_session.m_aid) { - if (StateFlag06(actor->Slot13()) || StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag06(actor->GetStateFlags()) || StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { lua_pushnumber(state, -1.0); lua_pushnumber(state, -1.0); return 2; @@ -572,7 +572,7 @@ int AiMercenaryGetV(lua_State* state) { case 13: if (actor) { if (aid != g_session.m_aid) { - if (StateFlag06(actor->Slot13()) || StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag06(actor->GetStateFlags()) || StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { lua_pushnumber(state, -1.0); lua_pushnumber(state, -1.0); return 2; @@ -868,7 +868,7 @@ int AiGetMsg(lua_State* state) { return 0; } - AiMessage message = *reinterpret_cast(actor->Slot51(index)); + AiMessage message = *reinterpret_cast(actor->GetMsg2AI(index)); lua_newtable(state); lua_pushnumber(state, 1); lua_pushnumber(state, message.type); @@ -919,7 +919,7 @@ int AiGetResMsg(lua_State* state) { return 0; } - AiMessage message = *reinterpret_cast(actor->Slot53(index)); + AiMessage message = *reinterpret_cast(actor->GetResMsg2AI(index)); lua_newtable(state); lua_pushnumber(state, 1); lua_pushnumber(state, message.type); @@ -970,7 +970,7 @@ int AiIsMonster(lua_State* state) { result = 0.0; break; default: - if (StateFlag06(actor->Slot13()) || StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag06(actor->GetStateFlags()) || StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { result = 0.0; } else { result = 1.0; @@ -983,12 +983,12 @@ int AiIsMonster(lua_State* state) { if (world->unknown_0048 || world->unknown_0054) { ally = g_session.IsPartyMember(actor->render.accountId, true); } else if (world->unknown_004C) { - ally = g_session.IsLocalPlayerAid(actor->Slot50()) != 0; + ally = g_session.IsLocalPlayerAid(actor->GetGdid()) != 0; } else { ally = true; } if (!ally) { - if (StateFlag06(actor->Slot13()) || StateFlag01(actor->Slot13()) || StateFlag02(actor->Slot13())) { + if (StateFlag06(actor->GetStateFlags()) || StateFlag01(actor->GetStateFlags()) || StateFlag02(actor->GetStateFlags())) { result = 0.0; } else { result = 1.0; @@ -1122,7 +1122,7 @@ int AiSkillObject(lua_State* state) { } else { targetActor = static_cast(mode->scene->GetGameActorByAID(target)); if (targetActor) { - if (StateFlag06(targetActor->Slot13()) || StateFlag01(targetActor->Slot13()) || StateFlag02(targetActor->Slot13())) { + if (StateFlag06(targetActor->GetStateFlags()) || StateFlag01(targetActor->GetStateFlags()) || StateFlag02(targetActor->GetStateFlags())) { return 0; } } diff --git a/Source/Contents/Actors/Npc.h b/Source/Contents/Actors/Npc.h index 1374d1467..c9d5ad275 100644 --- a/Source/Contents/Actors/Npc.h +++ b/Source/Contents/Actors/Npc.h @@ -17,15 +17,15 @@ public: CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m ) override; void Render(int argument) override; - void Slot15(int state, int unused) override; - void Slot16() override; - void Slot17() override; - void Slot18(int job, int value, int unused) override; - void Slot21(int value) override; - void Slot22(int value) override; - void Slot23(int first, int second) override; - void Slot25(int value) override; - void Slot30() override; + void SetState(int state, int unused) override; + void RegisterPos() override; + void UnRegisterPos() override; + void SetSprAct(int job, int value, int unused) override; + void SetSprJob(int value) override; + void SetSprHead(int value) override; + void SetSprWeapon(int first, int second) override; + void SetSprAccessory(int value) override; + void SetImfFileName() override; void UpdateBubblePositions(); void UpdateMinimapMarker(); @@ -55,7 +55,7 @@ public: CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m ) override; void Render(int argument) override; - void Slot21(int value) override; + void SetSprJob(int value) override; /* 0440 */ CGameObject* unknown_0440; }; diff --git a/Source/Contents/Actors/Pc.h b/Source/Contents/Actors/Pc.h index 64ad8d21a..4eff66882 100644 --- a/Source/Contents/Actors/Pc.h +++ b/Source/Contents/Actors/Pc.h @@ -39,44 +39,44 @@ public: ) override; void Render(int argument) override; - bool Slot14() override; - void Slot15(int state, int resetPosition) override; - void Slot43(int first, int second) override; - void Slot19( + bool ProcessState() override; + void SetState(int state, int resetPosition) override; + void SetSprRobe(int first, int second) override; + void SetSprActFull( int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh ) override; - void Slot20( + void SetSprAct2( int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh ) override; - void Slot21(int job) override; - void Slot22(int value) override; - void Slot23(int first, int second) override; - void Slot24(int first, int second) override; - void Slot25(int value) override; - void Slot26(int value) override; - void Slot27(int value) override; - void Slot28(int value) override; - void Slot29(int value) override; - void Slot30() override; - void Slot31() override; - void Slot32() override; - void Slot33(int value) override; - void Slot34(int value) override; - std::int64_t Slot35() override; - void Slot39(int value) override; - void Slot40(int value) override; - void Slot41(int first, int second) override; - int Slot42() override; - void Slot44(int first, int second) override; - int Slot46() override; - void Slot47(unsigned char value) override; - int Slot55() override; - int Slot56() override; - void Slot57(int value) override; - bool Slot58() override; - void Slot59(bool value) override; - void Slot60() override; - void Slot62(int value) override; + void SetSprJob(int job) override; + void SetSprHead(int value) override; + void SetSprWeapon(int first, int second) override; + void SetSprWeapon2(int first, int second) override; + void SetSprAccessory(int value) override; + void SetSprAccessory2(int value) override; + void SetSprAccessory3(int value) override; + void SetSprShield(int value) override; + void SetSprShoe(int value) override; + void SetImfFileName() override; + void SetHeadPaletteName() override; + void SetBodyPaletteName() override; + void SetBodyPalette(int value) override; + void SetHeadPalette(int value) override; + std::int64_t GetWeapon() override; + void SetModifyFactorOfmotionSpeed(int value) override; + void SetHonor(int value) override; + void SetPropensityInfo(int first, int second) override; + int GetPkState() override; + void SetBodyCostume(int first, int second) override; + int GetBodyCostume() override; + void SetRiding(unsigned char value) override; + int GetMonsterTransformJob() override; + int GetMadogearType() override; + void SetMadogearType(int value) override; + bool IsArrowEffectSuppressed() override; + void SetArrowEffectSuppressed(bool value) override; + void RefreshAccessory3() override; + void SetSex(int value) override; void AddMsgEffect(CGameObject* effect); void RenderBodyOutline(int layer, const float* position, float x, float y, float distanceScale, float scale, float depth, std::uint32_t color); @@ -209,8 +209,8 @@ public: bool IsSpecialState(int state) const; void ReapplySkillEffects(); - void Slot16() override; - void Slot17() override; + void RegisterPos() override; + void UnRegisterPos() override; void RefreshEffect164(); void UpdateFootprints(int kind); void UpdateMsgEffect(bool show); @@ -218,7 +218,7 @@ public: float AdjustFollowDistance(CGameActor* target, float distance); void UpdatePendingAction(); void Initialize(); - void Slot15(int state, int resetPosition) override; + void SetState(int state, int resetPosition) override; /* 0510 */ int unknown_0510; /* 0514 */ int unknown_0514; @@ -260,25 +260,25 @@ public: ) override; void Render(int argument) override; void SetAction(unsigned animation, int motion, int repeat) override; - void Slot08() override; - bool Slot14() override; - void Slot15(int first, int second) override; - void Slot19(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) override; - void Slot20(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) override; - void Slot21(int value) override; - void Slot22(int value) override; - void Slot23(int first, int second) override; - void Slot24(int first, int second) override; - void Slot25(int value) override; - void Slot26(int value) override; - void Slot27(int value) override; - void Slot28(int value) override; - void Slot30() override; - void Slot31() override; - std::int64_t Slot35() override; - void Slot39(int value) override; - void Slot40(int value) override; - void Slot41(int first, int second) override; + void ProcessMotion() override; + bool ProcessState() override; + void SetState(int first, int second) override; + void SetSprActFull(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) override; + void SetSprAct2(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) override; + void SetSprJob(int value) override; + void SetSprHead(int value) override; + void SetSprWeapon(int first, int second) override; + void SetSprWeapon2(int first, int second) override; + void SetSprAccessory(int value) override; + void SetSprAccessory2(int value) override; + void SetSprAccessory3(int value) override; + void SetSprShield(int value) override; + void SetImfFileName() override; + void SetHeadPaletteName() override; + std::int64_t GetWeapon() override; + void SetModifyFactorOfmotionSpeed(int value) override; + void SetHonor(int value) override; + void SetPropensityInfo(int first, int second) override; void PlayMotion(int repeat); void ReleaseMeshes(); diff --git a/Source/Contents/Actors/Player.cpp b/Source/Contents/Actors/Player.cpp index 4c6923e81..f9f1d6235 100644 --- a/Source/Contents/Actors/Player.cpp +++ b/Source/Contents/Actors/Player.cpp @@ -213,7 +213,7 @@ void __stdcall fn_22664() { // OFFSET: 0x00DAFFA0 // FUNCTION: fn_22607 -void CPc::Slot44(int first, int second) { +void CPc::SetBodyCostume(int first, int second) { this->unknown_04D0 = first; if (static_cast(second) != 0) { int job; @@ -222,23 +222,23 @@ void CPc::Slot44(int first, int second) { } else { job = this->GetEffectiveJob(-1); } - this->Slot21(job); - this->Slot24(this->weapon, this->unknown_044C); - this->Slot32(); + this->SetSprJob(job); + this->SetSprWeapon2(this->weapon, this->unknown_044C); + this->SetBodyPaletteName(); } } // OFFSET: 0x00DB0000 // FUNCTION: fn_22608 -void CPc::Slot33(int value) { +void CPc::SetBodyPalette(int value) { this->render.unknown_0048 = value; this->render.unknown_0048 = g_session.GetBodyStyle(this->unknown_025C, this->render.unknown_0048, this->unknown_04D0); - this->Slot32(); + this->SetBodyPaletteName(); } // OFFSET: 0x00DB02A0 // FUNCTION: fn_22613 -void CGrannyPc::Slot31() { +void CGrannyPc::SetHeadPaletteName() { if (this->unknown_0438 != 0) { const std::string palName = g_session.GetHeadPalName(this->unknown_0434, this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0438); this->unknown_0460 = palName; @@ -247,7 +247,7 @@ void CGrannyPc::Slot31() { // OFFSET: 0x00DB0350 // FUNCTION: fn_22614 -void CPc::Slot31() { +void CPc::SetHeadPaletteName() { if (this->unknown_0444 != 0) { const std::string palName = g_session.GetHeadPalName(this->unknown_0440, this->unknown_04D4, this->unknown_0260, this->unknown_0444); this->unknown_0478 = palName; @@ -256,14 +256,14 @@ void CPc::Slot31() { // OFFSET: 0x00DB0280 // FUNCTION: fn_22612 -void CPc::Slot34(int value) { +void CPc::SetHeadPalette(int value) { this->unknown_0444 = value; - this->Slot31(); + this->SetHeadPaletteName(); } // OFFSET: 0x00DB0400 // FUNCTION: fn_22615 -void CGrannyPc::Slot40(int value) { +void CGrannyPc::SetHonor(int value) { if (value < 0) { const std::int64_t emotion = g_cashEmotionMgr->GetSpecialEmotion(CashEmotionSpecial::ChatProhibit); this->SendMsg(nullptr, 160, 0, 0, 0, static_cast(emotion), static_cast(emotion >> 32), 0, 0, 0, 0, 0, 0, 0, 0); @@ -275,7 +275,7 @@ void CGrannyPc::Slot40(int value) { // OFFSET: 0x00DB0480 // FUNCTION: fn_22616 -void CPc::Slot40(int value) { +void CPc::SetHonor(int value) { if (value < 0) { const std::int64_t emotion = g_cashEmotionMgr->GetSpecialEmotion(CashEmotionSpecial::ChatProhibit); this->SendMsg(nullptr, 160, 0, 0, 0, static_cast(emotion), static_cast(emotion >> 32), 0, 0, 0, 0, 0, 0, 0, 0); @@ -287,83 +287,83 @@ void CPc::Slot40(int value) { // OFFSET: 0x00DB0760 // FUNCTION: fn_22621 -void CGrannyPc::Slot41(int first, int second) { - this->Slot40(first); +void CGrannyPc::SetPropensityInfo(int first, int second) { + this->SetHonor(first); this->unknown_042C = second; } // OFFSET: 0x00DB0780 // FUNCTION: fn_22622 -void CPc::Slot41(int first, int second) { - this->Slot40(first); +void CPc::SetPropensityInfo(int first, int second) { + this->SetHonor(first); this->unknown_0434 = second; } // OFFSET: 0x00DB07C0 // FUNCTION: fn_22625 -void CPc::Slot47(unsigned char value) { +void CPc::SetRiding(unsigned char value) { this->unknown_02CC = value; - this->Slot28(this->unknown_045C); + this->SetSprShield(this->unknown_045C); } // OFFSET: 0x00DB07E0 // FUNCTION: fn_22626 -void CGrannyPc::Slot26(int value) { +void CGrannyPc::SetSprAccessory2(int value) { this->unknown_044C = value; } // OFFSET: 0x00DB09D0 // FUNCTION: fn_22628 -void CGrannyPc::Slot27(int value) { +void CGrannyPc::SetSprAccessory3(int value) { this->unknown_0450 = value; } // OFFSET: 0x00DB2660 // FUNCTION: fn_22644 -void CGrannyPc::Slot28(int) { +void CGrannyPc::SetSprShield(int) { this->GetEffectiveJob(-1); } // OFFSET: 0x00DB0B40 // FUNCTION: fn_22630 -void CGrannyPc::Slot25(int value) { +void CGrannyPc::SetSprAccessory(int value) { this->unknown_0448 = value; } // OFFSET: 0x00DB0CB0 // FUNCTION: fn_22632 -void CGrannyPc::Slot20(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int) { - this->Slot19(first, second, third, fourth, fifth, sixth, seventh, eighth, this->unknown_0454, ninth, tenth); +void CGrannyPc::SetSprAct2(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int) { + this->SetSprActFull(first, second, third, fourth, fifth, sixth, seventh, eighth, this->unknown_0454, ninth, tenth); } // OFFSET: 0x00DB1960 // FUNCTION: fn_22636 -void CPc::Slot60() { +void CPc::RefreshAccessory3() { if (this->unknown_0458 == 185) { - this->Slot27(185); + this->SetSprAccessory3(185); } } // OFFSET: 0x00DB1980 // FUNCTION: fn_22637 -void CGrannyPc::Slot22(int value) { +void CGrannyPc::SetSprHead(int value) { this->unknown_0434 = value; } // OFFSET: 0x00DB1AC0 // FUNCTION: fn_22639 -void CGrannyPc::Slot21(int value) { +void CGrannyPc::SetSprJob(int value) { this->render.unknown_0054 = g_session.GetNpcLocationRadius(value, false); } // OFFSET: 0x00DB2830 // FUNCTION: fn_22646 -void CGrannyPc::Slot24(int, int) { +void CGrannyPc::SetSprWeapon2(int, int) { } // OFFSET: 0x00DB3720 // FUNCTION: fn_22648 -void CGrannyPc::Slot23(int first, int second) { +void CGrannyPc::SetSprWeapon(int first, int second) { struct Slot23Pair { int first; int second; @@ -374,7 +374,7 @@ void CGrannyPc::Slot23(int first, int second) { // OFFSET: 0x00DB3C30 // FUNCTION: fn_22650 -void CGrannyPc::Slot15(int state, int resetPosition) { +void CGrannyPc::SetState(int state, int resetPosition) { const int current = this->render.unknown_0070; if (current == 3 || this->unknown_017C != 0) { return; @@ -390,12 +390,12 @@ void CGrannyPc::Slot15(int state, int resetPosition) { switch (state) { case 8: - this->Slot16(); + this->RegisterPos(); this->SetAction(0x60, 6, 1); this->render.isMotionFinished = true; break; case 6: - this->Slot16(); + this->RegisterPos(); this->SetAction(0x10, 4, 1); this->render.isMotionFinished = true; this->render.curMotion = this->unknown_0430; @@ -406,10 +406,10 @@ void CGrannyPc::Slot15(int state, int resetPosition) { this->render.isMotionFreezed = false; } this->unknown_0430 = 0; - CGameActor::Slot15(1, resetPosition); + CGameActor::SetState(1, resetPosition); break; case 0: - CGameActor::Slot15(0, resetPosition); + CGameActor::SetState(0, resetPosition); this->render.curMotion = this->unknown_0430; if (current == 4 || current == 2 || this->unknown_02C8 != 0 || current == 8) { this->SetAction(0x20, 4, 0); @@ -448,7 +448,7 @@ void CGrannyPc::Slot15(int state, int resetPosition) { this->GetEffectiveJob(-1), this->unknown_0260, (static_cast(this->unknown_0444) << 32) | static_cast(this->unknown_0440) ); - CGameActor::Slot15(weaponAllowed ? 9 : 2, resetPosition); + CGameActor::SetState(weaponAllowed ? 9 : 2, resetPosition); this->unknown_0378 = AttackMotionLength(this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0440, weaponAllowed); bool usesArrow = false; g_session.m_hotkeyScript->Call("IsItemUsingArrow", "d>b", this->unknown_0440, &usesArrow); @@ -468,7 +468,7 @@ void CGrannyPc::Slot15(int state, int resetPosition) { this->GetEffectiveJob(-1), this->unknown_0260, (static_cast(this->unknown_0444) << 32) | static_cast(this->unknown_0440) ); - CGameActor::Slot15(weaponAllowed ? 9 : 2, resetPosition); + CGameActor::SetState(weaponAllowed ? 9 : 2, resetPosition); this->unknown_0378 = AttackMotionLength(this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0440, weaponAllowed); if ((this->unknown_0440 == 14 && this->unknown_0444 == 0) || (this->unknown_0440 == 13 && this->unknown_0444 == 0)) { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); @@ -478,7 +478,7 @@ void CGrannyPc::Slot15(int state, int resetPosition) { break; } default: - CGameActor::Slot15(state, resetPosition); + CGameActor::SetState(state, resetPosition); if (this->render.unknown_0070 == 3) { this->PlayMotion(1); } @@ -492,7 +492,7 @@ void CGrannyPc::Slot15(int state, int resetPosition) { // OFFSET: 0x00DBA6C0 // FUNCTION: fn_22674 -void CPlayer::Slot17() { +void CPlayer::UnRegisterPos() { } // OFFSET: 0x00DB51E0 @@ -534,7 +534,7 @@ bool CPlayer::IsSpecialState(int state) const { // OFFSET: 0x00DB06C0 // FUNCTION: fn_22619 -void CGrannyPc::Slot39(int value) { +void CGrannyPc::SetModifyFactorOfmotionSpeed(int value) { if (this->unknown_0440 != 11 || this->unknown_0444 != 0) { value = value > g_maxMoveSpeed ? g_maxMoveSpeed : value; } @@ -545,7 +545,7 @@ void CGrannyPc::Slot39(int value) { // OFFSET: 0x00DB0710 // FUNCTION: fn_22620 -void CPc::Slot39(int value) { +void CPc::SetModifyFactorOfmotionSpeed(int value) { int weapon = this->weapon; int speed = value; @@ -568,7 +568,7 @@ __declspec(noinline) std::string GetBodyImfName(int job, int sex, int head, int // OFFSET: 0x00DB0500 // FUNCTION: fn_22617 -void CGrannyPc::Slot30() { +void CGrannyPc::SetImfFileName() { this->unknown_0410 = GetBodyImfName( this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0434, this->GetEffectiveJob(-1) ); @@ -576,7 +576,7 @@ void CGrannyPc::Slot30() { // OFFSET: 0x00DB05E0 // FUNCTION: fn_22618 -void CPc::Slot30() { +void CPc::SetImfFileName() { int job = this->GetEffectiveJob(-1); if (job >= 0x10CE && job <= 0x10E9 && this->unknown_02CC != 0) { @@ -669,7 +669,7 @@ void CPc::LoadEquipAction(int slot, const char* name) { } const int baseJob = JobNames::BaseJob(this->GetEffectiveJob(-1)); - const int costumeJob = this->Slot46(); + const int costumeJob = this->GetBodyCostume(); const std::string actionName = g_equipmentResourceMgr->GetBodyResourceName(0, baseJob, this->unknown_0260, costumeJob, 0); CActRes* action = static_cast(ResourceMgr::Instance().Load(actionName)); if (!action) { @@ -765,7 +765,7 @@ void CPc::LoadEquipSprites(const std::vector& names) { // OFFSET: 0x00DB23A0 // FUNCTION: fn_22643 -void CPc::Slot43(int first, int second) { +void CPc::SetSprRobe(int first, int second) { if (this->unknown_049C == first) { return; } @@ -806,9 +806,9 @@ void CPc::AddMsgEffect(CGameObject* effect) { // OFFSET: 0x00DA8180 // FUNCTION: fn_22564 -void CPc::Slot62(int value) { +void CPc::SetSex(int value) { this->SetUnknown0260(value); - this->Slot19( + this->SetSprActFull( this->unknown_04D4, this->unknown_0260, this->unknown_0440, this->weapon, this->unknown_044C, this->unknown_0450, this->unknown_0454, this->unknown_0458, this->unknown_045C, this->unknown_0444, this->render.unknown_0048 ); @@ -867,14 +867,14 @@ void CPc::RenderBodyOutline(int layer, const float* position, float x, float y, SpriteQuad quad; int box[4]; std::uint32_t quadColor; - if (this->Slot55() == JT_THANATOS) { - this->Slot09(index, index, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &quadColor, 0, 0, 0); + if (this->GetMonsterTransformJob() == JT_THANATOS) { + this->PrepareSprite(index, index, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &quadColor, 0, 0, 0); if (this->render.unknown_0070 == 0 && index == 1) { quad.bottomRhw = bottomRhw + 0.000008f; quad.topRhw = topRhw + 0.00008f; } } else { - this->Slot09(layer, layer, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &quadColor, 0, 0, 0); + this->PrepareSprite(layer, layer, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &quadColor, 0, 0, 0); if (g_cameraDistance >= 320.0f) { quad.bottomRhw = bottomRhw - 0.0000025f; quad.topRhw = topRhw - 0.0000025f; @@ -1064,7 +1064,7 @@ void CPc::ApplyLayerEffects( } short hover = 0; - if (StateFlag15(this->Slot13()) == true) { + if (StateFlag15(this->GetStateFlags()) == true) { hover = static_cast(this->HoverHeight()); } @@ -1177,11 +1177,11 @@ void CPc::ApplyLayerEffects( } if ((this->render.flags & 0x30000) == 0) { - this->Slot10(cell, box, shiftX, bottomRhw, topRhw, palette, image, 4.0f, hover); - this->Slot11(quad, cell, box, shiftX, bottomRhw, topRhw, palette, image, *blend, hover); + this->RenderBlur(cell, box, shiftX, bottomRhw, topRhw, palette, image, 4.0f, hover); + this->RenderAura(quad, cell, box, shiftX, bottomRhw, topRhw, palette, image, *blend, hover); } - this->Slot12(quad, box, shiftX, 11, 5); + this->ApplySpriteJitter(quad, box, shiftX, 11, 5); if ((this->render.flags & 0x10000) != 0) { const short level = this->render.unknown_00F4; @@ -1226,7 +1226,7 @@ void CPc::ApplyLayerEffects( // OFFSET: 0x00DB2840 // FUNCTION: fn_22647 -void CPc::Slot24(int first, int second) { +void CPc::SetSprWeapon2(int first, int second) { this->weapon = first; this->unknown_044C = second; @@ -1285,7 +1285,7 @@ void CPc::Slot24(int first, int second) { case JT_MADOGEAR_B: { std::string actName = g_session.GetWeaponEffectActName(viewJob, this->unknown_0260, 0, -1, 0, this->unknown_04D0); std::string sprName = g_session.GetWeaponEffectSprName(viewJob, this->unknown_0260, 0, -1, 0, this->unknown_04D0); - if (this->Slot56() == 2) { + if (this->GetMadogearType() == 2) { std::size_t pos = actName.rfind("마도기어_"); if (pos != std::string::npos) { actName.replace(pos, 9, "마도아머_", 9); @@ -1302,7 +1302,7 @@ void CPc::Slot24(int first, int second) { case JT_MEISTER_MADOGEAR: { std::string actName = g_session.GetWeaponEffectActName(viewJob, this->unknown_0260, 0, -1, 0, this->unknown_04D0); std::string sprName = g_session.GetWeaponEffectSprName(viewJob, this->unknown_0260, 0, -1, 0, this->unknown_04D0); - if (this->Slot56() == 2) { + if (this->GetMadogearType() == 2) { std::size_t pos = actName.rfind("MEISTER_MADOGEAR1"); if (pos != std::string::npos) { actName.replace(pos, 17, "MEISTER_MADOGEAR2", 17); @@ -1428,7 +1428,7 @@ void CPc::Slot24(int first, int second) { // OFFSET: 0x00DB3740 // FUNCTION: fn_22649 -void CPc::Slot23(int first, int second) { +void CPc::SetSprWeapon(int first, int second) { this->weapon = first; this->unknown_044C = second; @@ -1479,12 +1479,12 @@ void CPc::Slot23(int first, int second) { // OFFSET: 0x00DB99F0 // FUNCTION: fn_22671 -void CPlayer::Slot16() { +void CPlayer::RegisterPos() { } // OFFSET: 0x00DB07F0 // FUNCTION: fn_22627 -void CPc::Slot26(int value) { +void CPc::SetSprAccessory2(int value) { this->unknown_0454 = value; this->LoadEquipAction(3, g_session.GetAccessoryActName(this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0440, value).c_str()); this->LoadEquipSprite( @@ -1500,7 +1500,7 @@ void CPc::Slot26(int value) { // OFFSET: 0x00DB09E0 // FUNCTION: fn_22629 -void CPc::Slot27(int value) { +void CPc::SetSprAccessory3(int value) { this->unknown_0458 = value; this->LoadEquipAction(4, g_session.GetAccessoryActName(this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0440, value).c_str()); this->LoadEquipSprite( @@ -1510,7 +1510,7 @@ void CPc::Slot27(int value) { // OFFSET: 0x00DB0B50 // FUNCTION: fn_22631 -void CPc::Slot25(int value) { +void CPc::SetSprAccessory(int value) { this->unknown_0450 = value; this->LoadEquipAction(2, g_session.GetAccessoryActName(this->GetEffectiveJob(-1), this->unknown_0260, this->unknown_0440, value).c_str()); this->LoadEquipSprite( @@ -1520,7 +1520,7 @@ void CPc::Slot25(int value) { // OFFSET: 0x00DB1990 // FUNCTION: fn_22638 -void CPc::Slot22(int value) { +void CPc::SetSprHead(int value) { this->unknown_0440 = value; this->LoadEquipAction(1, g_session.GetHeadActName(this->unknown_04D4, this->unknown_0260, &this->unknown_0440).c_str()); this->LoadEquipSprite(1, g_session.GetHeadSprName(this->unknown_04D4, this->unknown_0260, &this->unknown_0440).c_str()); @@ -1651,8 +1651,8 @@ int GetSlotLayer(int slot) { // OFFSET: 0x00DAA610 // FUNCTION: fn_22574 -int CPc::Slot55() { - return CGameActor::Slot55(); +int CPc::GetMonsterTransformJob() { + return CGameActor::GetMonsterTransformJob(); } // OFFSET: 0x00DAAD80 @@ -1757,7 +1757,7 @@ CRes* CPc::GetEquipSprite(int slot) const { // OFFSET: 0x00DAB160 // FUNCTION: fn_22580 -std::int64_t CGrannyPc::Slot35() { +std::int64_t CGrannyPc::GetWeapon() { return *reinterpret_cast(&this->unknown_0440); } @@ -1862,7 +1862,7 @@ void CGrannyPc::UpdateAnimation(C3dGrannyModelRes* model) { // OFFSET: 0x00DAC030 // FUNCTION: fn_22591 -void CGrannyPc::Slot08() { +void CGrannyPc::ProcessMotion() { if (this->render.unknown_0070 == 2) { this->render.isMotionFinished = GrannyGetControlDurationLeft(this->controls[2]) < 0.1f; } else { @@ -1873,7 +1873,7 @@ void CGrannyPc::Slot08() { // OFFSET: 0x00DAB210 // FUNCTION: fn_22581 bool CPc::HasAppearanceOverride() { - return this->Slot55() > 0 || g_session.IsCostumeJob(this->GetEffectiveJob(-1)) != true && this->HasShapeShift(); + return this->GetMonsterTransformJob() > 0 || g_session.IsCostumeJob(this->GetEffectiveJob(-1)) != true && this->HasShapeShift(); } // OFFSET: 0x00DACF90 @@ -2022,14 +2022,14 @@ void CPc::DrawBody(int, int layer, const float* position, float x, float y, floa SpriteQuad quad; int box[4]; std::uint32_t color; - if (this->Slot55() == JT_THANATOS) { - this->Slot09(index, index, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0); + if (this->GetMonsterTransformJob() == JT_THANATOS) { + this->PrepareSprite(index, index, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0); if (this->render.unknown_0070 == 0 && index == 1) { quad.bottomRhw = bottomRhw + 0.000008f; quad.topRhw = topRhw + 0.00008f; } } else { - this->Slot09(layer, layer, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0); + this->PrepareSprite(layer, layer, distanceScale, *cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0); if (g_cameraDistance <= 320.0f) { quad.bottomRhw = bottomRhw - 0.0000025f; quad.topRhw = topRhw - 0.0000025f; @@ -2048,7 +2048,7 @@ void CPc::DrawBody(int, int layer, const float* position, float x, float y, floa int blend = this->blend; const std::uint32_t* palette = sprite->palette; - if (this->render.unknown_0048 != 0 && this->Slot55() < 0 && this->HasShapeShift() == true) { + if (this->render.unknown_0048 != 0 && this->GetMonsterTransformJob() < 0 && this->HasShapeShift() == true) { palette = static_cast(ResourceMgr::Instance().Load(this->render.name.c_str()))->palette; } @@ -2121,7 +2121,7 @@ void CPc::RenderOverlaySprite(const float* matrix, int) { SpriteQuad quad; int box[4]; std::uint32_t color; - if (!this->Slot09(0, count, distanceScale, cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0)) { + if (!this->PrepareSprite(0, count, distanceScale, cell, x, y, position, scale, &bottomRhw, &topRhw, image, &quad, box, &color, 0, 0, 0)) { continue; } @@ -2168,7 +2168,7 @@ bool CGrannyPc::OnProcess() { this->ModifyArgb(8, 8, 8, 8); } - bool (CGameActor::*slot14)() = &CGameActor::Slot14; + bool (CGameActor::*slot14)() = &CGameActor::ProcessState; const bool result = (this->*slot14)(); this->PlayFrameSounds(); @@ -2240,7 +2240,7 @@ bool CPc::OnProcess() { this->ModifyArgb(8, 8, 8, 8); } - const bool result = this->Slot14(); + const bool result = this->ProcessState(); this->PlayFrameSounds(); @@ -2254,7 +2254,7 @@ bool CPc::OnProcess() { this->unknown_0180 = 0; } - const bool show = this->Slot55() > 0; + const bool show = this->GetMonsterTransformJob() > 0; if (!StateFlag02(this->stateFlags) && !StateFlag06(this->stateFlags) && !StateFlag01(this->stateFlags)) { if (show) { if (!this->msgEffect) { @@ -2376,7 +2376,7 @@ void CPc::UpdateGaugeWindow() { // OFFSET: 0x00DB1760 // FUNCTION: fn_22635 -void CPc::Slot19(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) { +void CPc::SetSprActFull(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) { this->unknown_04D4 = first; this->SetUnknown0260(second); this->unknown_0440 = third; @@ -2408,21 +2408,21 @@ void CPc::Slot19(int first, int second, int third, int fourth, int fifth, int si } this->SetActorJob(job); - this->Slot22(this->unknown_0440); - this->Slot23(this->weapon, this->unknown_044C); - this->Slot25(this->unknown_0450); - this->Slot26(this->unknown_0454); - this->Slot27(this->unknown_0458); - this->Slot28(this->unknown_045C); - this->Slot30(); - this->Slot31(); - this->Slot33(this->render.unknown_0048); - this->Slot32(); + this->SetSprHead(this->unknown_0440); + this->SetSprWeapon(this->weapon, this->unknown_044C); + this->SetSprAccessory(this->unknown_0450); + this->SetSprAccessory2(this->unknown_0454); + this->SetSprAccessory3(this->unknown_0458); + this->SetSprShield(this->unknown_045C); + this->SetImfFileName(); + this->SetHeadPaletteName(); + this->SetBodyPalette(this->render.unknown_0048); + this->SetBodyPaletteName(); } // OFFSET: 0x00DB0CE0 // FUNCTION: fn_22633 -void CPc::Slot20(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) { +void CPc::SetSprAct2(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) { this->unknown_04D4 = first; this->SetUnknown0260(second); this->unknown_0440 = third; @@ -2452,7 +2452,7 @@ void CPc::Slot20(int first, int second, int third, int fourth, int fifth, int si job = 0x1e; } else if (this->HasShapeShift()) { applyJob = false; - this->Slot21(this->GetUnknown0404Job()); + this->SetSprJob(this->GetUnknown0404Job()); } else if (this->unknown_02CC != 0) { job = g_session.GetRidingJob(first); } @@ -2461,7 +2461,7 @@ void CPc::Slot20(int first, int second, int third, int fourth, int fifth, int si this->SetActorJob(job); } - this->Slot22(this->unknown_0440); + this->SetSprHead(this->unknown_0440); if (!StateFlag12(eleventh) && !StateFlag16(eleventh) && !StateFlag18(eleventh) && !StateFlag27(eleventh) && !StateFlag28(eleventh) && this->unknown_03DC != 1 && this->unknown_02CC == 0) { @@ -2473,31 +2473,31 @@ void CPc::Slot20(int first, int second, int third, int fourth, int fifth, int si case 0xFE1: case 0x1005: case 0x109E: - this->Slot24(fourth, fifth); + this->SetSprWeapon2(fourth, fifth); break; default: - this->Slot24(fourth, fourth >> 31); + this->SetSprWeapon2(fourth, fourth >> 31); break; } } - this->Slot25(this->unknown_0450); - this->Slot26(this->unknown_0454); - this->Slot27(this->unknown_0458); + this->SetSprAccessory(this->unknown_0450); + this->SetSprAccessory2(this->unknown_0454); + this->SetSprAccessory3(this->unknown_0458); if (!StateFlag12(eleventh) && !StateFlag16(eleventh) && !StateFlag18(eleventh) && !StateFlag27(eleventh) && !StateFlag28(eleventh) && this->unknown_03DC != 1 && this->unknown_02CC == 0) { - this->Slot28(this->unknown_045C); + this->SetSprShield(this->unknown_045C); } - this->Slot30(); - this->Slot31(); - this->Slot32(); + this->SetImfFileName(); + this->SetHeadPaletteName(); + this->SetBodyPaletteName(); } // OFFSET: 0x00DB1AE0 // FUNCTION: fn_22640 -void CPc::Slot21(int job) { +void CPc::SetSprJob(int job) { if (job == JT_BARD || job == JT_BARD_H || job == JT_BARD_B) { if (this->unknown_0260 == 0) { this->unknown_0260 = 1; @@ -2534,9 +2534,9 @@ void CPc::Slot21(int job) { this->render.unknown_0054 = g_session.GetNpcLocationRadius(job, this->unknown_02CC == 1); - if (this->Slot55() > 0) { - this->LoadEquipAction(0, g_session.GetMonsterActName(this->Slot55()).c_str()); - this->LoadEquipSprite(0, g_session.GetMonsterSprName(this->Slot55()).c_str()); + if (this->GetMonsterTransformJob() > 0) { + this->LoadEquipAction(0, g_session.GetMonsterActName(this->GetMonsterTransformJob()).c_str()); + this->LoadEquipSprite(0, g_session.GetMonsterSprName(this->GetMonsterTransformJob()).c_str()); } else if (StateFlag12(this->stateFlags) == true || job == JT_MARRIED) { this->LoadEquipAction(0, g_session.GetRaceBodyResourceName(0, this->unknown_04D4, JT_MARRIED, this->unknown_0260, 0).c_str()); this->LoadEquipSprite(0, g_session.GetRaceBodyResourceName(1, this->unknown_04D4, JT_MARRIED, this->unknown_0260, 0).c_str()); @@ -2566,26 +2566,26 @@ void CPc::Slot21(int job) { case JT_MADOGEAR: case JT_MADOGEAR_H: case JT_MEISTER_MADOGEAR: - if (this->Slot56() == 2) { + if (this->GetMadogearType() == 2) { this->render.unknown_0054 = 1.5f; } break; case JT_MADOGEAR_B: - if (this->Slot56() == 2) { + if (this->GetMadogearType() == 2) { this->render.unknown_0054 = 1.12f; } break; } this->LoadEquipAction( - 0, GetBodyActionResourceName(effectiveJob, this->unknown_0260, this->unknown_04D0, this->Slot56()).c_str() + 0, GetBodyActionResourceName(effectiveJob, this->unknown_0260, this->unknown_04D0, this->GetMadogearType()).c_str() ); - this->LoadEquipSprite(0, g_session.GetBodySprName(effectiveJob, this->unknown_0260, this->unknown_04D0, this->Slot56()).c_str()); + this->LoadEquipSprite(0, g_session.GetBodySprName(effectiveJob, this->unknown_0260, this->unknown_04D0, this->GetMadogearType()).c_str()); } this->SetActionName(ResourceMgr::Instance(), this->equipActions[0] ? this->equipActions[0]->GetName() : ""); this->SetSpriteName(ResourceMgr::Instance(), this->equipSprites[0] ? this->equipSprites[0]->GetName() : ""); - this->Slot30(); + this->SetImfFileName(); } // OFFSET: 0x00DB4E70 @@ -2611,7 +2611,7 @@ __declspec(noinline) void CPlayer::UpdateMsgEffect(bool show) { // OFFSET: 0x00DB0FC0 // FUNCTION: fn_22634 -void CGrannyPc::Slot19(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) { +void CGrannyPc::SetSprActFull(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) { this->SetUnknown0260(second); this->unknown_0434 = third; this->unknown_0440 = fourth; @@ -2623,14 +2623,14 @@ void CGrannyPc::Slot19(int first, int second, int third, int fourth, int fifth, this->unknown_0438 = tenth; this->render.unknown_0048 = eleventh; this->SetActorJob(first); - this->Slot22(this->unknown_0434); - this->Slot23(this->unknown_0440, this->unknown_0444); - this->Slot25(this->unknown_0448); - this->Slot26(this->unknown_044C); - this->Slot27(this->unknown_0450); - this->Slot28(this->unknown_0454); - this->Slot30(); - this->Slot31(); + this->SetSprHead(this->unknown_0434); + this->SetSprWeapon(this->unknown_0440, this->unknown_0444); + this->SetSprAccessory(this->unknown_0448); + this->SetSprAccessory2(this->unknown_044C); + this->SetSprAccessory3(this->unknown_0450); + this->SetSprShield(this->unknown_0454); + this->SetImfFileName(); + this->SetHeadPaletteName(); if (this->model) { this->ReleaseMeshes(); @@ -2722,12 +2722,12 @@ void CGrannyPc::Slot19(int first, int second, int third, int fourth, int fifth, // OFFSET: 0x00DB0040 // FUNCTION: fn_22609 -void CPc::Slot32() { +void CPc::SetBodyPaletteName() { if (this->render.unknown_0048 == 0) { return; } - if (this->Slot55() < 0 && this->IsShapeShifted()) { + if (this->GetMonsterTransformJob() < 0 && this->IsShapeShifted()) { std::string paletteName; this->render.name.assign(static_cast(FormatOwnedString("몸\\%s_%d.pal", this->GetShapeShiftName().c_str(), this->render.unknown_0048))); return; @@ -2739,12 +2739,12 @@ void CPc::Slot32() { job = g_session.GetRidingJob(job); } - this->render.name.assign(static_cast(g_session.GetBodyPalName(job, this->unknown_0260, this->render.unknown_0048, costumeJob, this->Slot56(), 0))); + this->render.name.assign(static_cast(g_session.GetBodyPalName(job, this->unknown_0260, this->render.unknown_0048, costumeJob, this->GetMadogearType(), 0))); } // OFFSET: 0x00DB2670 // FUNCTION: fn_22645 -void CPc::Slot28(int value) { +void CPc::SetSprShield(int value) { this->unknown_045C = value; if (this->unknown_02CC != 0) { @@ -2761,7 +2761,7 @@ void CPc::Slot28(int value) { // OFFSET: 0x00DB6670 // FUNCTION: fn_22668 void CPlayer::ApplyFollowOffset(CGameActor* target, float x, float z, int* row, int* column) { - int step = target->Slot45(); + int step = target->GetNpcLocationRadius(); if (target->unknown_02E0 == 1) { step = 5; } else if (step == 0) { @@ -2810,11 +2810,11 @@ float CPlayer::AdjustFollowDistance(CGameActor* target, float distance) { return std::max(distance - 20.0f, 0.0f); } - if (target->Slot45() <= 0) { + if (target->GetNpcLocationRadius() <= 0) { return std::max(distance, 0.0f); } - return std::max(distance - static_cast(target->Slot45() + 1) * 4.0f, 0.0f); + return std::max(distance - static_cast(target->GetNpcLocationRadius() + 1) * 4.0f, 0.0f); } // GLOBAL: gl_25248 @@ -2862,7 +2862,7 @@ bool CPlayer::OnProcess() { this->UpdatePendingAction(); - const bool result = this->Slot14(); + const bool result = this->ProcessState(); this->PlayFrameSounds(); @@ -2876,7 +2876,7 @@ bool CPlayer::OnProcess() { this->unknown_0180 = 0; } - this->UpdateMsgEffect(this->Slot55() > 0); + this->UpdateMsgEffect(this->GetMonsterTransformJob() > 0); if (g_session.unknown_61B1) { UIWindow* window = g_windowMgr.LookupWindow(289); @@ -3452,9 +3452,9 @@ void CPlayer::ReapplySkillEffects() { this->SendMsg(nullptr, 110, 0, 0x23B, 0, 1, 0, value, value >> 31, 0, 0, 0, 0, 0, 0); break; case 0x265: - this->Slot47(1); - this->Slot21(this->GetEffectiveJob(-1)); - this->Slot33(this->render.unknown_0048); + this->SetRiding(1); + this->SetSprJob(this->GetEffectiveJob(-1)); + this->SetBodyPalette(this->render.unknown_0048); break; case 0x2A1: this->SendMsg(nullptr, 110, 0, type, type >> 31, 1, 0, g_session.unknown_5C1C, g_session.unknown_5C1C >> 31, 0, 0, 0, 0, 0, 0); @@ -3557,7 +3557,7 @@ void CPlayer::ReapplySkillEffects() { } break; case 0x3A5: - this->Slot15(0x30, 1); + this->SetState(0x30, 1); this->render.isMotionFreezed = true; break; case 0x397: @@ -3989,7 +3989,7 @@ void CPlayer::SendMsg( if (this->FindRoute(route[1], route[2], route[3], route[4], route[5], route[6], *reinterpret_cast(g_session.unknown_16F4))) { this->unknown_0158[5] = route[5]; *reinterpret_cast(this->unknown_0170) = route[6]; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { int column; @@ -4000,14 +4000,14 @@ void CPlayer::SendMsg( if (this->FindRoute(column, row, subColumn, subRow, route[5], route[6], *reinterpret_cast(g_session.unknown_16F4))) { this->unknown_0158[5] = route[5]; *reinterpret_cast(this->unknown_0170) = route[6]; - this->Slot15(1, 1); + this->SetState(1, 1); } } g_navigationManager.CheckArrival(this->unknown_0158[5], *reinterpret_cast(this->unknown_0170)); break; } case 0x08: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 0x0D: this->unknown_0514 = 0; @@ -4304,7 +4304,7 @@ void CPlayer::Initialize() { this->unknown_053C = -1; this->unknown_0540 = -1; this->unknown_0528 = timeGetTime() - 1200; - this->Slot15(0, 1); + this->SetState(0, 1); *reinterpret_cast(&this->unknown_0170[4]) = *reinterpret_cast(&g_session.unknown_16F4[0]); this->render.unknown_00A8 = 1; @@ -4316,15 +4316,15 @@ void CPlayer::Initialize() { this->bodyState = *reinterpret_cast(&g_session.unknown_0F0C[0]); this->stateFlags = g_session.m_jobFlags; this->unknown_02C4 = *reinterpret_cast(&g_session.unknown_0F0C[4]); - this->Slot57(g_session.unknown_8074); - this->Slot44(g_session.m_bodyCostume, 0); - this->Slot20( + this->SetMadogearType(g_session.unknown_8074); + this->SetBodyCostume(g_session.m_bodyCostume, 0); + this->SetSprAct2( g_session.GetDisplayJob(), g_session.SyncUnknown0E98(), g_session.m_head, *reinterpret_cast(&g_session.unknown_0EDC[0x4]), *reinterpret_cast(&g_session.unknown_0EDC[0x8]), *reinterpret_cast(&g_session.unknown_0EF4[0x0]), *reinterpret_cast(&g_session.unknown_0EF4[0x4]), *reinterpret_cast(&g_session.unknown_0EF4[0x8]), g_session.m_headPalette, g_session.m_bodyStyle, g_session.m_jobFlags ); - this->Slot43(g_session.m_robe, 0); + this->SetSprRobe(g_session.m_robe, 0); if (g_session.unknown_6184 != 0) { const int value = g_session.unknown_6184; this->SendMsg(nullptr, 110, 0, 856, 0, 1, 0, value, value >> 31, 0, 0, 0, 0, 0, 0); @@ -4349,7 +4349,7 @@ void CPlayer::Initialize() { // OFFSET: 0x00DB4290 // FUNCTION: fn_22651 -void CPc::Slot15(int state, int resetPosition) { +void CPc::SetState(int state, int resetPosition) { int current = this->render.unknown_0070; if (current == 3 || this->unknown_017C != 0) { return; @@ -4361,8 +4361,8 @@ void CPc::Slot15(int state, int resetPosition) { if (state == 3) { const int job = this->GetEffectiveJob(JobNames::BaseJob(this->unknown_025C)); - this->LoadEquipAction(0, GetBodyActionResourceName(job, this->unknown_0260, this->unknown_04D0, this->Slot56()).c_str()); - this->LoadEquipSprite(0, g_session.GetBodySprName(job, this->unknown_0260, this->unknown_04D0, this->Slot56()).c_str()); + this->LoadEquipAction(0, GetBodyActionResourceName(job, this->unknown_0260, this->unknown_04D0, this->GetMadogearType()).c_str()); + this->LoadEquipSprite(0, g_session.GetBodySprName(job, this->unknown_0260, this->unknown_04D0, this->GetMadogearType()).c_str()); current = this->render.unknown_0070; } @@ -4372,7 +4372,7 @@ void CPc::Slot15(int state, int resetPosition) { } int action; - if (this->Slot55() > 0) { + if (this->GetMonsterTransformJob() > 0) { action = this->ActionBase(state); } else { action = this->JobActionBase(state); @@ -4383,12 +4383,12 @@ void CPc::Slot15(int state, int resetPosition) { switch (state) { case 8: - this->Slot16(); + this->RegisterPos(); this->SetAction(action, 6, 1); this->render.isMotionFinished = true; break; case 6: - this->Slot16(); + this->RegisterPos(); this->SetAction(action, 4, 1); this->render.isMotionFinished = true; this->render.curMotion = this->unknown_043C; @@ -4399,10 +4399,10 @@ void CPc::Slot15(int state, int resetPosition) { this->render.isMotionFreezed = false; } this->unknown_043C = 0; - CGameActor::Slot15(1, resetPosition); + CGameActor::SetState(1, resetPosition); break; case 0: - CGameActor::Slot15(0, resetPosition); + CGameActor::SetState(0, resetPosition); if (g_session.m_aid == this->render.accountId) { switch (g_session.m_job) { case 0xFCF: @@ -4524,7 +4524,7 @@ void CPc::Slot15(int state, int resetPosition) { break; } - CGameActor::Slot15(attackState, resetPosition); + CGameActor::SetState(attackState, resetPosition); this->unknown_0378 = AttackMotionLength(this->GetEffectiveJob(-1), this->unknown_0260, this->weapon, weaponAllowed); int weaponView = this->weapon; @@ -4534,8 +4534,8 @@ void CPc::Slot15(int state, int resetPosition) { bool usesArrow = false; g_session.m_hotkeyScript->Call("IsItemUsingArrow", "d>b", weaponView, &usesArrow); if (usesArrow == true) { - if (this->Slot58() == true) { - this->Slot59(false); + if (this->IsArrowEffectSuppressed() == true) { + this->SetArrowEffectSuppressed(false); } else { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); (mode->*spawnArrow)(&this->render.position, this->hitTargetAid, this->render.speed * this->unknown_0378, 0); @@ -4558,7 +4558,7 @@ void CPc::Slot15(int state, int resetPosition) { const bool weaponAllowed = IsJobWeaponAllowed( this->GetEffectiveJob(-1), this->unknown_0260, (static_cast(this->unknown_044C) << 32) | static_cast(this->weapon) ); - CGameActor::Slot15(weaponAllowed ? 9 : 2, resetPosition); + CGameActor::SetState(weaponAllowed ? 9 : 2, resetPosition); this->unknown_0378 = AttackMotionLength(this->GetEffectiveJob(-1), this->unknown_0260, this->weapon, weaponAllowed); if ((this->weapon == 14 && this->unknown_044C == 0) || (this->weapon == 13 && this->unknown_044C == 0)) { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); @@ -4568,7 +4568,7 @@ void CPc::Slot15(int state, int resetPosition) { break; } default: - CGameActor::Slot15(state, resetPosition); + CGameActor::SetState(state, resetPosition); return; } @@ -4801,26 +4801,26 @@ void CPc::SendMsg( this->unknown_043C = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0048, entry->unknown_0054, entry->unknown_0058 ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } break; @@ -4839,28 +4839,28 @@ void CPc::SendMsg( this->unknown_043C = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot20( + this->SetSprAct2( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0054, entry->unknown_0058, entry->stateFlags ); - this->Slot43(entry->robe, 0); + this->SetSprRobe(entry->robe, 0); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); this->unknown_04CC = entry->unknown_0074; switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } break; @@ -4868,17 +4868,17 @@ void CPc::SendMsg( case 105: case 106: case 136: { - this->Slot21(this->GetEffectiveJob(-1)); - this->Slot30(); - const std::int64_t weapon = this->Slot35(); + this->SetSprJob(this->GetEffectiveJob(-1)); + this->SetImfFileName(); + const std::int64_t weapon = this->GetWeapon(); if (weapon >= 1 && weapon <= 104) { - this->Slot23(static_cast(weapon), static_cast(weapon >> 32)); + this->SetSprWeapon(static_cast(weapon), static_cast(weapon >> 32)); } else { - this->Slot24(static_cast(weapon), static_cast(weapon >> 32)); + this->SetSprWeapon2(static_cast(weapon), static_cast(weapon >> 32)); } - this->Slot28(this->unknown_045C); - this->Slot31(); - this->Slot32(); + this->SetSprShield(this->unknown_045C); + this->SetHeadPaletteName(); + this->SetBodyPaletteName(); break; } case 4: { @@ -4897,26 +4897,26 @@ void CPc::SendMsg( this->unknown_043C = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0048, entry->unknown_0054, entry->unknown_0058 ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } if (d == 2 && e == 0 && !StateFlag06(this->stateFlags)) { @@ -4942,27 +4942,27 @@ void CPc::SendMsg( this->unknown_043C = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot20( + this->SetSprAct2( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0054, entry->unknown_0058, entry->stateFlags ); - this->Slot43(entry->robe, 0); + this->SetSprRobe(entry->robe, 0); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } if (d == 2 && e == 0 && !StateFlag06(this->stateFlags)) { @@ -4979,14 +4979,14 @@ void CPc::SendMsg( this->routeStartTick = entry->moveStartTick; this->unknown_043C = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_004C, entry->unknown_0058, entry->unknown_005C ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); mode->CellCenter(entry->startX, entry->startY, this->render.position.x, this->render.position.z); this->render.position.x += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubX - 8); this->render.position.z += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubY - 8); @@ -4995,10 +4995,10 @@ void CPc::SendMsg( if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { - this->Slot15(0, 1); + this->SetState(0, 1); } this->ShowPartyMemberEffect(entry->aid); break; @@ -5011,15 +5011,15 @@ void CPc::SendMsg( this->routeStartTick = entry->moveStartTick; this->unknown_043C = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot20( + this->SetSprAct2( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_0058, entry->unknown_005C, entry->stateFlags ); - this->Slot43(entry->robe, 0); + this->SetSprRobe(entry->robe, 0); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); mode->CellCenter(entry->startX, entry->startY, this->render.position.x, this->render.position.z); this->render.position.x += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubX - 8); this->render.position.z += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubY - 8); @@ -5028,10 +5028,10 @@ void CPc::SendMsg( if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { - this->Slot15(0, 1); + this->SetState(0, 1); } this->ShowPartyMemberEffect(entry->aid); this->unknown_04CC = entry->unknown_0078; @@ -5045,18 +5045,18 @@ void CPc::SendMsg( this->routeStartTick = entry->moveStartTick; this->unknown_043C = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_004C, entry->unknown_0058, entry->unknown_005C ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } this->ShowPartyMemberEffect(entry->aid); @@ -5071,19 +5071,19 @@ void CPc::SendMsg( this->routeStartTick = entry->moveStartTick; this->unknown_043C = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot20( + this->SetSprAct2( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_0058, entry->unknown_005C, entry->stateFlags ); - this->Slot43(entry->robe, 0); + this->SetSprRobe(entry->robe, 0); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } this->ShowPartyMemberEffect(entry->aid); @@ -5223,26 +5223,26 @@ void CGrannyPc::SendMsg( this->unknown_0430 = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0048, entry->unknown_0054, entry->unknown_0058 ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } break; @@ -5260,39 +5260,39 @@ void CGrannyPc::SendMsg( this->unknown_0430 = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0048, entry->unknown_0054, entry->unknown_0058 ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } break; } case 105: case 106: { - this->Slot21(this->GetEffectiveJob(-1)); - this->Slot30(); - const std::int64_t weapon = this->Slot35(); - this->Slot23(static_cast(weapon), static_cast(weapon >> 32)); - this->Slot28(this->unknown_0454); - this->Slot31(); - this->Slot32(); + this->SetSprJob(this->GetEffectiveJob(-1)); + this->SetImfFileName(); + const std::int64_t weapon = this->GetWeapon(); + this->SetSprWeapon(static_cast(weapon), static_cast(weapon >> 32)); + this->SetSprShield(this->unknown_0454); + this->SetHeadPaletteName(); + this->SetBodyPaletteName(); break; } case 4: @@ -5312,26 +5312,26 @@ void CGrannyPc::SendMsg( this->unknown_0430 = entry->unknown_005C; *reinterpret_cast(this->unknown_029C) = entry->unknown_0024; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_0024, entry->unknown_0028, entry->unknown_002C, entry->unknown_0030, entry->unknown_004C, entry->unknown_0050, entry->unknown_0048, entry->unknown_0054, entry->unknown_0058 ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0044); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_0068, entry->unknown_006C); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_0068, entry->unknown_006C); switch (entry->state) { case 0: - this->Slot15(0, 1); + this->SetState(0, 1); break; case 1: - this->Slot15(3, 1); + this->SetState(3, 1); break; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); break; default: - this->Slot15(0, 1); + this->SetState(0, 1); break; } if (d == 2 && e == 0 && !StateFlag06(this->stateFlags)) { @@ -5347,14 +5347,14 @@ void CGrannyPc::SendMsg( this->routeStartTick = entry->moveStartTick; this->unknown_0430 = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_004C, entry->unknown_0058, entry->unknown_005C ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); mode->CellCenter(entry->startX, entry->startY, this->render.position.x, this->render.position.z); this->render.position.x += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubX - 8); this->render.position.z += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubY - 8); @@ -5363,10 +5363,10 @@ void CGrannyPc::SendMsg( if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { - this->Slot15(0, 1); + this->SetState(0, 1); } this->ShowPartyMemberEffect(entry->aid); break; @@ -5381,14 +5381,14 @@ void CGrannyPc::SendMsg( this->bodyState = entry->bodyState; this->unknown_0430 = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_004C, entry->unknown_0058, entry->unknown_005C ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); mode->CellCenter(entry->startX, entry->startY, this->render.position.x, this->render.position.z); this->render.position.x += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubX - 8); this->render.position.z += static_cast(mode->scene->terrain->cellSize) * 0.0625f * static_cast(entry->startSubY - 8); @@ -5397,10 +5397,10 @@ void CGrannyPc::SendMsg( if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } else { - this->Slot15(0, 1); + this->SetState(0, 1); } this->ShowPartyMemberEffect(entry->aid); break; @@ -5413,18 +5413,18 @@ void CGrannyPc::SendMsg( this->routeStartTick = entry->moveStartTick; this->unknown_0430 = 0; entry->job = MountedJob(entry->job, entry->stateFlags); - this->Slot19( + this->SetSprActFull( entry->job, entry->unknown_0008, entry->unknown_002C, entry->unknown_0030, entry->unknown_0034, entry->unknown_0038, entry->unknown_0050, entry->unknown_0054, entry->unknown_004C, entry->unknown_0058, entry->unknown_005C ); this->SetStatusStates(entry->bodyState, entry->stateFlags, entry->effectState, false); this->SetUnknown02C8(entry->unknown_0048); - this->Slot49(entry->guildId, entry->guildVersion); - this->Slot41(entry->unknown_006C, entry->unknown_0070); + this->SetGuildInfo(entry->guildId, entry->guildVersion); + this->SetPropensityInfo(entry->unknown_006C, entry->unknown_0070); if (this->FindRoute(entry->startX, entry->startY, entry->startSubX, entry->startSubY, entry->destX, entry->destY, entry->speed)) { this->unknown_0158[5] = entry->destX; *reinterpret_cast(this->unknown_0170) = entry->destY; - this->Slot15(1, 1); + this->SetState(1, 1); this->unknown_023C = 0; } this->ShowPartyMemberEffect(entry->aid); @@ -5444,7 +5444,7 @@ void CGrannyPc::SendMsg( // OFFSET: 0x00DAC080 // FUNCTION: fn_22592 -bool CGrannyPc::Slot14() { +bool CGrannyPc::ProcessState() { if (static_cast(this->unknown_0278) > 0 && timeGetTime() > static_cast(this->unknown_0278)) { this->render.isMotionFreezed = false; this->unknown_0278 = 0; @@ -5457,7 +5457,7 @@ bool CGrannyPc::Slot14() { g_modeMgr.GetGameMode(); switch (this->render.unknown_0070) { case 8: { - this->Slot08(); + this->ProcessMotion(); const int frames = static_cast(this->GetElapsedFrames()); if (this->hitTargetAid != 0 && frames % 34 == 0) { CRenderObject* target = static_cast(g_modeMgr.GetGameMode())->scene->GetGameActorByAID(this->hitTargetAid); @@ -5468,16 +5468,16 @@ bool CGrannyPc::Slot14() { return true; } case 7: - this->Slot08(); + this->ProcessMotion(); if (this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } return true; case 2: - this->Slot08(); + this->ProcessMotion(); this->GetElapsedFrames(); if (this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } return true; case 3: @@ -5486,16 +5486,16 @@ bool CGrannyPc::Slot14() { this->render.unknown_00DC = 0; this->render.isMotionFreezed = false; case 6: - this->Slot08(); + this->ProcessMotion(); return true; default: - return CGameActor::Slot14(); + return CGameActor::ProcessState(); } } // OFFSET: 0x00DAC200 // FUNCTION: fn_22593 -bool CPc::Slot14() { +bool CPc::ProcessState() { if (static_cast(this->unknown_0278) > 0 && timeGetTime() > static_cast(this->unknown_0278)) { this->render.isMotionFreezed = false; this->unknown_0278 = 0; @@ -5508,7 +5508,7 @@ bool CPc::Slot14() { g_modeMgr.GetGameMode(); switch (this->render.unknown_0070) { case 8: { - this->Slot08(); + this->ProcessMotion(); const int frames = static_cast(this->GetElapsedFrames()); if (this->hitTargetAid != 0 && frames % 34 == 0) { CRenderObject* target = static_cast(g_modeMgr.GetGameMode())->scene->GetGameActorByAID(this->hitTargetAid); @@ -5538,16 +5538,16 @@ bool CPc::Slot14() { case 78: case 79: case 80: - this->Slot08(); + this->ProcessMotion(); if (this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } return true; case 2: - this->Slot08(); + this->ProcessMotion(); this->GetElapsedFrames(); if (this->render.isMotionFinished) { - this->Slot15(0, 1); + this->SetState(0, 1); } return true; case 3: @@ -5560,22 +5560,22 @@ bool CPc::Slot14() { case 61: case 66: case 81: - this->Slot08(); + this->ProcessMotion(); return true; case 51: - this->Slot08(); + this->ProcessMotion(); if (this->render.isMotionFinished == true) { this->render.unknown_0070 = 2; } return true; default: - return CGameActor::Slot14(); + return CGameActor::ProcessState(); } } // OFFSET: 0x00DBA5D0 // FUNCTION: fn_22673 -void CPlayer::Slot15(int state, int resetPosition) { +void CPlayer::SetState(int state, int resetPosition) { if (this->render.unknown_0070 == 3) { return; } @@ -5601,5 +5601,5 @@ void CPlayer::Slot15(int state, int resetPosition) { g_screenShakeDuration = 0; } - CPc::Slot15(state, resetPosition); + CPc::SetState(state, resetPosition); } diff --git a/Source/Contents/Actors/RenderObject.cpp b/Source/Contents/Actors/RenderObject.cpp index 4fd5972b0..5703e5d9a 100644 --- a/Source/Contents/Actors/RenderObject.cpp +++ b/Source/Contents/Actors/RenderObject.cpp @@ -188,7 +188,7 @@ bool CRenderObject::OnProcess() { // OFFSET: 0x00CB0500 // FUNCTION: fn_21094 -void CRenderObject::Slot08() { +void CRenderObject::ProcessMotion() { this->render.previousAnimation = this->render.animation + this->Get8Dir(this->render.angle); g_modeMgr.GetGameMode(); const float frame = static_cast(static_cast(timeGetTime() - this->render.unknown_008C) / 24.0); @@ -835,7 +835,7 @@ void CRenderObject::SetInstantValue(int key, std::int64_t value) { // OFFSET: 0x00CC2060 // FUNCTION: fn_21135 -void CGameActor::Slot49(int guildId, int version) { +void CGameActor::SetGuildInfo(int guildId, int version) { if (guildId <= 0) { return; } @@ -857,7 +857,7 @@ void CGameActor::Slot49(int guildId, int version) { // OFFSET: 0x00CC21F0 // FUNCTION: fn_21136 -void CGameActor::Slot30() { +void CGameActor::SetImfFileName() { } // OFFSET: 0x00CC27C0 @@ -881,7 +881,7 @@ void CGameActor::SetRenderInfo(const float* bounds, float x, float y) { if ((g_pickModifierKey != 0) == (g_pickInvert != 0)) { if (g_session.GetSceneUnknown004C() != 0) { if (IsPlayerJob(this->GetEffectiveJob(-1))) { - depth = g_session.IsLocalPlayerAid(this->Slot50()) != 0 ? 100.0f : 400.0f; + depth = g_session.IsLocalPlayerAid(this->GetGdid()) != 0 ? 100.0f : 400.0f; } else if (g_session.IsNpcJob(this->GetEffectiveJob(-1))) { depth = 200.0f; } else if (g_session.IsMonsterClass(this->GetEffectiveJob(-1))) { @@ -903,7 +903,7 @@ void CGameActor::SetRenderInfo(const float* bounds, float x, float y) { } else { if (g_session.GetSceneUnknown004C() != 0) { if (IsPlayerJob(this->GetEffectiveJob(-1))) { - depth = g_session.IsLocalPlayerAid(this->Slot50()) != 0 ? 400.0f : 100.0f; + depth = g_session.IsLocalPlayerAid(this->GetGdid()) != 0 ? 400.0f : 100.0f; } else if (g_session.IsNpcJob(this->GetEffectiveJob(-1))) { depth = 100.0f; } else if (g_session.IsMonsterClass(this->GetEffectiveJob(-1))) { @@ -1021,7 +1021,7 @@ void CGameActor::PlayGroundSkillEffect(int sender, const int* skill, int argumen } } else { this->Face(x, z); - this->Slot15(motion, 1); + this->SetState(motion, 1); } break; } @@ -1170,7 +1170,7 @@ void CGameActor::PlayGroundSkillEffect(int sender, const int* skill, int argumen CEffect* effect = g_effectMgr->Spawn(0, 0x426, position.x, position.y, position.z, 0, -1, 0, 0); if (effect != nullptr) { using SetFloat = void (CEffect::*)(float); - const SetFloat set = reinterpret_cast(&CEffect::Slot13); + const SetFloat set = reinterpret_cast(&CEffect::AdvanceFrame); (effect->*set)(0.4f); } break; @@ -1217,11 +1217,11 @@ void CGameActor::PlayGroundSkillEffect(int sender, const int* skill, int argumen g_effectMgr->Spawn(0, 0x828, position.x, position.y, position.z, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(0, 0x82B, position.x, position.y, position.z, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(0x370); + effect->SetDelay(0x370); } effect = g_effectMgr->Spawn(0, 0x82C, position.x, position.y, position.z, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(0x370); + effect->SetDelay(0x370); } break; } @@ -1249,27 +1249,27 @@ void CGameActor::SetUnknown0330(const float* value, int index) { // OFFSET: 0x00CC2DC0 // FUNCTION: fn_21147 -void CGameActor::Slot25(int) { +void CGameActor::SetSprAccessory(int) { } // OFFSET: 0x00CC2DD0 // FUNCTION: fn_21148 -void CGameActor::Slot18(int, int, int) { +void CGameActor::SetSprAct(int, int, int) { } // OFFSET: 0x00CC2DE0 // FUNCTION: fn_21149 -void CGameActor::Slot22(int) { +void CGameActor::SetSprHead(int) { } // OFFSET: 0x00CC2DF0 // FUNCTION: fn_21150 -void CGameActor::Slot21(int) { +void CGameActor::SetSprJob(int) { } // OFFSET: 0x00CC2E40 // FUNCTION: fn_21152 -void CGameActor::Slot23(int, int) { +void CGameActor::SetSprWeapon(int, int) { } // INLINED @@ -1285,7 +1285,7 @@ static bool HasEffectOfType(const std::list& effects, int type) { // OFFSET: 0x00CC2E50 // FUNCTION: fn_21153 -void CGameActor::Slot15(int state, int resetPosition) { +void CGameActor::SetState(int state, int resetPosition) { g_session.m_homunActionState = 0; g_session.m_mercenaryActionState = 0; @@ -1302,7 +1302,7 @@ void CGameActor::Slot15(int state, int resetPosition) { const std::uint32_t aid = this->render.accountId; bool isPlayer; - if (g_session.m_aid != aid && this->Slot50() >= 1 && g_session.IsPlayerJobId(this->GetEffectiveJob(-1))) { + if (g_session.m_aid != aid && this->GetGdid() >= 1 && g_session.IsPlayerJobId(this->GetEffectiveJob(-1))) { isPlayer = true; } else { isPlayer = false; @@ -1316,7 +1316,7 @@ void CGameActor::Slot15(int state, int resetPosition) { } int action; - if (this->Slot55() > 0) { + if (this->GetMonsterTransformJob() > 0) { action = this->ActionBase(state); } else { action = this->WeaponActionBase(state); @@ -1325,7 +1325,7 @@ void CGameActor::Slot15(int state, int resetPosition) { switch (state) { case 0xd: if (g_session.IsPlayerJobId(this->GetEffectiveJob(-1))) { - const std::int64_t weapon = this->Slot35(); + const std::int64_t weapon = this->GetWeapon(); IsJobWeaponAllowed(this->GetEffectiveJob(-1), this->unknown_0260, weapon); this->SetAction(action, 4, 1); this->render.isMotionFreezed = true; @@ -1351,7 +1351,7 @@ void CGameActor::Slot15(int state, int resetPosition) { this->SetAction(action, 5, 1); const int job = this->GetEffectiveJob(-1); if (job != 0x8d && job != 0xe6) { - this->Slot16(); + this->RegisterPos(); } break; } @@ -1378,8 +1378,8 @@ void CGameActor::Slot15(int state, int resetPosition) { if (this->GetEffectiveJob(-1) == 0x505) { this->LaunchAttackProjectile(this->hitTargetAid, 28.0f); } - this->unknown_0378 = static_cast(this->Slot37()); - this->Slot16(); + this->unknown_0378 = static_cast(this->GetAttackMotion()); + this->RegisterPos(); break; case 3: this->render.unknown_00C8 = 0; @@ -1400,13 +1400,13 @@ void CGameActor::Slot15(int state, int resetPosition) { if (!IsObfuscatedMessage(this->render.accountId)) { this->render.isMotionFinished = true; } - this->Slot16(); + this->RegisterPos(); break; case 1: if (this->unknown_0184 == 0) { this->SetAction(action, 6, 0); } - this->Slot17(); + this->UnRegisterPos(); break; case 5: this->unknown_0178 = 0; @@ -1416,7 +1416,7 @@ void CGameActor::Slot15(int state, int resetPosition) { break; case 0xc: this->SetAction(action, 3, 1); - this->Slot16(); + this->RegisterPos(); break; case 0x10: this->render.unknown_00C2 = 10; @@ -1751,7 +1751,7 @@ void CGameActor::Slot15(int state, int resetPosition) { // OFFSET: 0x00CA9E50 // FUNCTION: fn_21013 -void CRenderObject::Slot10( +void CRenderObject::RenderBlur( const SpriteFrameCell* cell, const int* box, float offset, float bottomRhw, float topRhw, const std::uint32_t* palette, const SpriteRleImage* image, float scale, short shift ) { @@ -1807,7 +1807,7 @@ void CRenderObject::Slot10( // OFFSET: 0x00CAA1F0 // FUNCTION: fn_21015 -void CRenderObject::Slot12(SpriteQuad* quad, const int* input, float offset, int spread, int base) { +void CRenderObject::ApplySpriteJitter(SpriteQuad* quad, const int* input, float offset, int spread, int base) { if ((this->render.flags & 0x2000) == 0) { return; } @@ -1834,7 +1834,7 @@ void CRenderObject::Slot12(SpriteQuad* quad, const int* input, float offset, int // OFFSET: 0x00CAA2E0 // FUNCTION: fn_21016 -void CRenderObject::Slot11( +void CRenderObject::RenderAura( SpriteQuad* quad, const SpriteFrameCell* cell, const int* box, float offset, float bottomRhw, float topRhw, const std::uint32_t* palette, const SpriteRleImage* image, int blend, short shift ) { @@ -2027,9 +2027,9 @@ void CRenderObject::DrawSpriteEffects( } CGameActor* actor = static_cast(this); - actor->Slot10(cell, box, offset, bottomRhw, topRhw, palette, image, static_cast(box[3] - box[1]) * 0.05f, 0); - actor->Slot11(quad, cell, box, offset, bottomRhw, topRhw, palette, image, *blend, 0); - actor->Slot12(quad, box, offset, 21, 10); + actor->RenderBlur(cell, box, offset, bottomRhw, topRhw, palette, image, static_cast(box[3] - box[1]) * 0.05f, 0); + actor->RenderAura(quad, cell, box, offset, bottomRhw, topRhw, palette, image, *blend, 0); + actor->ApplySpriteJitter(quad, box, offset, 21, 10); if ((this->render.flags & 0x100000) != 0) { short angle = static_cast(cell->unknown_001C) + static_cast(this->render.unknown_007C) + 60; @@ -2062,25 +2062,25 @@ int CGameActor::GetShield() { // OFFSET: 0x005A1280 // FUNCTION: fn_03042 -void CGameActor::Slot62(int value) { +void CGameActor::SetSex(int value) { this->SetUnknown0260(value); } // OFFSET: 0x005A1290 // FUNCTION: fn_03043 -int CGameActor::Slot46() { +int CGameActor::GetBodyCostume() { return 0; } // OFFSET: 0x005A12A0 // FUNCTION: fn_03044 -std::uint32_t CGameActor::Slot13() { +std::uint32_t CGameActor::GetStateFlags() { return this->stateFlags; } // OFFSET: 0x005A12B0 // FUNCTION: fn_03045 -int CGameActor::Slot50() { +int CGameActor::GetGdid() { return this->guildId; } @@ -2094,13 +2094,13 @@ float* CGameActor::GetExtent(float* extent) const { // OFFSET: 0x005A12E0 // FUNCTION: fn_03047 -bool CGameActor::Slot58() { +bool CGameActor::IsArrowEffectSuppressed() { return false; } // OFFSET: 0x005A12F0 // FUNCTION: fn_03048 -int CGameActor::Slot45() { +int CGameActor::GetNpcLocationRadius() { int radius = 0; g_session.m_hotkeyScript->Call("GetNpcLocationRadius", "d>d", this->GetEffectiveJob(-1), &radius); return radius; @@ -2108,82 +2108,82 @@ int CGameActor::Slot45() { // OFFSET: 0x005A13B0 // FUNCTION: fn_03049 -int CGameActor::Slot56() { +int CGameActor::GetMadogearType() { return 0; } // OFFSET: 0x005A13C0 // FUNCTION: fn_03050 -int CGameActor::Slot42() { +int CGameActor::GetPkState() { return 0; } // OFFSET: 0x005A13D0 // FUNCTION: fn_03051 -std::int64_t CGameActor::Slot35() { +std::int64_t CGameActor::GetWeapon() { return -1; } // OFFSET: 0x005A1930 // FUNCTION: fn_45454 -void CGameActor::Slot44(int, int) { +void CGameActor::SetBodyCostume(int, int) { } // OFFSET: 0x005A1960 // FUNCTION: fn_03054 -void CGameActor::Slot48(int value) { +void CGameActor::SetGdid(int value) { this->guildId = value; } // OFFSET: 0x005A1990 // FUNCTION: fn_03057 -void CGameActor::Slot40(int) { +void CGameActor::SetHonor(int) { } // OFFSET: 0x005A19B0 // FUNCTION: fn_03059 -void CGameActor::Slot59(bool) { +void CGameActor::SetArrowEffectSuppressed(bool) { } // OFFSET: 0x005A19C0 // FUNCTION: fn_03060 -void CGameActor::Slot57(int) { +void CGameActor::SetMadogearType(int) { } // OFFSET: 0x005A19D0 // FUNCTION: fn_03061 -void CGameActor::Slot41(int, int) { +void CGameActor::SetPropensityInfo(int, int) { } // OFFSET: 0x005A19E0 // FUNCTION: fn_03062 -void CGameActor::Slot47(unsigned char value) { +void CGameActor::SetRiding(unsigned char value) { this->unknown_02CC = value; } // OFFSET: 0x005A1A40 // FUNCTION: fn_03068 -void CGameActor::Slot60() { +void CGameActor::RefreshAccessory3() { } // OFFSET: 0x005A1A70 // FUNCTION: fn_03071 -void CGameActor::Slot43(int, int) { +void CGameActor::SetSprRobe(int, int) { } // OFFSET: 0x005A1A80 // FUNCTION: fn_03072 -void CGameActor::Slot28(int) { +void CGameActor::SetSprShield(int) { } // OFFSET: 0x005A1AA0 // FUNCTION: fn_03074 -void CGameActor::Slot24(int, int) { +void CGameActor::SetSprWeapon2(int, int) { } // OFFSET: 0x00CABD40 // FUNCTION: fn_21037 -int CGameActor::Slot37() { +int CGameActor::GetAttackMotion() { const CActRes* action = this->render.action; const int count = static_cast(action->FrameCount(this->render.previousAnimation)); @@ -2200,7 +2200,7 @@ int CGameActor::Slot37() { // OFFSET: 0x00CACEF0 // FUNCTION: fn_21048 -float* CGameActor::Slot51(int index) { +float* CGameActor::GetMsg2AI(int index) { if (index == 0) { return this->unknown_0318; } @@ -2212,7 +2212,7 @@ float* CGameActor::Slot51(int index) { // OFFSET: 0x00CAD480 // FUNCTION: fn_21052 -float* CGameActor::Slot53(int index) { +float* CGameActor::GetResMsg2AI(int index) { if (index == 0) { return this->unknown_0330; } @@ -2230,7 +2230,7 @@ bool CGameActor::HasShapeShift() { // OFFSET: 0x00CAE500 // FUNCTION: fn_21074 -void CGameActor::Slot38() { +void CGameActor::MakeCorpse() { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); const float angle = this->render.angle; const int motion = this->render.curMotion; @@ -2422,7 +2422,7 @@ void CGameActor::LaunchAttackProjectile(int target, float scale) { // OFFSET: 0x00CABEB0 // FUNCTION: fn_21040 -int CGameActor::Slot55() { +int CGameActor::GetMonsterTransformJob() { if (this->unknown_03C4 != -1) { return this->unknown_03C4; } @@ -2444,21 +2444,21 @@ int CGameActor::GetEffectiveJob(int job) { job = this->unknown_025C; } - if (StateFlag12(this->Slot13())) { + if (StateFlag12(this->GetStateFlags())) { return JT_MARRIED; } - if (!StateFlag15(this->Slot13())) { - if (StateFlag16(this->Slot13())) { + if (!StateFlag15(this->GetStateFlags())) { + if (StateFlag16(this->GetStateFlags())) { return JT_SANTA; } - if (StateFlag18(this->Slot13())) { + if (StateFlag18(this->GetStateFlags())) { return JT_SUMMER; } - if (StateFlag27(this->Slot13())) { + if (StateFlag27(this->GetStateFlags())) { return JT_HANBOK; } - if (StateFlag28(this->Slot13())) { + if (StateFlag28(this->GetStateFlags())) { return JT_OKTOBERFEST; } if (this->unknown_03DC == 1) { @@ -2466,7 +2466,7 @@ int CGameActor::GetEffectiveJob(int job) { } } - if (StateFlag05(this->Slot13())) { + if (StateFlag05(this->GetStateFlags())) { switch (job) { case JT_KNIGHT: return JT_CHICKEN; @@ -2491,7 +2491,7 @@ int CGameActor::GetEffectiveJob(int job) { } } - if (StateFlag19(this->Slot13())) { + if (StateFlag19(this->GetStateFlags())) { switch (job) { case JT_RUNE_KNIGHT: return JT_RUNE_CHICKEN; @@ -2502,28 +2502,28 @@ int CGameActor::GetEffectiveJob(int job) { case JT_DRAGON_KNIGHT: return JT_DRAGON_KNIGHT_CHICKEN; } - } else if (StateFlag23(this->Slot13())) { + } else if (StateFlag23(this->GetStateFlags())) { if (job == JT_RUNE_KNIGHT) { return JT_RUNE_CHICKEN2; } if (job == JT_RUNE_KNIGHT_H) { return JT_RUNE_CHICKEN2_H; } - } else if (StateFlag24(this->Slot13())) { + } else if (StateFlag24(this->GetStateFlags())) { if (job == JT_RUNE_KNIGHT) { return JT_RUNE_CHICKEN3; } if (job == JT_RUNE_KNIGHT_H) { return JT_RUNE_CHICKEN3_H; } - } else if (StateFlag25(this->Slot13())) { + } else if (StateFlag25(this->GetStateFlags())) { if (job == JT_RUNE_KNIGHT) { return JT_RUNE_CHICKEN4; } if (job == JT_RUNE_KNIGHT_H) { return JT_RUNE_CHICKEN4_H; } - } else if (StateFlag26(this->Slot13())) { + } else if (StateFlag26(this->GetStateFlags())) { if (job == JT_RUNE_KNIGHT) { return JT_RUNE_CHICKEN5; } @@ -2532,7 +2532,7 @@ int CGameActor::GetEffectiveJob(int job) { } } - if (StateFlag21(this->Slot13())) { + if (StateFlag21(this->GetStateFlags())) { switch (job) { case JT_RANGER: return JT_WOLF_RANGER; @@ -2545,7 +2545,7 @@ int CGameActor::GetEffectiveJob(int job) { } } - if (this->Slot56() != 0) { + if (this->GetMadogearType() != 0) { switch (job) { case JT_MECHANIC: return JT_MADOGEAR; @@ -2558,7 +2558,7 @@ int CGameActor::GetEffectiveJob(int job) { } } - if (StateFlag15(this->Slot13())) { + if (StateFlag15(this->GetStateFlags())) { switch (job) { case JT_STAR: return JT_STAR2; @@ -2578,7 +2578,7 @@ int CGameActor::GetEffectiveJob(int job) { // OFFSET: 0x00CCCAF0 // FUNCTION: fn_21199 -void CGameActor::Slot39(int value) { +void CGameActor::SetModifyFactorOfmotionSpeed(int value) { if (value > g_maxMoveSpeed) { value = g_maxMoveSpeed; } @@ -2589,57 +2589,57 @@ void CGameActor::Slot39(int value) { // OFFSET: 0x005A1A30 // FUNCTION: fn_03067 -void CGameActor::Slot19(int, int, int, int, int, int, int, int, int, int, int) { +void CGameActor::SetSprActFull(int, int, int, int, int, int, int, int, int, int, int) { } // OFFSET: 0x005A1A20 // FUNCTION: fn_03066 -void CGameActor::Slot20(int, int, int, int, int, int, int, int, int, int, int) { +void CGameActor::SetSprAct2(int, int, int, int, int, int, int, int, int, int, int) { } // OFFSET: 0x005A19F0 // FUNCTION: fn_03063 -void CGameActor::Slot26(int) { +void CGameActor::SetSprAccessory2(int) { } // OFFSET: 0x005A1A00 // FUNCTION: fn_03064 -void CGameActor::Slot27(int) { +void CGameActor::SetSprAccessory3(int) { } // OFFSET: 0x005A1980 // FUNCTION: fn_03056 -void CGameActor::Slot31() { +void CGameActor::SetHeadPaletteName() { } // OFFSET: 0x005A1970 // FUNCTION: fn_03055 -void CGameActor::Slot34(int) { +void CGameActor::SetHeadPalette(int) { } // OFFSET: 0x005A1A50 // FUNCTION: fn_03069 -void CNpc::Slot22(int) { +void CNpc::SetSprHead(int) { } // OFFSET: 0x005A1A10 // FUNCTION: fn_03065 -void CNpc::Slot25(int) { +void CNpc::SetSprAccessory(int) { } // OFFSET: 0x005A1AB0 // FUNCTION: fn_03075 -void CNpc::Slot23(int, int) { +void CNpc::SetSprWeapon(int, int) { } // OFFSET: 0x005A19A0 // FUNCTION: fn_03058 -void CNpc::Slot30() { +void CNpc::SetImfFileName() { } // OFFSET: 0x005A1A60 // FUNCTION: fn_03070 -void CCharacterNpc::Slot21(int) { +void CCharacterNpc::SetSprJob(int) { } // OFFSET: 0x005A13E0 @@ -2742,7 +2742,7 @@ void CCharacterNpc::SendMsg( case 4: this->EffectActor::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0); this->render.visible = IsVisibleJob(info->job) ? 1 : 0; - this->Slot49(info->unknown_0060, info->unknown_0064); + this->SetGuildInfo(info->unknown_0060, info->unknown_0064); if (this->unknown_0440 != nullptr) { return; } @@ -2807,8 +2807,8 @@ void CGameActor::SetUnknown03B8(int value, int slot) { } if (value > 0) { - this->Slot21(value); - this->Slot15(this->render.unknown_0070, 1); + this->SetSprJob(value); + this->SetState(this->render.unknown_0070, 1); return; } @@ -2819,9 +2819,9 @@ void CGameActor::SetUnknown03B8(int value, int slot) { job = this->GetUnknown0404Job(); } - this->Slot32(); - this->Slot21(job); - this->Slot15(this->render.unknown_0070, 1); + this->SetBodyPaletteName(); + this->SetSprJob(job); + this->SetState(this->render.unknown_0070, 1); } // OFFSET: 0x00CC46D0 @@ -2914,7 +2914,7 @@ void CGameActor::SetUnknown008C(const std::uint32_t* value) { // OFFSET: 0x00CC41E0 // FUNCTION: fn_21159 -void CGameActor::Slot17() { +void CGameActor::UnRegisterPos() { g_modeMgr.GetGameMode()->SendMsg(13, this->render.accountId, 0, 0, 0); } @@ -2926,8 +2926,8 @@ void CGameActor::SetUnknown03C4(int value) { if (value <= 0) { value = this->GetEffectiveJob(-1); } - this->Slot21(value); - this->Slot15(this->render.unknown_0070, 1); + this->SetSprJob(value); + this->SetState(this->render.unknown_0070, 1); } // OFFSET: 0x00CABDE0 @@ -3345,7 +3345,7 @@ int CGameActor::WeaponActionBase(int weaponType) { base = 40; break; case 13: - base = IsJobWeaponAllowed(this->GetEffectiveJob(-1), this->unknown_0260, this->Slot35()) ? 88 : 80; + base = IsJobWeaponAllowed(this->GetEffectiveJob(-1), this->unknown_0260, this->GetWeapon()) ? 88 : 80; break; case 16: case 17: @@ -3451,7 +3451,7 @@ C3dGrannyGameActor::C3dGrannyGameActor(const char* name) { // OFFSET: 0x00CC7ED0 // FUNCTION: fn_21189 -void C3dGrannyGameActor::Slot18(int job, int value, int) { +void C3dGrannyGameActor::SetSprAct(int job, int value, int) { this->SetActorJob(job); this->SetUnknown0260(value); this->model = static_cast(ResourceMgr::Instance().Load(this->name)); @@ -3488,13 +3488,13 @@ void C3dGrannyGameActor::Slot18(int job, int value, int) { // OFFSET: 0x00CC5650 // FUNCTION: fn_21176 -int C3dGrannyGameActor::Slot37() { +int C3dGrannyGameActor::GetAttackMotion() { return 0; } // OFFSET: 0x00CC5D70 // FUNCTION: fn_21181 -void C3dGrannyGameActor::Slot36() { +void C3dGrannyGameActor::ProcessMotionWithDist() { } // OFFSET: 0x00CC5B00 @@ -3672,9 +3672,9 @@ void CGameActor::ProcessHitMessage(CGameObject*, const ActorHitInfo* info, int, this->unknown_0178 = 0; } - this->Slot39(attackSpeed); + this->SetModifyFactorOfmotionSpeed(attackSpeed); if (info->targetAid != this->render.accountId) { - this->Slot15(2, 1); + this->SetState(2, 1); } this->Face(x, z); @@ -3820,20 +3820,20 @@ void CGameActor::ProcessHitMessage(CGameObject*, const ActorHitInfo* info, int, break; } case 1: - this->Slot15(5, 1); + this->SetState(5, 1); return; case 2: - this->Slot15(6, 1); + this->SetState(6, 1); return; case 3: - this->Slot15(0, 1); + this->SetState(0, 1); return; } } // OFFSET: 0x00CC5C70 // FUNCTION: fn_21180 -void C3dGrannyGameActor::Slot08() { +void C3dGrannyGameActor::ProcessMotion() { this->render.isMotionFinished = this->render.unknown_0070 != 2; if (this->render.unknown_0070 != 2 || !(this->render.motionSpeed < 1.0f)) { return; @@ -4232,7 +4232,7 @@ void C3dGrannyGameActor::RenderShadowed(int argument) { CTexture* meshTexture; if (mesh == 1) { - const std::string name = g_guildMgr->GetEmblemFilename(this->Slot50()); + const std::string name = g_guildMgr->GetEmblemFilename(this->GetGdid()); CEmblemRes* emblem = static_cast(ResourceMgr::Instance().Load(name)); if (emblem != nullptr) { if (this->emblemTexture == nullptr) { @@ -4268,7 +4268,7 @@ void CGameActor::SetCharm(int type, int count) { this->SendMsg(this, 0x6D, 0, 0x2E2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); this->SendMsg(this, 0x6D, 0, 0x2DF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); this->SendMsg(this, 0x6D, 0, 0x2E0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - if (count <= 0 || StateFlag01(this->Slot13()) || StateFlag02(this->Slot13())) { + if (count <= 0 || StateFlag01(this->GetStateFlags()) || StateFlag02(this->GetStateFlags())) { return; } @@ -4555,7 +4555,7 @@ void CGameActor::SetActorJob(int job) { slotJob = this->unknown_025C; } - this->Slot21(slotJob); + this->SetSprJob(slotJob); this->ResetJobEffects(); this->UpdateMaxLevelAura(); } @@ -4581,14 +4581,14 @@ void CGameActor::RefreshGuildEmblemWindow() { } CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); - const int emblemVersion = g_guildMgr->GetEmblemVersion(static_cast(this->Slot50())); - mode->ShowGuildEmblem(this, this->Slot50(), emblemVersion); + const int emblemVersion = g_guildMgr->GetEmblemVersion(static_cast(this->GetGdid())); + mode->ShowGuildEmblem(this, this->GetGdid(), emblemVersion); } // OFFSET: 0x00CC4640 // FUNCTION: fn_21165 void CGameActor::NotifyCellMove(const float* x, const float* z) { - if (this->Slot50() < 1) { + if (this->GetGdid() < 1) { return; } @@ -4609,7 +4609,7 @@ void CGameActor::NotifyCellMove(const float* x, const float* z) { // OFFSET: 0x00CC5750 // FUNCTION: fn_21177 -void C3dGrannyGameActor::Slot38() { +void C3dGrannyGameActor::MakeCorpse() { static_cast(g_modeMgr.GetGameMode())->SpawnGrannyCorpse( this->render.position.x, this->render.position.y, this->render.position.z, this->angle, this->name ); @@ -4623,13 +4623,13 @@ void CGameActor::ApplyNatureProtection() { } this->unknown_0408 = this->unknown_0404; - this->Slot15(0x51, 1); + this->SetState(0x51, 1); this->render.isMotionFreezed = true; this->render.unknown_0114 = 1; this->unknown_0404 = 3; - this->Slot21(this->unknown_025C); - const int costume = this->Slot56(); - const int costumeJob = this->Slot46(); + this->SetSprJob(this->unknown_025C); + const int costume = this->GetMadogearType(); + const int costumeJob = this->GetBodyCostume(); this->render.name = g_equipmentResourceMgr->GetBodyPalName( this->GetEffectiveJob(-1), this->unknown_0260, static_cast(this->render.unknown_0048), costumeJob, costume, 0 ); @@ -4690,12 +4690,12 @@ __declspec(noinline) void CGameActor::ProcessActorEffects() { // OFFSET: 0x00CC59B0 // FUNCTION: fn_21178 bool C3dGrannyGameActor::OnProcess() { - this->Slot08(); + this->ProcessMotion(); this->ProcessViewCheck(); this->ProcessActorEffects(); this->UpdateHpGauge(); - const bool result = this->Slot14(); + const bool result = this->ProcessState(); float facing = this->render.angle; if (facing > 360.0f) { @@ -5278,12 +5278,12 @@ void CGameActor::SetStatusStates(int bodyState, std::uint32_t stateFlags, int ef // OFFSET: 0x005A1950 // FUNCTION: fn_45475 -void CGameActor::Slot32() { +void CGameActor::SetBodyPaletteName() { } // OFFSET: 0x005A1940 // FUNCTION: fn_45476 -void CGameActor::Slot33(int) { +void CGameActor::SetBodyPalette(int) { } // OFFSET: 0x00CCA380 @@ -5339,7 +5339,7 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i } if (skillId == 2288 || skillId == 5316 || skillId == 5322 || CSkillActionMgr::GetInstance()->ActionSlot07(skillId)) { - this->Slot59(true); + this->SetArrowEffectSuppressed(true); } switch (type) { @@ -5446,7 +5446,7 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i int motion; g_session.GetSkillActionInfo2(skillId, castEffect, motion); if (skillId != 2256 && skillId != 2257 && skillId != 490 && skillId != 3009 && !CSkillActionMgr::GetInstance()->ActionSlot05(skillId)) { - this->Slot39(attackSpeed); + this->SetModifyFactorOfmotionSpeed(attackSpeed); } bool keepMotion; @@ -5474,7 +5474,7 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i break; } if (!keepMotion) { - this->Slot15(motion, 1); + this->SetState(motion, 1); } if (ShowsCastEffect(skillId) && level != -2) { diff --git a/Source/Contents/Actors/RenderObject.h b/Source/Contents/Actors/RenderObject.h index 107b6d390..1bcb0d504 100644 --- a/Source/Contents/Actors/RenderObject.h +++ b/Source/Contents/Actors/RenderObject.h @@ -37,23 +37,23 @@ public: virtual void SetTlvert(float x, float y); virtual void SetAction(unsigned animation, int motion, int repeat); - virtual void Slot08(); - virtual bool Slot09( + virtual void ProcessMotion(); + virtual bool PrepareSprite( int layer, int index, float distanceScale, const SpriteFrameCell& cell, float x, float y, const float* position, float scale, float* bottomRhw, float* topRhw, const SpriteRleImage* image, SpriteQuad* quad, int* box, std::uint32_t* color, int offsetX, int offsetY, int flags ); - virtual void Slot10( + virtual void RenderBlur( const SpriteFrameCell* cell, const int* box, float shiftX, float bottomRhw, float topRhw, const std::uint32_t* palette, const SpriteRleImage* image, float scale, short hover ); - virtual void Slot11( + virtual void RenderAura( SpriteQuad* quad, const SpriteFrameCell* cell, const int* box, float shiftX, float bottomRhw, float topRhw, const std::uint32_t* palette, const SpriteRleImage* image, int blend, short hover ); - virtual void Slot12(SpriteQuad* quad, const int* box, float shiftX, int first, int second); + virtual void ApplySpriteJitter(SpriteQuad* quad, const int* box, float shiftX, int first, int second); // INLINED - virtual std::uint32_t Slot13() { + virtual std::uint32_t GetStateFlags() { return 0; } static float __stdcall Heading(float x, float z, float targetX, float targetZ); diff --git a/Source/Contents/Actors/Skill.cpp b/Source/Contents/Actors/Skill.cpp index 48b78a71f..ccffd9e34 100644 --- a/Source/Contents/Actors/Skill.cpp +++ b/Source/Contents/Actors/Skill.cpp @@ -648,7 +648,7 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int if (source != nullptr) { CreateHallucinationPc( source->GetEffectiveJob(-1), source->unknown_0260, source->unknown_0440, &this->render.position, 180, source->render.unknown_0048, - source->unknown_0444, source->Slot46() + source->unknown_0444, source->GetBodyCostume() ); } return; @@ -769,7 +769,7 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int } CEffect* effect = g_effectMgr->Spawn(this->render.accountId, static_cast(effectId), position.x, position.y, position.z, 0, unit->level, 0, 0); if (effect != nullptr) { - effect->Slot17(90.0f); + effect->SetAngle(90.0f); static_cast(effect)->followCamera = 1; } } @@ -809,11 +809,11 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int g_effectMgr->Spawn(this->render.accountId, 0x8A1, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(this->render.accountId, 0x8A2, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } effect = g_effectMgr->Spawn(this->render.accountId, 0x8A3, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } return; } @@ -822,11 +822,11 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int g_effectMgr->Spawn(this->render.accountId, 0x8A9, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(this->render.accountId, 0x8AA, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } effect = g_effectMgr->Spawn(this->render.accountId, 0x8AB, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } return; } @@ -835,11 +835,11 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int g_effectMgr->Spawn(this->render.accountId, 0x8B1, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(this->render.accountId, 0x8B2, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } effect = g_effectMgr->Spawn(this->render.accountId, 0x8B3, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } return; } @@ -848,11 +848,11 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int g_effectMgr->Spawn(this->render.accountId, 0x8B9, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* effect = g_effectMgr->Spawn(this->render.accountId, 0x8BA, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } effect = g_effectMgr->Spawn(this->render.accountId, 0x8BB, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect != nullptr) { - effect->Slot16(10); + effect->SetDelay(10); } return; } diff --git a/Source/Contents/Camera/Camera.h b/Source/Contents/Camera/Camera.h index bd913d3fb..6596bd033 100644 --- a/Source/Contents/Camera/Camera.h +++ b/Source/Contents/Camera/Camera.h @@ -26,7 +26,7 @@ public: CView(); virtual ~CView(); virtual void Reset(); - virtual void Slot2(); + virtual void OnExitFrame(); virtual void Render(); virtual void Update(); diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index b44e3af1d..00b143b6f 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -109,7 +109,7 @@ public: void UpdateExpiry(Timestamp* expiry) override; void ShowExpiry(__time32_t expiry) override; - int Slot53(int packId, bool showTooltip, bool hoverable) override; + int SetPack(int packId, bool showTooltip, bool hoverable) override; protected: /* 00E0 */ ICashEmotionAction* m_selectAction; @@ -151,11 +151,11 @@ class UICashEmotionPack_Unpurchase : public UICashEmotionPack { public: explicit __declspec(noinline) UICashEmotionPack_Unpurchase(); void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(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; - int Slot53(int packId, bool showTooltip, bool hoverable) override; + int SetPack(int packId, bool showTooltip, bool hoverable) override; __declspec(noinline) void SetPressed(bool pressed, bool force); @@ -179,8 +179,8 @@ protected: class UICashEmotionScrollWnd : public UIScrollWnd { public: __declspec(noinline) UICashEmotionScrollWnd(int width, int height, unsigned char cached); - void Slot15(int width, int height) override; - void Slot53() override; + void OnCreate(int width, int height) override; + void UpdateScrollRange() override; void AddChild(UIWindow* child); void UpdateScrollBars(); @@ -189,7 +189,7 @@ public: class UICashEmotionListChildWnd_Abstract : public UICashEmotionScrollWnd { public: __declspec(noinline) UICashEmotionListChildWnd_Abstract(int width, int height, unsigned char cached); - void Slot35(int delta) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; virtual void Refresh(const char* filter) = 0; virtual const char* Filter() = 0; @@ -198,8 +198,8 @@ public: class UICashEmotionListChildWnd_Basic : public UICashEmotionListChildWnd_Abstract { public: __declspec(noinline) UICashEmotionListChildWnd_Basic(int width, int height, unsigned char cached); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() 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 Refresh(const char* filter) override; @@ -215,7 +215,7 @@ class UICashEmotionListChildWnd_Purchase : public UICashEmotionListChildWnd_Abst public: __declspec(noinline) UICashEmotionListChildWnd_Purchase(int width, int height); ~UICashEmotionListChildWnd_Purchase() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() 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 Refresh(const char* filter) override; @@ -233,7 +233,7 @@ class UICashEmotionListChildWnd_Search : public UICashEmotionListChildWnd_Abstra public: __declspec(noinline) UICashEmotionListChildWnd_Search(int width, int height); ~UICashEmotionListChildWnd_Search() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() 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 Refresh(const char* filter) override; @@ -250,7 +250,7 @@ protected: class UICashEmotionListChildWnd_UnPurchased : public UICashEmotionListChildWnd_Abstract { public: __declspec(noinline) UICashEmotionListChildWnd_UnPurchased(int width, int height); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() 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 Refresh(const char* filter) override; @@ -275,9 +275,9 @@ static_assert(sizeof(CashEmotionPurchasePacket) == 7); class UICashEmotionListWnd : public UIFrameWnd { public: UICashEmotionListWnd(); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -314,7 +314,7 @@ class UICashEmotionMiniWnd : public UIWindow { public: UICashEmotionMiniWnd(); ~UICashEmotionMiniWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -1669,13 +1669,13 @@ __declspec(noinline) void UICashEmotionScrollWnd::UpdateScrollBars() { UIWindow::AddChild(this->scrollBar); } - this->Slot53(); + this->UpdateScrollRange(); this->Invalidate(); } // OFFSET: 0x007C3AD0 // FUNCTION: fn_09344 -void UICashEmotionListChildWnd_Abstract::Slot35(int delta) { +void UICashEmotionListChildWnd_Abstract::OnWheel(int delta) { if (this->wheelScroll == 1) { if (delta < 0) { this->SendMsg(this->scrollBar, 7, 15, 0, 0, 0); @@ -1719,7 +1719,7 @@ UICashEmotionListChildWnd_Basic::UICashEmotionListChildWnd_Basic(int width, int : UICashEmotionListChildWnd_Abstract(width, height, cached) { this->m_selectAction = new (std::nothrow) CCashEmotionAction_Play(); this->m_playAction = new (std::nothrow) CCashEmotionAction_Register(); - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x007C4100 @@ -1784,7 +1784,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_Basic::Refresh(const char* f // OFFSET: 0x007C4440 // FUNCTION: fn_09353 -void UICashEmotionListChildWnd_Basic::Slot15(int, int) { +void UICashEmotionListChildWnd_Basic::OnCreate(int, int) { this->Refresh(nullptr); } @@ -1796,10 +1796,10 @@ void UICashEmotionListChildWnd_Basic::Paint() { // OFFSET: 0x007C4460 // FUNCTION: fn_09355 -void UICashEmotionListChildWnd_Basic::Slot19() { +void UICashEmotionListChildWnd_Basic::OnProcess() { for (UIWindow* item : this->m_items) { if (item->geometry.visible) { - item->Slot19(); + item->OnProcess(); } } } @@ -1829,7 +1829,7 @@ int UICashEmotionListChildWnd_Basic::SendMsg(UIWindow* sender, int message, std: UICashEmotionListChildWnd_Purchase::UICashEmotionListChildWnd_Purchase(int width, int height) : UICashEmotionListChildWnd_Abstract(width, height, 0) { this->unknown_00BC = new (std::nothrow) CCashEmotionAction_Play(); - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x007C4AD0 @@ -1880,7 +1880,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_Purchase::Refresh(const char continue; } pack->SetSize(243, 159); - height = pack->Slot53(packId, true, true); + height = pack->SetPack(packId, true, true); } pack->SetSaleBadge(info->unknown_0028); @@ -1907,7 +1907,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_Purchase::Refresh(const char // OFFSET: 0x007C5290 // FUNCTION: fn_09368 -void UICashEmotionListChildWnd_Purchase::Slot15(int, int) { +void UICashEmotionListChildWnd_Purchase::OnCreate(int, int) { this->Refresh(nullptr); } @@ -1949,7 +1949,7 @@ void UICashEmotionListChildWnd_Purchase::UpdateExpiry(int packId, Timestamp* exp UICashEmotionListChildWnd_Search::UICashEmotionListChildWnd_Search(int width, int height) : UICashEmotionListChildWnd_Abstract(width, height, 0) { this->m_action = new (std::nothrow) CCashEmotionAction_Play(); - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x007C5720 @@ -2026,7 +2026,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_Search::Refresh(const char* // OFFSET: 0x007C5D80 // FUNCTION: fn_09383 -void UICashEmotionListChildWnd_Search::Slot15(int, int) { +void UICashEmotionListChildWnd_Search::OnCreate(int, int) { this->Refresh(nullptr); } @@ -2052,7 +2052,7 @@ int UICashEmotionListChildWnd_Search::SendMsg(UIWindow* sender, int message, std // FUNCTION: fn_09389 UICashEmotionListChildWnd_UnPurchased::UICashEmotionListChildWnd_UnPurchased(int width, int height) : UICashEmotionListChildWnd_Abstract(width, height, 0) { - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x007C6520 @@ -2095,7 +2095,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_UnPurchased::Refresh(const c continue; } pack->SetSize(243, 159); - height = pack->Slot53(packId, false, false); + height = pack->SetPack(packId, false, false); } pack->SetSaleBadge(info->unknown_0028); @@ -2122,7 +2122,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_UnPurchased::Refresh(const c // OFFSET: 0x007C6AA0 // FUNCTION: fn_09394 -void UICashEmotionListChildWnd_UnPurchased::Slot15(int, int) { +void UICashEmotionListChildWnd_UnPurchased::OnCreate(int, int) { this->Refresh(nullptr); } @@ -2181,7 +2181,7 @@ UIBitmapButton* UICashEmotionListWnd::CreateButton(int x, int y, int width, int // OFFSET: 0x007C74D0 // FUNCTION: fn_09406 -void UICashEmotionListWnd::Slot15(int width, int height) { +void UICashEmotionListWnd::OnCreate(int width, int height) { this->AddCloseButton("Alt+L", 0); if (UIBitmapButton* base = this->AddBaseButton()) { base->Move(32, 3); @@ -2284,9 +2284,9 @@ void UICashEmotionListWnd::Paint() { // OFFSET: 0x007C7CC0 // FUNCTION: fn_09410 -void UICashEmotionListWnd::Slot19() { +void UICashEmotionListWnd::OnProcess() { if (this->m_currentList) { - this->m_currentList->Slot19(); + this->m_currentList->OnProcess(); } } @@ -2589,7 +2589,7 @@ void UICashEmotionListWnd::SetTab(char tab) { g_windowMgr.SetFocus(nullptr); } - this->m_searchEdit->Slot24(0); + this->m_searchEdit->OnFinishEdit(0); this->m_searchEdit->disabled = basic; this->m_searchEdit->Invalidate(); if (basic) { @@ -2626,7 +2626,7 @@ void UICashEmotionListWnd::StartExpirySchedule() { // OFFSET: 0x007C8AF0 // FUNCTION: fn_09420 -void UICashEmotionListWnd::Slot11() { +void UICashEmotionListWnd::StoreInfo() { if (this->m_placement) { this->m_placement->x = this->geometry.x; this->m_placement->y = this->geometry.y; @@ -2742,7 +2742,7 @@ void UICashEmotionMiniWnd::Refresh(int first) { // OFFSET: 0x007C94A0 // FUNCTION: fn_09431 -void UICashEmotionMiniWnd::Slot15(int width, int height) { +void UICashEmotionMiniWnd::OnCreate(int width, int height) { int x = 24; for (UICashEmotionPiece*& piece : this->m_pieces) { piece = new (std::nothrow) UICashEmotionPiece(); @@ -2981,7 +2981,7 @@ std::string UICashEmotionPack::GetPriceText(int packId) { // OFFSET: 0x007CA2C0 // FUNCTION: fn_09444 -int UICashEmotionPack::Slot53(int packId, bool showTooltip, bool hoverable) { +int UICashEmotionPack::SetPack(int packId, bool showTooltip, bool hoverable) { this->unknown_00A8 = packId; if (this->unknown_0088) { this->unknown_0088->SetTextFitted(g_cashEmotionMgr->GetPackTitle(packId)); @@ -3033,7 +3033,7 @@ int UICashEmotionPack::Slot53(int packId, bool showTooltip, bool hoverable) { // OFFSET: 0x007CA550 // FUNCTION: fn_09445 -void UICashEmotionPack::Slot15(int, int) { +void UICashEmotionPack::OnCreate(int, int) { auto* priceText = new (std::nothrow) UIStaticText(); this->unknown_0088 = priceText; if (priceText) { @@ -3081,34 +3081,34 @@ void UICashEmotionPack::Paint() { // OFFSET: 0x007CA760 // FUNCTION: fn_09447 -void UICashEmotionPack::Slot26(int, int) { +void UICashEmotionPack::OnLBtnDblClk(int, int) { } // OFFSET: 0x007CA770 // FUNCTION: fn_09448 -void UICashEmotionPack::Slot25(int, int) { +void UICashEmotionPack::OnLBtnDown(int, int) { } // OFFSET: 0x007CA780 // FUNCTION: fn_09449 -void UICashEmotionPack::Slot27(int, int) { +void UICashEmotionPack::OnMouseMove(int, int) { } // OFFSET: 0x007CA790 // FUNCTION: fn_09450 -void UICashEmotionPack::Slot19() { +void UICashEmotionPack::OnProcess() { for (UICashEmotionPiece* piece : this->m_pieces) { if (piece) { - piece->Slot19(); + piece->OnProcess(); } } } // OFFSET: 0x007CA7C0 // FUNCTION: fn_09451 -void UICashEmotionPack::Slot35(int argument) { +void UICashEmotionPack::OnWheel(int argument) { if (this->parent) { - this->parent->Slot35(argument); + this->parent->OnWheel(argument); } } @@ -3208,8 +3208,8 @@ void UICashEmotionPack_Purchase::UpdateExpiry(Timestamp* expiry) { // OFFSET: 0x007CAEA0 // FUNCTION: fn_09461 -int UICashEmotionPack_Purchase::Slot53(int packId, bool showTooltip, bool hoverable) { - return UICashEmotionPack::Slot53(packId, showTooltip, hoverable); +int UICashEmotionPack_Purchase::SetPack(int packId, bool showTooltip, bool hoverable) { + return UICashEmotionPack::SetPack(packId, showTooltip, hoverable); } // OFFSET: 0x007CAEB0 @@ -3366,8 +3366,8 @@ UICashEmotionPack_Unpurchase::UICashEmotionPack_Unpurchase() : UICashEmotionPack // OFFSET: 0x007CB790 // FUNCTION: fn_09473 -int UICashEmotionPack_Unpurchase::Slot53(int packId, bool showTooltip, bool hoverable) { - const int height = UICashEmotionPack::Slot53(packId, showTooltip, hoverable); +int UICashEmotionPack_Unpurchase::SetPack(int packId, bool showTooltip, bool hoverable) { + const int height = UICashEmotionPack::SetPack(packId, showTooltip, hoverable); this->unknown_00E4 = this->GetPriceText(packId); return height; } @@ -3383,7 +3383,7 @@ void UICashEmotionPack_Unpurchase::Paint() { // OFFSET: 0x007CB890 // FUNCTION: fn_09475 -void UICashEmotionPack_Unpurchase::Slot26(int, int) { +void UICashEmotionPack_Unpurchase::OnLBtnDblClk(int, int) { if (!this->m_pressed && this->parent) { this->parent->SendMsg(this, 171, this->unknown_00A8, 0, 0, 0); } @@ -3391,7 +3391,7 @@ void UICashEmotionPack_Unpurchase::Slot26(int, int) { // OFFSET: 0x007CB8C0 // FUNCTION: fn_09476 -void UICashEmotionPack_Unpurchase::Slot25(int, int) { +void UICashEmotionPack_Unpurchase::OnLBtnDown(int, int) { if (!this->m_pressed && this->parent) { this->parent->SendMsg(this, 171, this->unknown_00A8, 0, 0, 0); } @@ -3470,7 +3470,7 @@ void UICashEmotionPiece::Set(int packId, int emotionId, bool showTooltip, bool h // OFFSET: 0x007CBC70 // FUNCTION: fn_09482 -void UICashEmotionPiece::Slot15(int width, int height) { +void UICashEmotionPiece::OnCreate(int width, int height) { this->m_button = new (std::nothrow) UICashEmotionSprBtn(this); if (this->m_button) { this->m_button->SetSize(width, height); @@ -3495,7 +3495,7 @@ void UICashEmotionPiece::Paint() { // OFFSET: 0x007CBDA0 // FUNCTION: fn_09484 -void UICashEmotionPiece::Slot26(int, int) { +void UICashEmotionPiece::OnLBtnDblClk(int, int) { if (this->parent) { this->parent->SendMsg(this, 175, this->m_packId, this->m_emotionId, 0, 0); } @@ -3503,7 +3503,7 @@ void UICashEmotionPiece::Slot26(int, int) { // OFFSET: 0x007CBDD0 // FUNCTION: fn_09485 -void UICashEmotionPiece::Slot47() { +void UICashEmotionPiece::OnMouseEnter() { this->m_hovered = true; if (this->m_hoverable) { this->SendMsg(this, 60, 0, 0, 0, 0); @@ -3512,7 +3512,7 @@ void UICashEmotionPiece::Slot47() { // OFFSET: 0x007CBE00 // FUNCTION: fn_09486 -void UICashEmotionPiece::Slot48() { +void UICashEmotionPiece::OnMouseLeave() { this->m_hovered = false; if (this->m_hoverable) { this->SendMsg(this, 60, 0, 0, 0, 0); @@ -3521,7 +3521,7 @@ void UICashEmotionPiece::Slot48() { // OFFSET: 0x007CBE30 // FUNCTION: fn_09487 -void UICashEmotionPiece::Slot19() { +void UICashEmotionPiece::OnProcess() { if (this->m_button && this->m_button->unknown_00C4 != 0) { this->m_button->Invalidate(); } @@ -3529,9 +3529,9 @@ void UICashEmotionPiece::Slot19() { // OFFSET: 0x007CBE50 // FUNCTION: fn_09488 -void UICashEmotionPiece::Slot35(int argument) { +void UICashEmotionPiece::OnWheel(int argument) { if (this->parent) { - this->parent->Slot35(argument); + this->parent->OnWheel(argument); } } @@ -3672,7 +3672,7 @@ void UICashEmotionScrollWnd::AddChild(UIWindow* child) { // OFFSET: 0x007CC5D0 // FUNCTION: fn_09496 -void UICashEmotionScrollWnd::Slot15(int, int) { +void UICashEmotionScrollWnd::OnCreate(int, int) { this->RemoveChild(this->horizontalBar, 1); this->RemoveChild(this->scrollBar, 1); this->horizontalBar = nullptr; @@ -3682,8 +3682,8 @@ void UICashEmotionScrollWnd::Slot15(int, int) { // OFFSET: 0x007CC620 // FUNCTION: fn_09497 -void UICashEmotionScrollWnd::Slot53() { - UIScrollWnd::Slot53(); +void UICashEmotionScrollWnd::UpdateScrollRange() { + UIScrollWnd::UpdateScrollRange(); UIScrollBar* bar = this->scrollBar; if (bar) { bar->Show(1); @@ -3821,7 +3821,7 @@ __declspec(noinline) void UICashEmotionSprBtn::SetSelected(bool selected) { // OFFSET: 0x007CCD90 // FUNCTION: fn_09502 -void UICashEmotionSprBtn::Slot28(int x, int y) { +void UICashEmotionSprBtn::OnMouseHover(int x, int y) { if (!this->m_tooltip.empty()) { int screenX = 0; int screenY = -20; @@ -3833,7 +3833,7 @@ void UICashEmotionSprBtn::Slot28(int x, int y) { } if (!this->m_disabled) { - this->Slot27(x, y); + this->OnMouseMove(x, y); } } @@ -4008,63 +4008,63 @@ void UISpriteButton::Paint() { // OFFSET: 0x0085E9B0 // FUNCTION: fn_10834 -void UISpriteButton2::Slot26(int x, int y) { - this->Slot25(x, y); +void UISpriteButton2::OnLBtnDblClk(int x, int y) { + this->OnLBtnDown(x, y); if (this->m_target) { - this->m_target->Slot26(this->geometry.x + x, this->geometry.y + y); + this->m_target->OnLBtnDblClk(this->geometry.x + x, this->geometry.y + y); } } // OFFSET: 0x0085E9F0 // FUNCTION: fn_10835 -void UISpriteButton::Slot26(int x, int y) { - this->Slot25(x, y); - this->Root()->Slot26(this->geometry.x + x, this->geometry.y + y); +void UISpriteButton::OnLBtnDblClk(int x, int y) { + this->OnLBtnDown(x, y); + this->Root()->OnLBtnDblClk(this->geometry.x + x, this->geometry.y + y); } // OFFSET: 0x0085F160 // FUNCTION: fn_10857 -void UISpriteButton2::Slot47() { +void UISpriteButton2::OnMouseEnter() { if (this->m_target) { - this->m_target->Slot47(); + this->m_target->OnMouseEnter(); } } // OFFSET: 0x0085F480 // FUNCTION: fn_10863 -void UISpriteButton2::Slot28(int x, int y) { - UIButton::Slot28(x, y); +void UISpriteButton2::OnMouseHover(int x, int y) { + UIButton::OnMouseHover(x, y); if (this->m_target) { - this->m_target->Slot28(this->geometry.x + x, this->geometry.y + y); + this->m_target->OnMouseHover(this->geometry.x + x, this->geometry.y + y); } } // OFFSET: 0x0085F4C0 // FUNCTION: fn_10864 -void UISpriteButton::Slot28(int x, int y) { - UIButton::Slot28(x, y); - this->Root()->Slot28(this->geometry.x + x, this->geometry.y + y); +void UISpriteButton::OnMouseHover(int x, int y) { + UIButton::OnMouseHover(x, y); + this->Root()->OnMouseHover(this->geometry.x + x, this->geometry.y + y); } // OFFSET: 0x0085F5E0 // FUNCTION: fn_10867 -void UISpriteButton2::Slot48() { +void UISpriteButton2::OnMouseLeave() { if (this->m_target) { - this->m_target->Slot48(); + this->m_target->OnMouseLeave(); } } // OFFSET: 0x0085F870 // FUNCTION: fn_10871 -void UISpriteButton::Slot27(int x, int y) { - this->Root()->Slot27(this->geometry.x + x, this->geometry.y + y); +void UISpriteButton::OnMouseMove(int x, int y) { + this->Root()->OnMouseMove(this->geometry.x + x, this->geometry.y + y); } // OFFSET: 0x0085FFF0 // FUNCTION: fn_10895 -void UISpriteButton2::Slot35(int argument) { +void UISpriteButton2::OnWheel(int argument) { if (this->m_target) { - this->m_target->Slot35(argument); + this->m_target->OnWheel(argument); } } diff --git a/Source/Contents/ChampionMonsterMgr.cpp b/Source/Contents/ChampionMonsterMgr.cpp index 0aa7b5105..3bc57a76a 100644 --- a/Source/Contents/ChampionMonsterMgr.cpp +++ b/Source/Contents/ChampionMonsterMgr.cpp @@ -95,7 +95,7 @@ int CChampionMonsterMgr::ApplyEffects(int id, CGameActor* actor, int aid) { } std::vector& effects = it->second.m_effects; - if (actor->render.visible && actor->render.enabled && !StateFlag02(actor->Slot13())) { + if (actor->render.visible && actor->render.enabled && !StateFlag02(actor->GetStateFlags())) { for (unsigned int i = 0; i < effects.size(); ++i) { if (g_effectMgr->Find(aid, effects[i]) == nullptr) { const vector3d& position = actor->render.position; diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp index eff39091b..65015307f 100644 --- a/Source/Contents/ClientState.cpp +++ b/Source/Contents/ClientState.cpp @@ -209,7 +209,7 @@ std::uint32_t CSession::ReadReplayStats(const std::vector& data) offset += header.bytes; CPlayer* player = static_cast(g_modeMgr.GetGameMode())->scene->player; if (player) { - player->Slot57(this->unknown_8074); + player->SetMadogearType(this->unknown_8074); player->SendMsg(nullptr, this->unknown_8074 ? 105 : 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } break; diff --git a/Source/Contents/EffectResourceSwitcher.cpp b/Source/Contents/EffectResourceSwitcher.cpp index a66c4c0be..199ec2d42 100644 --- a/Source/Contents/EffectResourceSwitcher.cpp +++ b/Source/Contents/EffectResourceSwitcher.cpp @@ -51,38 +51,38 @@ void EffectResourceSwitcher::RetireEffects() { // OFFSET: 0x005A2110 // FUNCTION: fn_03083 -void CEffect::Slot10(int) { +void CEffect::SetDestinationBlend(int) { } // OFFSET: 0x005A2120 // FUNCTION: fn_03084 -void CEffect::Slot08(int, int, int) { +void CEffect::SetColor(int, int, int) { } // OFFSET: 0x005A2130 // FUNCTION: fn_03085 -void CEffect::Slot11(std::string) { +void CEffect::SetParticleTexture(std::string) { } // OFFSET: 0x005A2140 // FUNCTION: fn_03086 -void CEffect::Slot09(int) { +void CEffect::SetSourceBlend(int) { } // OFFSET: 0x005A2160 // FUNCTION: fn_03088 -void CEffect::Slot31() { +void CEffect::EnableTimeLimit() { } // OFFSET: 0x005A2170 // FUNCTION: fn_03089 -vector3d CEffect::Slot25() { +vector3d CEffect::GetWindowOffset() { return vector3d{0.0f, 0.0f, 0.0f}; } // OFFSET: 0x005A2190 // FUNCTION: fn_03090 -int CEffect::Slot28() { +int CEffect::GetFrame() { return 0; } @@ -97,7 +97,7 @@ void EffectResourceSwitcher::Start() { // OFFSET: 0x005A21C0 // FUNCTION: fn_03092 -void CEffect::Slot01() { +void CEffect::Open() { } // OFFSET: 0x005A21D0 @@ -123,17 +123,17 @@ void EffectResourceSwitcher::SetNames(const std::string& source, const std::stri // OFFSET: 0x005A22E0 // FUNCTION: fn_03094 -void CEffect::Slot12() { +void CEffect::InitEvents() { } // OFFSET: 0x005A22F0 // FUNCTION: fn_03095 -void CEffect::Slot07() { +void CEffect::ResetParticles() { } // OFFSET: 0x005A2300 // FUNCTION: fn_03096 -bool EffectResourceSwitcher::Slot06() { +bool EffectResourceSwitcher::IsAlive() { if (!this->effect) { return false; } @@ -147,7 +147,7 @@ bool EffectResourceSwitcher::Slot06() { // OFFSET: 0x005A2330 // FUNCTION: fn_03097 -void EffectResourceSwitcher::Slot03() { +void EffectResourceSwitcher::OnProcess() { if (!this->effect || !this->active || !this->effect->IsFinished()) { return; } @@ -165,90 +165,90 @@ void EffectResourceSwitcher::Slot03() { // OFFSET: 0x005A2430 // FUNCTION: fn_03098 -void CEffect::Slot04() { +void CEffect::Render() { } // OFFSET: 0x005A2440 // FUNCTION: fn_03099 -void CEffect::Slot00(int) { +void CEffect::SetRenderFunc(int) { } // OFFSET: 0x005A2450 // FUNCTION: fn_03100 -void CEffect::Slot23(float) { +void CEffect::SetAlpha(float) { } // OFFSET: 0x005A2460 // FUNCTION: fn_03101 -void CEffect::Slot24(int, int, int, int, int) { +void CEffect::SetWindowOffset(int, int, int, int, int) { } // OFFSET: 0x005A2470 // FUNCTION: fn_03102 -void CEffect::Slot26(int) { +void CEffect::SetFlipX(int) { } // OFFSET: 0x005A2480 // FUNCTION: fn_03103 -void CEffect::Slot27(int) { +void CEffect::SetFlipY(int) { } // OFFSET: 0x005A2490 // FUNCTION: fn_03104 -void CEffect::Slot21(int) { +void CEffect::SetFlags(int) { } // OFFSET: 0x005A24A0 // FUNCTION: fn_03105 -void CEffect::Slot32() { +void CEffect::EnableGroundRender() { } // OFFSET: 0x005A24B0 // FUNCTION: fn_03106 -void CEffect::Slot15(int) { +void CEffect::SetRepeat(int) { } // OFFSET: 0x005A24C0 // FUNCTION: fn_03107 -void CEffect::Slot14(int) { +void CEffect::SetLifeTime(int) { } // OFFSET: 0x005A24D0 // FUNCTION: fn_03108 -void CEffect::Slot17(float) { +void CEffect::SetAngle(float) { } // OFFSET: 0x005A24E0 // FUNCTION: fn_03109 -void CEffect::Slot18(float) { +void CEffect::SetPitch(float) { } // OFFSET: 0x005A24F0 // FUNCTION: fn_03110 -void CEffect::Slot19(float) { +void CEffect::SetYaw(float) { } // OFFSET: 0x005A2500 // FUNCTION: fn_03111 -void CEffect::Slot22(float) { +void CEffect::SetScale(float) { } // OFFSET: 0x005A2510 // FUNCTION: fn_03112 -void CEffect::Slot13(int) { +void CEffect::AdvanceFrame(int) { } // OFFSET: 0x005A2520 // FUNCTION: fn_03113 -void EffectResourceSwitcher::Slot16(int argument) { +void EffectResourceSwitcher::SetDelay(int argument) { if (this->effect) { - this->effect->Slot16(argument); + this->effect->SetDelay(argument); } } // OFFSET: 0x005A2540 // FUNCTION: fn_03114 -void CEffect::Slot20(int) { +void CEffect::SetResource(int) { } // OFFSET: 0x005A2630 @@ -274,7 +274,7 @@ __declspec(noinline) bool CEZ2STREffectEx::IsFinished() { // OFFSET: 0x006FFA20 // FUNCTION: fn_06968 -void CEZ2STREffectEx::Slot01() { +void CEZ2STREffectEx::Open() { EZ2STREffectInfo* info = CEZ2STREffectMgr::GetInstance()->FindById(this->id); if (!info) { return; @@ -323,7 +323,7 @@ void CEZ2STREffectEx::Slot01() { // OFFSET: 0x006FFBF0 // FUNCTION: fn_06969 -bool CEZ2STREffectEx::Slot06() { +bool CEZ2STREffectEx::IsAlive() { EZ2STREmitter* emitter = this->emitter; if (!emitter) { return false; @@ -334,7 +334,7 @@ bool CEZ2STREffectEx::Slot06() { } if (emitter->looping == 1) { - return CEffect::Slot06(); + return CEffect::IsAlive(); } if (emitter->lifetime == 0.0f) { @@ -346,7 +346,7 @@ bool CEZ2STREffectEx::Slot06() { // OFFSET: 0x006FFC60 // FUNCTION: fn_06970 -void CEZ2STREffectEx::Slot03() { +void CEZ2STREffectEx::OnProcess() { if (!this->emitter) { return; } @@ -386,7 +386,7 @@ void CEZ2STREffectEx::Slot03() { // OFFSET: 0x006FFEA0 // FUNCTION: fn_06971 -void CEZ2STREffectEx::Slot04() { +void CEZ2STREffectEx::Render() { if (!this->emitter) { return; } @@ -400,7 +400,7 @@ void CEZ2STREffectEx::Slot04() { // OFFSET: 0x006FFEF0 // FUNCTION: fn_06972 -void CEZ2STREffectEx::Slot23(float argument) { +void CEZ2STREffectEx::SetAlpha(float argument) { if (this->emitter) { this->emitter->remainingTime = argument; } @@ -408,7 +408,7 @@ void CEZ2STREffectEx::Slot23(float argument) { // OFFSET: 0x006FFF10 // FUNCTION: fn_06973 -void CEZ2STREffectEx::Slot26(int argument) { +void CEZ2STREffectEx::SetFlipX(int argument) { if (this->emitter) { this->emitter->unknown_3FE8 = static_cast(argument); } @@ -416,7 +416,7 @@ void CEZ2STREffectEx::Slot26(int argument) { // OFFSET: 0x006FFF30 // FUNCTION: fn_06974 -void CEZ2STREffectEx::Slot27(int argument) { +void CEZ2STREffectEx::SetFlipY(int argument) { if (this->emitter) { this->emitter->unknown_3FE9 = static_cast(argument); } @@ -433,13 +433,13 @@ __declspec(noinline) void CEZ2STREffectEx::EndLoop(unsigned char fadeOut) { // OFFSET: 0x006FFF80 // FUNCTION: fn_06976 -void CEZ2STREffectEx::Slot32() { +void CEZ2STREffectEx::EnableGroundRender() { this->alternateRender = 1; } // OFFSET: 0x006FFF90 // FUNCTION: fn_06977 -void CEZ2STREffectEx::Slot14(int argument) { +void CEZ2STREffectEx::SetLifeTime(int argument) { if (this->emitter) { this->emitter->unknown_3F98 = argument; } @@ -447,7 +447,7 @@ void CEZ2STREffectEx::Slot14(int argument) { // OFFSET: 0x006FFFB0 // FUNCTION: fn_06978 -void CEZ2STREffectEx::Slot17(float argument) { +void CEZ2STREffectEx::SetAngle(float argument) { if (this->emitter) { this->emitter->unknown_3FA4 = argument; } @@ -455,7 +455,7 @@ void CEZ2STREffectEx::Slot17(float argument) { // OFFSET: 0x006FFFD0 // FUNCTION: fn_06979 -void CEZ2STREffectEx::Slot18(float argument) { +void CEZ2STREffectEx::SetPitch(float argument) { if (this->emitter) { this->emitter->unknown_3FA8 = argument; } @@ -463,7 +463,7 @@ void CEZ2STREffectEx::Slot18(float argument) { // OFFSET: 0x006FFFF0 // FUNCTION: fn_06980 -void CEZ2STREffectEx::Slot19(float argument) { +void CEZ2STREffectEx::SetYaw(float argument) { if (this->emitter) { this->emitter->unknown_3FAC = argument; } @@ -471,7 +471,7 @@ void CEZ2STREffectEx::Slot19(float argument) { // OFFSET: 0x00700010 // FUNCTION: fn_06981 -void CEZ2STREffectEx::Slot22(float argument) { +void CEZ2STREffectEx::SetScale(float argument) { if (this->emitter) { this->emitter->unknown_3FB0 = argument; } @@ -479,7 +479,7 @@ void CEZ2STREffectEx::Slot22(float argument) { // OFFSET: 0x00700030 // FUNCTION: fn_06982 -void CEZ2STREffectEx::Slot16(int argument) { +void CEZ2STREffectEx::SetDelay(int argument) { if (this->emitter) { this->emitter->duration = argument; } diff --git a/Source/Contents/EffectResourceSwitcher.h b/Source/Contents/EffectResourceSwitcher.h index c2413c85a..ac113267d 100644 --- a/Source/Contents/EffectResourceSwitcher.h +++ b/Source/Contents/EffectResourceSwitcher.h @@ -68,9 +68,9 @@ public: this->RetireEffects(); } - void Slot03() override; - bool Slot06() override; - void Slot16(int argument) override; + void OnProcess() override; + bool IsAlive() override; + void SetDelay(int argument) override; void Start(); void SetNames(const std::string& source, const std::string& target); diff --git a/Source/Contents/Effects/AMachineEffect.cpp b/Source/Contents/Effects/AMachineEffect.cpp index 674436538..726e48a4b 100644 --- a/Source/Contents/Effects/AMachineEffect.cpp +++ b/Source/Contents/Effects/AMachineEffect.cpp @@ -13,7 +13,7 @@ CAMachineEffect::CAMachineEffect() : CEffect(-1), unknown_00D4(0) { // OFFSET: 0x006F6A50 // FUNCTION: fn_06851 -void CAMachineEffect::Slot01() { +void CAMachineEffect::Open() { this->retained = 1; CEZ2STRParticle* particle = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); @@ -50,7 +50,7 @@ void CAMachineEffect::Close() { // OFFSET: 0x006F6DB0 // FUNCTION: fn_06853 -void CAMachineEffect::Slot03() { +void CAMachineEffect::OnProcess() { const int key = this->unknown_00D4; std::map::iterator it = this->unknown_00CC.find(key); if (it == this->unknown_00CC.end()) { @@ -80,7 +80,7 @@ void CAMachineEffect::Slot03() { // OFFSET: 0x006F7000 // FUNCTION: fn_06854 -void CAMachineEffect::Slot04() { +void CAMachineEffect::Render() { const int key = this->unknown_00D4; std::map::iterator it = this->unknown_00CC.find(key); if (it == this->unknown_00CC.end()) { @@ -97,7 +97,7 @@ void CAMachineEffect::Slot04() { // OFFSET: 0x006F6DA0 // FUNCTION: fn_06852 -bool CAMachineEffect::Slot06() { +bool CAMachineEffect::IsAlive() { return this->ActorExists(); } diff --git a/Source/Contents/Effects/AMachineEffect.h b/Source/Contents/Effects/AMachineEffect.h index e7fa8624c..522b39ae5 100644 --- a/Source/Contents/Effects/AMachineEffect.h +++ b/Source/Contents/Effects/AMachineEffect.h @@ -12,11 +12,11 @@ class CAMachineEffect : public CEffect { public: CAMachineEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void PlayAttack(); __declspec(noinline) void SetState(int state); diff --git a/Source/Contents/Effects/AcidifiedThrow.cpp b/Source/Contents/Effects/AcidifiedThrow.cpp index 7fe76dbb2..55983776f 100644 --- a/Source/Contents/Effects/AcidifiedThrow.cpp +++ b/Source/Contents/Effects/AcidifiedThrow.cpp @@ -39,7 +39,7 @@ void CAcidifiedThrow::Close() { // OFFSET: 0x006F37D0 // FUNCTION: fn_06824 -void CAcidifiedThrow::Slot01() { +void CAcidifiedThrow::Open() { this->unknown_00CC = reinterpret_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); this->unknown_00D0[0] = reinterpret_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); this->unknown_00D0[1] = reinterpret_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 13)); @@ -92,13 +92,13 @@ void CAcidifiedThrow::Slot01() { // OFFSET: 0x006F3F90 // FUNCTION: fn_06825 -bool CAcidifiedThrow::Slot06() { +bool CAcidifiedThrow::IsAlive() { return this->active; } // OFFSET: 0x006F3FA0 // FUNCTION: fn_06826 -void CAcidifiedThrow::Slot03() { +void CAcidifiedThrow::OnProcess() { CRenderObject* actor = FindRenderObject(this->actor); if (!actor) { this->active = false; @@ -225,7 +225,7 @@ void CAcidifiedThrow::Slot03() { // OFFSET: 0x006F4790 // FUNCTION: fn_06827 -void CAcidifiedThrow::Slot04() { +void CAcidifiedThrow::Render() { if (this->unknown_00CC) { reinterpret_cast(this->unknown_00CC)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); return; diff --git a/Source/Contents/Effects/AcidifiedThrow.h b/Source/Contents/Effects/AcidifiedThrow.h index cd64bd08e..6149cc4d0 100644 --- a/Source/Contents/Effects/AcidifiedThrow.h +++ b/Source/Contents/Effects/AcidifiedThrow.h @@ -12,11 +12,11 @@ class CAcidifiedThrow : public CEffect { public: CAcidifiedThrow(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ EZ2STREmitter* unknown_00CC; /* 00D0 */ EZ2STREmitter* unknown_00D0[3]; diff --git a/Source/Contents/Effects/AnimatedEmitterEffect.cpp b/Source/Contents/Effects/AnimatedEmitterEffect.cpp index e9ea59e4b..fd07df655 100644 --- a/Source/Contents/Effects/AnimatedEmitterEffect.cpp +++ b/Source/Contents/Effects/AnimatedEmitterEffect.cpp @@ -22,7 +22,7 @@ CAnimatedEmitterEffect::CAnimatedEmitterEffect() { // OFFSET: 0x006FA0F0 // FUNCTION: fn_06890 -void CAnimatedEmitterEffect::Slot01() { +void CAnimatedEmitterEffect::Open() { this->frames[0].push_back(std::string("EFFECT\\shockwave_a.bmp")); this->frames[0].push_back(std::string("EFFECT\\shockwave_b.bmp")); this->frames[0].push_back(std::string("EFFECT\\shockwave_c.bmp")); @@ -33,7 +33,7 @@ void CAnimatedEmitterEffect::Slot01() { this->frames[1].push_back(std::string("EFFECT\\plazma_c.bmp")); this->frames[1].push_back(std::string("EFFECT\\plazma_a.bmp")); this->frames[1].push_back(std::string("EFFECT\\plazma_b.bmp")); - CEmitterEffect::Slot01(); + CEmitterEffect::Open(); } // OFFSET: 0x006FA7C0 diff --git a/Source/Contents/Effects/AnimatedEmitterEffect.h b/Source/Contents/Effects/AnimatedEmitterEffect.h index 4d7ae69ba..15ffc9d29 100644 --- a/Source/Contents/Effects/AnimatedEmitterEffect.h +++ b/Source/Contents/Effects/AnimatedEmitterEffect.h @@ -12,7 +12,7 @@ class CParticle; class CAnimatedEmitterEffect : public CEmitterEffect { public: CAnimatedEmitterEffect(); - void Slot01() override; + void Open() override; void InitParticle(CParticle* particle) override; void UpdateParticle(CParticle* particle) override; diff --git a/Source/Contents/Effects/AstralStrikeEffect.cpp b/Source/Contents/Effects/AstralStrikeEffect.cpp index e6169a917..78fbcfb31 100644 --- a/Source/Contents/Effects/AstralStrikeEffect.cpp +++ b/Source/Contents/Effects/AstralStrikeEffect.cpp @@ -110,19 +110,19 @@ void CAstralStrikeEffect::Close() { // OFFSET: 0x006F54A0 // FUNCTION: fn_06833 -void CAstralStrikeEffect::Slot01() { +void CAstralStrikeEffect::Open() { this->Init(); } // OFFSET: 0x006F54B0 // FUNCTION: fn_06834 -bool CAstralStrikeEffect::Slot06() { +bool CAstralStrikeEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x006F54C0 // FUNCTION: fn_06835 -void CAstralStrikeEffect::Slot03() { +void CAstralStrikeEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end();) { if (IsParticleActive(*it) == true) { if (*it) { @@ -157,7 +157,7 @@ void CAstralStrikeEffect::Slot03() { // OFFSET: 0x006F5760 // FUNCTION: fn_06836 -void CAstralStrikeEffect::Slot04() { +void CAstralStrikeEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { (*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/AstralStrikeEffect.h b/Source/Contents/Effects/AstralStrikeEffect.h index 49939a690..fca1d426d 100644 --- a/Source/Contents/Effects/AstralStrikeEffect.h +++ b/Source/Contents/Effects/AstralStrikeEffect.h @@ -12,11 +12,11 @@ class CAstralStrikeEffect : public CEffect { public: CAstralStrikeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void Init(); void SpawnStrike(); diff --git a/Source/Contents/Effects/AxeBoomerang.cpp b/Source/Contents/Effects/AxeBoomerang.cpp index 2ab2d198a..978313e6f 100644 --- a/Source/Contents/Effects/AxeBoomerang.cpp +++ b/Source/Contents/Effects/AxeBoomerang.cpp @@ -35,7 +35,7 @@ void CAxeBoomerang::Close() { // OFFSET: 0x006F5A70 // FUNCTION: fn_06840 -void CAxeBoomerang::Slot01() { +void CAxeBoomerang::Open() { CEZ2STRParticle* particle = static_cast(CreateEZ2STRParticle(&this->unknown_00DC, 5)); if (this->id == 0x887) { particle->Load(std::string("shield_shooting\\shield_shooting\\shield_shooting.str")); @@ -55,13 +55,13 @@ void CAxeBoomerang::Slot01() { // OFFSET: 0x006F5CD0 // FUNCTION: fn_06841 -bool CAxeBoomerang::Slot06() { +bool CAxeBoomerang::IsAlive() { return this->unknown_00D0 != 0; } // OFFSET: 0x006F5CE0 // FUNCTION: fn_06842 -void CAxeBoomerang::Slot03() { +void CAxeBoomerang::OnProcess() { if (this->unknown_00CC) { CRenderObject* actor = FindRenderObject(this->actor); if (!actor) { @@ -126,7 +126,7 @@ void CAxeBoomerang::Slot03() { // OFFSET: 0x006F63F0 // FUNCTION: fn_06843 -void CAxeBoomerang::Slot04() { +void CAxeBoomerang::Render() { CEZ2STRParticle* particle = reinterpret_cast(this->unknown_00CC); if (particle) { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); diff --git a/Source/Contents/Effects/AxeBoomerang.h b/Source/Contents/Effects/AxeBoomerang.h index 96066aada..1710c9fe3 100644 --- a/Source/Contents/Effects/AxeBoomerang.h +++ b/Source/Contents/Effects/AxeBoomerang.h @@ -12,11 +12,11 @@ class CAxeBoomerang : public CEffect { public: CAxeBoomerang(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ EZ2STREmitter* unknown_00CC; /* 00D0 */ unsigned char unknown_00D0; diff --git a/Source/Contents/Effects/Bash.cpp b/Source/Contents/Effects/Bash.cpp index 2c80fd029..eae5dc661 100644 --- a/Source/Contents/Effects/Bash.cpp +++ b/Source/Contents/Effects/Bash.cpp @@ -33,7 +33,7 @@ void CBash::Close() { // OFFSET: 0x00B422E0 // FUNCTION: fn_18870 -void CBash::Slot01() { +void CBash::Open() { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); RenderVertex screen; screen.x = 0.0f; @@ -96,13 +96,13 @@ void CBash::Slot01() { // OFFSET: 0x00B42600 // FUNCTION: fn_18871 -bool CBash::Slot06() { +bool CBash::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B42720 // FUNCTION: fn_18872 -void CBash::Slot03() { +void CBash::OnProcess() { for (auto it = this->rays.begin(); it != this->rays.end(); ++it) { CParticle* particle = *it; float* values = &particle->unknown_0054; @@ -152,7 +152,7 @@ void CBash::Slot03() { // OFFSET: 0x00B42C40 // FUNCTION: fn_18873 -void CBash::Slot04() { +void CBash::Render() { for (auto it = this->rays.begin(); it != this->rays.end(); ++it) { CParticle* particle = *it; const int angle = static_cast(*reinterpret_cast(&particle->unknown_00C4)); diff --git a/Source/Contents/Effects/Bash.h b/Source/Contents/Effects/Bash.h index 4037f89cd..fccfa80bc 100644 --- a/Source/Contents/Effects/Bash.h +++ b/Source/Contents/Effects/Bash.h @@ -10,11 +10,11 @@ class CParticle; class CBash : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector rays; /* 00D8 */ std::vector sparks; diff --git a/Source/Contents/Effects/BezierArcThrowEffect.cpp b/Source/Contents/Effects/BezierArcThrowEffect.cpp index f80be672a..aa11a3667 100644 --- a/Source/Contents/Effects/BezierArcThrowEffect.cpp +++ b/Source/Contents/Effects/BezierArcThrowEffect.cpp @@ -38,7 +38,7 @@ void CBezierArcThrowEffect::Close() { // OFFSET: 0x007AB2C0 // FUNCTION: fn_09108 -void CBezierArcThrowEffect::Slot01() { +void CBezierArcThrowEffect::Open() { this->m_particle = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); if (this->m_particle) { this->m_particle->Load(this->m_name); @@ -53,7 +53,7 @@ void CBezierArcThrowEffect::Slot01() { // OFFSET: 0x007AB340 // FUNCTION: fn_09110 -void CBezierArcThrowEffect::Slot03() { +void CBezierArcThrowEffect::OnProcess() { if (!this->m_active) { return; } @@ -118,7 +118,7 @@ void CBezierArcThrowEffect::Slot03() { // OFFSET: 0x007AB800 // FUNCTION: fn_09111 -void CBezierArcThrowEffect::Slot04() { +void CBezierArcThrowEffect::Render() { if (this->m_particle) { this->m_particle->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } diff --git a/Source/Contents/Effects/BezierArcThrowEffect.h b/Source/Contents/Effects/BezierArcThrowEffect.h index 805bf3097..07e06a3e6 100644 --- a/Source/Contents/Effects/BezierArcThrowEffect.h +++ b/Source/Contents/Effects/BezierArcThrowEffect.h @@ -18,11 +18,11 @@ public: /* 00D8 */ std::string m_name; /* 00F0 */ vector3d m_target; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override { return this->m_active; } + bool IsAlive() override { return this->m_active; } void SetTarget(const vector3d& target); }; diff --git a/Source/Contents/Effects/BindTrapEffect.cpp b/Source/Contents/Effects/BindTrapEffect.cpp index e127d2c23..f08d38823 100644 --- a/Source/Contents/Effects/BindTrapEffect.cpp +++ b/Source/Contents/Effects/BindTrapEffect.cpp @@ -48,7 +48,7 @@ void CBindTrapEffect::Close() { // OFFSET: 0x006FB5F0 // FUNCTION: fn_06908 -void CBindTrapEffect::Slot01() { +void CBindTrapEffect::Open() { switch (this->id) { case 1069: this->AddParticle(0); @@ -64,13 +64,13 @@ void CBindTrapEffect::Slot01() { // OFFSET: 0x006FB620 // FUNCTION: fn_06909 -bool CBindTrapEffect::Slot06() { +bool CBindTrapEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x006FB630 // FUNCTION: fn_06910 -void CBindTrapEffect::Slot03() { +void CBindTrapEffect::OnProcess() { for (CParticle* particle : this->particles) { particle->position.x = this->position[0]; particle->position.y = this->position[1]; @@ -97,7 +97,7 @@ void CBindTrapEffect::Slot03() { // OFFSET: 0x006FB8B0 // FUNCTION: fn_06911 -void CBindTrapEffect::Slot04() { +void CBindTrapEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/BindTrapEffect.h b/Source/Contents/Effects/BindTrapEffect.h index 01012fe8b..88db840b9 100644 --- a/Source/Contents/Effects/BindTrapEffect.h +++ b/Source/Contents/Effects/BindTrapEffect.h @@ -11,11 +11,11 @@ class CParticle; class CBindTrapEffect : public CEffect { public: CBindTrapEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddParticle(int index); /* 00CC */ std::vector particles; diff --git a/Source/Contents/Effects/BlastForge.cpp b/Source/Contents/Effects/BlastForge.cpp index b7e9b7400..19a5b04b0 100644 --- a/Source/Contents/Effects/BlastForge.cpp +++ b/Source/Contents/Effects/BlastForge.cpp @@ -54,7 +54,7 @@ void CBlastForge::Close() { // OFFSET: 0x006F7870 // FUNCTION: fn_06862 -void CBlastForge::Slot01() { +void CBlastForge::Open() { this->retained = 1; this->unknown_00DC = (this->unknown_00DC == 0); this->unknown_00CC = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); @@ -72,13 +72,13 @@ void CBlastForge::Slot01() { // OFFSET: 0x006F7A20 // FUNCTION: fn_06863 -bool CBlastForge::Slot06() { +bool CBlastForge::IsAlive() { return this->ActorExists(); } // OFFSET: 0x006F7A30 // FUNCTION: fn_06864 -void CBlastForge::Slot03() { +void CBlastForge::OnProcess() { if (this->unknown_00CC) { this->unknown_00CC->position.x = this->position[0]; this->unknown_00CC->position.y = this->position[1]; @@ -130,7 +130,7 @@ void CBlastForge::Slot03() { // OFFSET: 0x006F7EA0 // FUNCTION: fn_06865 -void CBlastForge::Slot04() { +void CBlastForge::Render() { if (!this->unknown_00D4) { if (this->unknown_00CC) { this->unknown_00CC->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/BlastForge.h b/Source/Contents/Effects/BlastForge.h index 55767e0cf..7c4b95057 100644 --- a/Source/Contents/Effects/BlastForge.h +++ b/Source/Contents/Effects/BlastForge.h @@ -11,11 +11,11 @@ class CBlastForge : public CEffect { public: CBlastForge(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void RestartBlastParticles(); void ProcessBlastParticles(); diff --git a/Source/Contents/Effects/CaneOfEvilEyeEffect.cpp b/Source/Contents/Effects/CaneOfEvilEyeEffect.cpp index 30abec7da..7fe12a62f 100644 --- a/Source/Contents/Effects/CaneOfEvilEyeEffect.cpp +++ b/Source/Contents/Effects/CaneOfEvilEyeEffect.cpp @@ -161,7 +161,7 @@ void CCaneOfEvilEyeEffect::Finish() { // OFFSET: 0x006F9130 // FUNCTION: fn_06878 -void CCaneOfEvilEyeEffect::Slot01() { +void CCaneOfEvilEyeEffect::Open() { this->retained = 1; std::vector offsets; @@ -184,7 +184,7 @@ void CCaneOfEvilEyeEffect::Slot01() { // OFFSET: 0x006F9340 // FUNCTION: fn_06879 -bool CCaneOfEvilEyeEffect::Slot06() { +bool CCaneOfEvilEyeEffect::IsAlive() { if (this->ActorExists() && (!this->unknown_00D0.empty() || !this->unknown_00DC.empty())) { return true; } @@ -226,7 +226,7 @@ void CCaneOfEvilEyeEffect::UpdateEyes() { // OFFSET: 0x006F95D0 // FUNCTION: fn_06881 -void CCaneOfEvilEyeEffect::Slot03() { +void CCaneOfEvilEyeEffect::OnProcess() { this->RemoveNullEmitters(); this->UpdateEyes(); @@ -306,7 +306,7 @@ void CCaneOfEvilEyeEffect::UpdateLights() { // OFFSET: 0x006F9D40 // FUNCTION: fn_06882 -void CCaneOfEvilEyeEffect::Slot04() { +void CCaneOfEvilEyeEffect::Render() { for (auto it = this->unknown_00D0.begin(); it != this->unknown_00D0.end(); ++it) { if (*it) { (*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/CaneOfEvilEyeEffect.h b/Source/Contents/Effects/CaneOfEvilEyeEffect.h index 0d7529cbe..0874af6bd 100644 --- a/Source/Contents/Effects/CaneOfEvilEyeEffect.h +++ b/Source/Contents/Effects/CaneOfEvilEyeEffect.h @@ -12,11 +12,11 @@ class CCaneOfEvilEyeEffect : public CEffect { public: CCaneOfEvilEyeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; CEZ2STRParticle* CreateEye(int type, const float* position); CEZ2STRParticle* CreateLight(int type, const float* position); diff --git a/Source/Contents/Effects/CartCannon.cpp b/Source/Contents/Effects/CartCannon.cpp index 48a39c52f..1b04fe935 100644 --- a/Source/Contents/Effects/CartCannon.cpp +++ b/Source/Contents/Effects/CartCannon.cpp @@ -32,7 +32,7 @@ void CCartCannon::Close() { // OFFSET: 0x006FAA90 // FUNCTION: fn_06897 -void CCartCannon::Slot01() { +void CCartCannon::Open() { this->currentPosition.x = this->position[0]; this->currentPosition.y = this->position[1]; this->currentPosition.z = this->position[2]; @@ -106,7 +106,7 @@ void CCartCannon::Slot01() { // OFFSET: 0x006FAEC0 // FUNCTION: fn_06898 -bool CCartCannon::Slot06() { +bool CCartCannon::IsAlive() { if (static_cast(this->currentStep) > 10.0f / this->speed) { return false; } @@ -116,7 +116,7 @@ bool CCartCannon::Slot06() { // OFFSET: 0x006FAEF0 // FUNCTION: fn_06899 -void CCartCannon::Slot03() { +void CCartCannon::OnProcess() { if (this->delay > 0) { this->delay -= 16; return; @@ -141,7 +141,7 @@ void CCartCannon::Slot03() { // OFFSET: 0x006FB080 // FUNCTION: fn_06900 -void CCartCannon::Slot04() { +void CCartCannon::Render() { if (this->particle) { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); this->particle->DrawScreen(mode->camera->frame.view); @@ -150,6 +150,6 @@ void CCartCannon::Slot04() { // OFFSET: 0x006FB0E0 // FUNCTION: fn_06901 -void CCartCannon::Slot16(int delay) { +void CCartCannon::SetDelay(int delay) { this->delay = delay; } diff --git a/Source/Contents/Effects/CartCannon.h b/Source/Contents/Effects/CartCannon.h index e4ae84099..34139662d 100644 --- a/Source/Contents/Effects/CartCannon.h +++ b/Source/Contents/Effects/CartCannon.h @@ -11,13 +11,13 @@ class CCartCannon : public CEffect { public: CCartCannon(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; - void Slot16(int delay) override; + void SetDelay(int delay) override; /* 00CC */ CEZ2STRParticle* particle; /* 00D0 */ int currentStep; diff --git a/Source/Contents/Effects/CellRangeEffect.cpp b/Source/Contents/Effects/CellRangeEffect.cpp index ece07d52e..e0950c457 100644 --- a/Source/Contents/Effects/CellRangeEffect.cpp +++ b/Source/Contents/Effects/CellRangeEffect.cpp @@ -68,7 +68,7 @@ void CCellRangeEffect::Close() { // OFFSET: 0x00B43420 // FUNCTION: fn_18878 -void CCellRangeEffect::Slot01() { +void CCellRangeEffect::Open() { CSkill* owner = static_cast(FindRenderObject(this->actor)); if (!owner) { return; @@ -95,7 +95,7 @@ void CCellRangeEffect::Slot01() { // OFFSET: 0x00B43520 // FUNCTION: fn_18880 -void CCellRangeEffect::Slot03() { +void CCellRangeEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -132,7 +132,7 @@ void CCellRangeEffect::Slot03() { // OFFSET: 0x00B43920 // FUNCTION: fn_18881 -void CCellRangeEffect::Slot04() { +void CCellRangeEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/CellRangeEffect.h b/Source/Contents/Effects/CellRangeEffect.h index 255d8f0d1..7f7629b22 100644 --- a/Source/Contents/Effects/CellRangeEffect.h +++ b/Source/Contents/Effects/CellRangeEffect.h @@ -11,11 +11,11 @@ class CParticle; class CCellRangeEffect : public CEffect { public: CCellRangeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override { + bool IsAlive() override { return this->ActorExists(); } __declspec(noinline) void SetCellTexture(CParticle* particle); diff --git a/Source/Contents/Effects/ChangeSizeEffect.cpp b/Source/Contents/Effects/ChangeSizeEffect.cpp index ea4c614e8..782d60da4 100644 --- a/Source/Contents/Effects/ChangeSizeEffect.cpp +++ b/Source/Contents/Effects/ChangeSizeEffect.cpp @@ -7,5 +7,5 @@ CChangeSizeEffect::CChangeSizeEffect() : CEffect(0x946) { // OFFSET: 0x00703050 // FUNCTION: fn_07016 -void CChangeSizeEffect::Slot03() { +void CChangeSizeEffect::OnProcess() { } diff --git a/Source/Contents/Effects/ChangeSizeEffect.h b/Source/Contents/Effects/ChangeSizeEffect.h index 799222bff..66397b87d 100644 --- a/Source/Contents/Effects/ChangeSizeEffect.h +++ b/Source/Contents/Effects/ChangeSizeEffect.h @@ -7,7 +7,7 @@ class CChangeSizeEffect : public CEffect { public: CChangeSizeEffect(); - void Slot03() override; + void OnProcess() override; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Effects/CharacterParticleBundle.cpp b/Source/Contents/Effects/CharacterParticleBundle.cpp index 882ced48c..fe3e1b27c 100644 --- a/Source/Contents/Effects/CharacterParticleBundle.cpp +++ b/Source/Contents/Effects/CharacterParticleBundle.cpp @@ -68,7 +68,7 @@ CharacterParticleBundle::~CharacterParticleBundle() { // OFFSET: 0x005A3360 // FUNCTION: fn_03129 -void CChopChopClawMarks::Slot36(CEZ2STRParticle* particle) { +void CChopChopClawMarks::UpdateParticlePosition(CEZ2STRParticle* particle) { if (particle) { const float* view = static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values; const float* inverse = static_cast(g_modeMgr.GetGameMode())->camera->frame.inverse.values; @@ -122,7 +122,7 @@ void CChopChopClawMarks::SpawnParticle() { // OFFSET: 0x005A3820 // FUNCTION: fn_03132 -void CChopChopClawMarks::Slot34() { +void CChopChopClawMarks::EmitParticles() { const std::chrono::nanoseconds elapsed = std::chrono::steady_clock::now().time_since_epoch() - std::chrono::nanoseconds(this->startTime); const std::chrono::milliseconds milliseconds = std::chrono::duration_cast(elapsed); if (milliseconds >= std::chrono::milliseconds(this->lastSpawnTime + 30)) { @@ -166,7 +166,7 @@ const std::vector& CChopChopClawMarks::GetRing(int radius) { // OFFSET: 0x005A3C70 // FUNCTION: fn_03135 -void CChopChopClawMarks::Slot35() { +void CChopChopClawMarks::OnInit() { const int id = CEZ2STREffectMgr::GetInstance()->EffectId([] { const std::uint8_t bytes[] = {0xC2, 0x55, 0xF0, 0xA7, 0x3C, 0xEC, 0x4F, 0x36, 0xD1, 0x3D}; thread_local EncryptedName name(bytes); @@ -180,20 +180,20 @@ void CChopChopClawMarks::Slot35() { // OFFSET: 0x005A3E40 // FUNCTION: fn_03136 -void CharacterParticleBundle::Slot35() { +void CharacterParticleBundle::OnInit() { } // OFFSET: 0x005A3E50 // FUNCTION: fn_03137 -void CharacterParticleBundle::Slot01() { +void CharacterParticleBundle::Open() { this->unknown_00D8 = 0; this->startTime = std::chrono::steady_clock::now().time_since_epoch().count(); - this->Slot35(); + this->OnInit(); } // OFFSET: 0x005A3E90 // FUNCTION: fn_03138 -bool CChopChopClawMarks::Slot06() { +bool CChopChopClawMarks::IsAlive() { if (this->ActorExists()) { const std::chrono::milliseconds limit = std::chrono::seconds(this->unknown_002C); const std::chrono::nanoseconds elapsed = std::chrono::steady_clock::now().time_since_epoch() - std::chrono::nanoseconds(this->startTime); @@ -207,8 +207,8 @@ bool CChopChopClawMarks::Slot06() { // OFFSET: 0x005A3F10 // FUNCTION: fn_03139 -void CharacterParticleBundle::Slot03() { - this->Slot34(); +void CharacterParticleBundle::OnProcess() { + this->EmitParticles(); const auto removed = std::remove_if(this->particles.begin(), this->particles.end(), [](CEZ2STRParticle* particle) { if (!particle) { return true; @@ -222,15 +222,15 @@ void CharacterParticleBundle::Slot03() { this->particles.erase(removed, this->particles.end()); for (CEZ2STRParticle* particle : this->particles) { - this->Slot36(particle); - this->Slot37(particle); + this->UpdateParticlePosition(particle); + this->ProcessParticle(particle); } ++this->unknown_00D8; } // OFFSET: 0x005A4000 // FUNCTION: fn_03140 -void CharacterParticleBundle::Slot37(CEZ2STRParticle* particle) { +void CharacterParticleBundle::ProcessParticle(CEZ2STRParticle* particle) { if (particle) { particle->Process(0.0f, 0.0f, 0.0f); } @@ -238,15 +238,15 @@ void CharacterParticleBundle::Slot37(CEZ2STRParticle* particle) { // OFFSET: 0x005A4030 // FUNCTION: fn_03141 -void CharacterParticleBundle::Slot04() { +void CharacterParticleBundle::Render() { for (CEZ2STRParticle* particle : this->particles) { - this->Slot38(particle); + this->RenderParticle(particle); } } // OFFSET: 0x005A4060 // FUNCTION: fn_03142 -void CharacterParticleBundle::Slot38(CEZ2STRParticle* particle) { +void CharacterParticleBundle::RenderParticle(CEZ2STRParticle* particle) { if (particle) { particle->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } diff --git a/Source/Contents/Effects/CharacterParticleBundle.h b/Source/Contents/Effects/CharacterParticleBundle.h index 580fe046d..db0e879c3 100644 --- a/Source/Contents/Effects/CharacterParticleBundle.h +++ b/Source/Contents/Effects/CharacterParticleBundle.h @@ -13,18 +13,18 @@ class CharacterParticleBundle : public CEffect { public: CharacterParticleBundle(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - virtual bool Slot06() = 0; + virtual bool IsAlive() = 0; ~CharacterParticleBundle() override; - virtual void Slot34() = 0; - virtual void Slot35(); - virtual void Slot36(CEZ2STRParticle* particle) { + virtual void EmitParticles() = 0; + virtual void OnInit(); + virtual void UpdateParticlePosition(CEZ2STRParticle* particle) { } - virtual void Slot37(CEZ2STRParticle* particle); - virtual void Slot38(CEZ2STRParticle* particle); + virtual void ProcessParticle(CEZ2STRParticle* particle); + virtual void RenderParticle(CEZ2STRParticle* particle); /* 00CC */ int unknown_00CC; /* 00D0 */ long long startTime; @@ -34,11 +34,11 @@ public: class CChopChopClawMarks : public CharacterParticleBundle { public: - bool Slot06() override; + bool IsAlive() override; ~CChopChopClawMarks() override; - void Slot34() override; - void Slot35() override; - void Slot36(CEZ2STRParticle* particle) override; + void EmitParticles() override; + void OnInit() override; + void UpdateParticlePosition(CEZ2STRParticle* particle) override; const std::vector& GetRing(int radius); void SpawnParticle(); diff --git a/Source/Contents/Effects/ChargingPierceEffect.cpp b/Source/Contents/Effects/ChargingPierceEffect.cpp index 0a672ac4f..741fb46e2 100644 --- a/Source/Contents/Effects/ChargingPierceEffect.cpp +++ b/Source/Contents/Effects/ChargingPierceEffect.cpp @@ -106,7 +106,7 @@ int CChargingPierceEffect::ActiveCount() { // OFFSET: 0x00703A40 // FUNCTION: fn_07026 -void CChargingPierceEffect::Slot01() { +void CChargingPierceEffect::Open() { this->retained = 1; for (int index = 0; index < 10; ++index) { this->sparks[index] = nullptr; @@ -127,25 +127,25 @@ void CChargingPierceEffect::Slot01() { // OFFSET: 0x00703C40 // FUNCTION: fn_07027 -void CChargingPierceNewEffect::Slot01() { +void CChargingPierceNewEffect::Open() { this->retained = 1; } // OFFSET: 0x00703C50 // FUNCTION: fn_07028 -bool CChargingPierceEffect::Slot06() { +bool CChargingPierceEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00703C60 // FUNCTION: fn_07029 -bool CChargingPierceNewEffect::Slot06() { +bool CChargingPierceNewEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00703DC0 // FUNCTION: fn_07030 -void CChargingPierceEffect::Slot03() { +void CChargingPierceEffect::OnProcess() { for (int index = 0; index < 10; ++index) { const vector3d& offset = this->offsets[index]; @@ -224,7 +224,7 @@ void CChargingPierceEffect::Slot03() { // OFFSET: 0x00704360 // FUNCTION: fn_07031 -void CChargingPierceNewEffect::Slot03() { +void CChargingPierceNewEffect::OnProcess() { for (CEZ2STRParticle* particle : this->emitters) { const float x = this->position[0]; const float y = this->position[1]; @@ -245,7 +245,7 @@ void CChargingPierceNewEffect::Slot03() { // OFFSET: 0x00704A30 // FUNCTION: fn_07032 -void CChargingPierceEffect::Slot04() { +void CChargingPierceEffect::Render() { for (int index = 0; index < 10; ++index) { CParticle* spark = this->sparks[index]; if (spark) { @@ -264,7 +264,7 @@ void CChargingPierceEffect::Slot04() { // OFFSET: 0x00704BB0 // FUNCTION: fn_07033 -void CChargingPierceNewEffect::Slot04() { +void CChargingPierceNewEffect::Render() { for (CEZ2STRParticle* particle : this->emitters) { particle->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } diff --git a/Source/Contents/Effects/ChargingPierceEffect.h b/Source/Contents/Effects/ChargingPierceEffect.h index 21803c08f..22d2d9bc7 100644 --- a/Source/Contents/Effects/ChargingPierceEffect.h +++ b/Source/Contents/Effects/ChargingPierceEffect.h @@ -14,11 +14,11 @@ class CChargingPierceEffect : public CEffect { public: CChargingPierceEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; int ActiveCount(); @@ -32,11 +32,11 @@ public: CChargingPierceNewEffect(); ~CChargingPierceNewEffect() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void SetCount(int count); diff --git a/Source/Contents/Effects/CherryBlossomEffect.cpp b/Source/Contents/Effects/CherryBlossomEffect.cpp index 3c16ff2fb..765ca40ef 100644 --- a/Source/Contents/Effects/CherryBlossomEffect.cpp +++ b/Source/Contents/Effects/CherryBlossomEffect.cpp @@ -28,7 +28,7 @@ void CCherryBlossomEffect::Close() { // OFFSET: 0x00B43B90 // FUNCTION: fn_18885 -void CCherryBlossomEffect::Slot01() { +void CCherryBlossomEffect::Open() { for (int row = 0; row < 4; ++row) { for (int column = 0; column < 4; ++column) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); @@ -57,7 +57,7 @@ void CCherryBlossomEffect::Slot01() { // OFFSET: 0x00B43CE0 // FUNCTION: fn_18887 -void CCherryBlossomEffect::Slot03() { +void CCherryBlossomEffect::OnProcess() { for (std::vector::iterator it = this->petals.begin(); it != this->petals.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -133,7 +133,7 @@ void CCherryBlossomEffect::Slot03() { // OFFSET: 0x00B44500 // FUNCTION: fn_18888 -void CCherryBlossomEffect::Slot04() { +void CCherryBlossomEffect::Render() { for (std::vector::iterator it = this->petals.begin(); it != this->petals.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/CherryBlossomEffect.h b/Source/Contents/Effects/CherryBlossomEffect.h index 1d60013c2..16a6872e9 100644 --- a/Source/Contents/Effects/CherryBlossomEffect.h +++ b/Source/Contents/Effects/CherryBlossomEffect.h @@ -12,11 +12,11 @@ class CParticle; class CCherryBlossomEffect : public CEffect { public: CCherryBlossomEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override { + bool IsAlive() override { return this->ActorExists(); } diff --git a/Source/Contents/Effects/ClimaxEffect.cpp b/Source/Contents/Effects/ClimaxEffect.cpp index 28204a652..890e589c8 100644 --- a/Source/Contents/Effects/ClimaxEffect.cpp +++ b/Source/Contents/Effects/ClimaxEffect.cpp @@ -27,7 +27,7 @@ void CClimaxEffect::Close() { // OFFSET: 0x00706B00 // FUNCTION: fn_07050 -void CClimaxEffect::Slot01() { +void CClimaxEffect::Open() { this->retained = 1; CParticle* particle = CreateEZ2STRParticle(reinterpret_cast(this->position), 5); @@ -63,13 +63,13 @@ void CClimaxEffect::Slot01() { // OFFSET: 0x00706F00 // FUNCTION: fn_07051 -bool CClimaxEffect::Slot06() { +bool CClimaxEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00706F10 // FUNCTION: fn_07052 -void CClimaxEffect::Slot03() { +void CClimaxEffect::OnProcess() { for (CParticle* particle : this->particles) { if (!particle) { continue; @@ -103,7 +103,7 @@ void CClimaxEffect::Slot03() { // OFFSET: 0x00707270 // FUNCTION: fn_07053 -void CClimaxEffect::Slot04() { +void CClimaxEffect::Render() { for (int index = 0; index < 2; ++index) { if (this->particles[index]) { static_cast(this->particles[index])->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/ClimaxEffect.h b/Source/Contents/Effects/ClimaxEffect.h index 1025116e0..908c3ac95 100644 --- a/Source/Contents/Effects/ClimaxEffect.h +++ b/Source/Contents/Effects/ClimaxEffect.h @@ -11,11 +11,11 @@ class CClimaxEffect : public CEffect { public: CClimaxEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ CParticle* particles[2]; }; diff --git a/Source/Contents/Effects/CloudEffect.cpp b/Source/Contents/Effects/CloudEffect.cpp index ebd0f4d30..94461db7e 100644 --- a/Source/Contents/Effects/CloudEffect.cpp +++ b/Source/Contents/Effects/CloudEffect.cpp @@ -52,7 +52,7 @@ void CCloud::Close() { // OFFSET: 0x006FBBD0 // FUNCTION: fn_06917 -void CCloud::Slot01() { +void CCloud::Open() { this->particle = CreateParticle(reinterpret_cast(this->position), 1); if (CParticle* particle = this->particle) { particle->unknown_0004 = this->id; @@ -66,7 +66,7 @@ void CCloud::Slot01() { // OFFSET: 0x006FBC30 // FUNCTION: fn_06918 -void CCloud::Slot07() { +void CCloud::ResetParticles() { this->driftX = std::max(0, rand() % 360); this->driftTargetX = std::max(0, rand() % 360); this->driftZ = std::max(0, rand() % 360); @@ -105,13 +105,13 @@ void CCloud::Slot07() { // OFFSET: 0x006FBEC0 // FUNCTION: fn_06919 -bool CCloud::Slot06() { +bool CCloud::IsAlive() { return this->ActorExists(); } // OFFSET: 0x006FBED0 // FUNCTION: fn_06920 -void CCloud::Slot03() { +void CCloud::OnProcess() { CParticle* particle = this->particle; if (!particle) { return; @@ -125,7 +125,7 @@ void CCloud::Slot03() { } else if (frame > this->fadeOutStart) { this->alpha -= this->fadeOutStep; if (this->alpha <= 0.0f) { - this->Slot07(); + this->ResetParticles(); } else { particle->alpha = static_cast(this->alpha); } @@ -149,7 +149,7 @@ void CCloud::Slot03() { // OFFSET: 0x006FC090 // FUNCTION: fn_06921 -void CCloud::Slot04() { +void CCloud::Render() { if (this->particle) { this->particle->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); } diff --git a/Source/Contents/Effects/CloudEffect.h b/Source/Contents/Effects/CloudEffect.h index 8fe9eac2e..40f2c0627 100644 --- a/Source/Contents/Effects/CloudEffect.h +++ b/Source/Contents/Effects/CloudEffect.h @@ -10,12 +10,12 @@ class CParticle; class CCloud : public CEffect { public: CCloud(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; + bool IsAlive() override; + void ResetParticles() override; void Drift(); /* 00CC */ CParticle* particle; diff --git a/Source/Contents/Effects/CloudKillEffect.cpp b/Source/Contents/Effects/CloudKillEffect.cpp index 39734768a..27016ffae 100644 --- a/Source/Contents/Effects/CloudKillEffect.cpp +++ b/Source/Contents/Effects/CloudKillEffect.cpp @@ -73,18 +73,18 @@ void CCloudKillEffect::Close() { // OFFSET: 0x006FCCB0 // FUNCTION: fn_06928 -void CCloudKillEffect::Slot01() { +void CCloudKillEffect::Open() { } // OFFSET: 0x006FCCC0 // FUNCTION: fn_06929 -bool CCloudKillEffect::Slot06() { +bool CCloudKillEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x006FCE60 // FUNCTION: fn_06930 -void CCloudKillEffect::Slot03() { +void CCloudKillEffect::OnProcess() { if (this->unknown_00E4 && this->frame % 5 == 0) { CSpriteParticle* particle = static_cast(CreateSpriteParticle(reinterpret_cast(this->position), 1)); matrix& rotation = *reinterpret_cast(particle->unknown_0198); @@ -179,7 +179,7 @@ void CCloudKillEffect::Slot03() { // OFFSET: 0x006FD640 // FUNCTION: fn_06931 -void CCloudKillEffect::Slot04() { +void CCloudKillEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { static_cast(*it)->Draw(1); diff --git a/Source/Contents/Effects/CloudKillEffect.h b/Source/Contents/Effects/CloudKillEffect.h index 7f5ee7017..845ff6728 100644 --- a/Source/Contents/Effects/CloudKillEffect.h +++ b/Source/Contents/Effects/CloudKillEffect.h @@ -12,11 +12,11 @@ class CCloudKillEffect : public CEffect { public: CCloudKillEffect(); ~CCloudKillEffect() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddSprites(); diff --git a/Source/Contents/Effects/CommonFloorEffect.cpp b/Source/Contents/Effects/CommonFloorEffect.cpp index 3d7d6f5d7..2a5c03869 100644 --- a/Source/Contents/Effects/CommonFloorEffect.cpp +++ b/Source/Contents/Effects/CommonFloorEffect.cpp @@ -13,7 +13,7 @@ CCommonFloorEffect::CCommonFloorEffect() : CEffect(1056) { // OFFSET: 0x006FD8C0 // FUNCTION: fn_06935 -void CCommonFloorEffect::Slot08(int red, int green, int blue) { +void CCommonFloorEffect::SetColor(int red, int green, int blue) { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->SetColor(red, green, blue); } @@ -21,7 +21,7 @@ void CCommonFloorEffect::Slot08(int red, int green, int blue) { // OFFSET: 0x006FD900 // FUNCTION: fn_06936 -void CCommonFloorEffect::Slot11(std::string name) { +void CCommonFloorEffect::SetParticleTexture(std::string name) { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->SetTexture(name); } @@ -39,7 +39,7 @@ void CCommonFloorEffect::Close() { // OFFSET: 0x006FDB70 // FUNCTION: fn_06938 -void CCommonFloorEffect::Slot01() { +void CCommonFloorEffect::Open() { for (int i = 0; i < 2; ++i) { const int angle = i * 180; CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); @@ -62,7 +62,7 @@ void CCommonFloorEffect::Slot01() { // OFFSET: 0x006FDCE0 // FUNCTION: fn_06939 -void CCommonFloorEffect::Slot07() { +void CCommonFloorEffect::ResetParticles() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->flags = 5; @@ -81,13 +81,13 @@ void CCommonFloorEffect::Slot07() { } // OFFSET: 0x006FDD90 // FUNCTION: fn_06940 -bool CCommonFloorEffect::Slot06() { +bool CCommonFloorEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x006FDDA0 // FUNCTION: fn_06941 -void CCommonFloorEffect::Slot03() { +void CCommonFloorEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -122,7 +122,7 @@ void CCommonFloorEffect::Slot03() { // OFFSET: 0x006FE060 // FUNCTION: fn_06942 -void CCommonFloorEffect::Slot04() { +void CCommonFloorEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (CParticle* particle = *it) { particle->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/CommonFloorEffect.h b/Source/Contents/Effects/CommonFloorEffect.h index 2c0295e35..5545cc5a7 100644 --- a/Source/Contents/Effects/CommonFloorEffect.h +++ b/Source/Contents/Effects/CommonFloorEffect.h @@ -13,14 +13,14 @@ class CCommonFloorEffect : public CEffect { public: CCommonFloorEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; - void Slot08(int red, int green, int blue) override; - void Slot11(std::string name) override; + bool IsAlive() override; + void ResetParticles() override; + void SetColor(int red, int green, int blue) override; + void SetParticleTexture(std::string name) override; /* 00CC */ std::vector particles; }; diff --git a/Source/Contents/Effects/Competentia.cpp b/Source/Contents/Effects/Competentia.cpp index 60998cec0..65fe22049 100644 --- a/Source/Contents/Effects/Competentia.cpp +++ b/Source/Contents/Effects/Competentia.cpp @@ -12,7 +12,7 @@ // OFFSET: 0x007088B0 // FUNCTION: fn_07076 -void CNyanggrassEffect::Slot04() { +void CNyanggrassEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle != nullptr) { @@ -39,7 +39,7 @@ void CCompetentia::Close() { // OFFSET: 0x00708AD0 // FUNCTION: fn_07080 -void CCompetentia::Slot01() { +void CCompetentia::Open() { for (int i = 0; i < 10; ++i) { const vector2d point = RandomDiscPoint(this->position[0], this->position[2], 50); vector3d pos; @@ -61,13 +61,13 @@ void CCompetentia::Slot01() { // OFFSET: 0x00708CB0 // FUNCTION: fn_07081 -bool CCompetentia::Slot06() { +bool CCompetentia::IsAlive() { return !this->particles.empty(); } // OFFSET: 0x00708CC0 // FUNCTION: fn_07082 -void CCompetentia::Slot03() { +void CCompetentia::OnProcess() { for (auto current = this->particles.begin(); current != this->particles.end();) { CParticle* particle = *current; if (particle->life == 0.0f || static_cast(particle->unknown_00E8) < particle->life * 60.0f) { @@ -84,7 +84,7 @@ void CCompetentia::Slot03() { // OFFSET: 0x00708DB0 // FUNCTION: fn_07083 -void CCompetentia::Slot04() { +void CCompetentia::Render() { for (auto current = this->particles.begin(); current != this->particles.end(); ++current) { CParticle* particle = *current; if (particle) { @@ -96,7 +96,7 @@ void CCompetentia::Slot04() { // OFFSET: 0x00708E30 // FUNCTION: fn_07084 -void CCompetentia::Slot14(int argument) { +void CCompetentia::SetLifeTime(int argument) { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/Competentia.h b/Source/Contents/Effects/Competentia.h index 16cf61cee..52960a05f 100644 --- a/Source/Contents/Effects/Competentia.h +++ b/Source/Contents/Effects/Competentia.h @@ -12,12 +12,12 @@ class CCompetentia : public CEffect { public: CCompetentia(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot14(int argument) override; + bool IsAlive() override; + void SetLifeTime(int argument) override; /* 00CC */ std::vector particles; }; diff --git a/Source/Contents/Effects/CresciveBolt.cpp b/Source/Contents/Effects/CresciveBolt.cpp index 84a4df265..61525eedd 100644 --- a/Source/Contents/Effects/CresciveBolt.cpp +++ b/Source/Contents/Effects/CresciveBolt.cpp @@ -26,7 +26,7 @@ void CCresciveBolt::Close() { // OFFSET: 0x0070AC30 // FUNCTION: fn_07109 -void CCresciveBolt::Slot01() { +void CCresciveBolt::Open() { float fromReciprocalDepth = 0.0f; float toReciprocalDepth = 0.0f; float fromX; @@ -56,7 +56,7 @@ void CCresciveBolt::Slot01() { // OFFSET: 0x0070AE90 // FUNCTION: fn_07110 -bool CCresciveBolt::Slot06() { +bool CCresciveBolt::IsAlive() { if (!this->particle) { return false; } @@ -70,7 +70,7 @@ bool CCresciveBolt::Slot06() { // OFFSET: 0x0070AED0 // FUNCTION: fn_07111 -void CCresciveBolt::Slot03() { +void CCresciveBolt::OnProcess() { if (!this->particle) { return; } @@ -90,7 +90,7 @@ void CCresciveBolt::Slot03() { // OFFSET: 0x0070AF80 // FUNCTION: fn_07112 -void CCresciveBolt::Slot04() { +void CCresciveBolt::Render() { if (this->particle) { this->particle->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } diff --git a/Source/Contents/Effects/CresciveBolt.h b/Source/Contents/Effects/CresciveBolt.h index 091d3dd2e..d46c7ed21 100644 --- a/Source/Contents/Effects/CresciveBolt.h +++ b/Source/Contents/Effects/CresciveBolt.h @@ -11,11 +11,11 @@ class CCresciveBolt : public CEffect { public: CCresciveBolt(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ CEZ2STRParticle* particle; }; diff --git a/Source/Contents/Effects/EZ2STREffect.cpp b/Source/Contents/Effects/EZ2STREffect.cpp index 8c9852604..61b49bd7f 100644 --- a/Source/Contents/Effects/EZ2STREffect.cpp +++ b/Source/Contents/Effects/EZ2STREffect.cpp @@ -1608,7 +1608,7 @@ void CEZ2STRScreenEffect::Close() { // OFFSET: 0x00B51CD0 // FUNCTION: fn_19034 -vector3d CEZ2STRScreenEffect::Slot25() { +vector3d CEZ2STRScreenEffect::GetWindowOffset() { if (CEZ2STRParticle* particle = this->particle) { return particle->m_windowOffset; } @@ -1622,9 +1622,9 @@ vector3d CEZ2STRScreenEffect::Slot25() { // OFFSET: 0x00B51D20 // FUNCTION: fn_19035 -bool CEZ2STRScreenEffect::Slot33() { +bool CEZ2STRScreenEffect::IsVisible() { if (this->id != 0x76C) { - return CEffect::Slot33(); + return CEffect::IsVisible(); } CGameActor* actor = static_cast(FindRenderObject(this->actor)); @@ -1641,7 +1641,7 @@ bool CEZ2STRScreenEffect::Slot33() { // OFFSET: 0x00B56790 // FUNCTION: fn_19042 -bool CEZ2STRScreenEffect::Slot06() { +bool CEZ2STRScreenEffect::IsAlive() { int id = this->id; if (this->unknown_00C8 == 1) { return this->ActorExists(); @@ -1773,7 +1773,7 @@ bool CEZ2STRScreenEffect::Slot06() { // OFFSET: 0x00B56D30 // FUNCTION: fn_19043 -void CEZ2STRScreenEffect::Slot34(CEZ2STRParticle* particle, int id) { +void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { switch (id) { case 0xCC: particle->Open("빨간포션.str"); @@ -5367,7 +5367,7 @@ void CEZ2STRScreenEffect::Slot34(CEZ2STRParticle* particle, int id) { // OFFSET: 0x00B65EE0 // FUNCTION: fn_19044 -void CEZ2STRScreenEffect::Slot03() { +void CEZ2STRScreenEffect::OnProcess() { if (this->followCamera == 1 && this->particle) { double yaw = static_cast(g_modeMgr.GetGameMode())->camera->camera.yaw; if (yaw != this->cameraAngle) { @@ -5411,7 +5411,7 @@ void CEZ2STRScreenEffect::Slot03() { return; } - if (this->jobScaled == 1 && actor->Slot55() <= 0) { + if (this->jobScaled == 1 && actor->GetMonsterTransformJob() <= 0) { float factor = GetSkillFactor(actor->GetEffectiveJob(-1)); if (this->fadePulse == 1) { actor->ScaleByFadePulse(factor); @@ -5428,7 +5428,7 @@ void CEZ2STRScreenEffect::Slot03() { // OFFSET: 0x00B661B0 // FUNCTION: fn_19045 -void CEZ2STRScreenEffect::Slot04() { +void CEZ2STRScreenEffect::Render() { CEZ2STRParticle* particle = this->particle; if (!particle) { return; @@ -5467,13 +5467,13 @@ draw: // OFFSET: 0x00B66460 // FUNCTION: fn_19046 -void CEZ2STRScreenEffect::Slot00(int argument) { +void CEZ2STRScreenEffect::SetRenderFunc(int argument) { this->particle->submit = reinterpret_cast(argument); } // OFFSET: 0x00B66480 // FUNCTION: fn_19047 -void CEZ2STRScreenEffect::Slot23(float argument) { +void CEZ2STRScreenEffect::SetAlpha(float argument) { if (this->particle) { this->particle->m_alpha = argument; } @@ -5481,8 +5481,8 @@ void CEZ2STRScreenEffect::Slot23(float argument) { // OFFSET: 0x00B664A0 // FUNCTION: fn_19048 -void CEZ2STRScreenEffect::Slot29(int id) { - CEffect::Slot29(id); +void CEZ2STRScreenEffect::SetId(int id) { + CEffect::SetId(id); switch (id) { case 0x3F4: case 0x40A: @@ -5512,7 +5512,7 @@ void CEZ2STRScreenEffect::Slot29(int id) { // OFFSET: 0x00B66540 // FUNCTION: fn_19049 -void CEZ2STRScreenEffect::Slot24(int argument1, int argument2, int argument3, int argument4, int argument5) { +void CEZ2STRScreenEffect::SetWindowOffset(int argument1, int argument2, int argument3, int argument4, int argument5) { CEZ2STRParticle* particle = this->particle; if (!particle) { return; @@ -5530,13 +5530,13 @@ void CEZ2STRScreenEffect::Slot24(int argument1, int argument2, int argument3, in // OFFSET: 0x00B665B0 // FUNCTION: fn_19050 -void CEZ2STRScreenEffect::Slot21(int argument) { +void CEZ2STRScreenEffect::SetFlags(int argument) { this->particle->flags = argument; } // OFFSET: 0x00B665D0 // FUNCTION: fn_19051 -void CEZ2STRScreenEffect::Slot15(int argument) { +void CEZ2STRScreenEffect::SetRepeat(int argument) { if (this->particle) { this->particle->m_repeat = argument - 1; } @@ -5544,7 +5544,7 @@ void CEZ2STRScreenEffect::Slot15(int argument) { // OFFSET: 0x00B665F0 // FUNCTION: fn_19052 -void CEZ2STRScreenEffect::Slot14(int argument) { +void CEZ2STRScreenEffect::SetLifeTime(int argument) { if (this->particle) { this->particle->m_lifeTime = argument; } @@ -5552,7 +5552,7 @@ void CEZ2STRScreenEffect::Slot14(int argument) { // OFFSET: 0x00B66610 // FUNCTION: fn_19053 -void CEZ2STRScreenEffect::Slot17(float argument) { +void CEZ2STRScreenEffect::SetAngle(float argument) { if (this->particle) { this->particle->m_angle = argument; } @@ -5560,7 +5560,7 @@ void CEZ2STRScreenEffect::Slot17(float argument) { // OFFSET: 0x00B66630 // FUNCTION: fn_19054 -void CEZ2STRScreenEffect::Slot22(float argument) { +void CEZ2STRScreenEffect::SetScale(float argument) { if (this->particle) { this->particle->m_scale = argument; } @@ -5568,7 +5568,7 @@ void CEZ2STRScreenEffect::Slot22(float argument) { // OFFSET: 0x00B66650 // FUNCTION: fn_19055 -void CEZ2STRScreenEffect::Slot13(int argument) { +void CEZ2STRScreenEffect::AdvanceFrame(int argument) { if (this->particle) { this->particle->Advance(*reinterpret_cast(&argument)); } @@ -5576,7 +5576,7 @@ void CEZ2STRScreenEffect::Slot13(int argument) { // OFFSET: 0x00B66680 // FUNCTION: fn_19056 -void CEZ2STRScreenEffect::Slot16(int argument) { +void CEZ2STRScreenEffect::SetDelay(int argument) { if (this->particle) { this->particle->m_delay = argument; } @@ -5584,21 +5584,21 @@ void CEZ2STRScreenEffect::Slot16(int argument) { // OFFSET: 0x00B666A0 // FUNCTION: fn_19057 -void CEZ2STRScreenEffect::Slot20(int argument) { +void CEZ2STRScreenEffect::SetResource(int argument) { this->name = reinterpret_cast(argument); FreeParticle(this->particle); - this->Slot01(); + this->Open(); } // OFFSET: 0x00B52970 // FUNCTION: fn_19038 -int CEZ2STRScreenEffect::Slot28() { +int CEZ2STRScreenEffect::GetFrame() { return this->particle->m_frame; } // OFFSET: 0x00B52980 // FUNCTION: fn_19039 -void CEZ2STRScreenEffect::Slot01() { +void CEZ2STRScreenEffect::Open() { CEZ2STRParticle* particle = static_cast( CreateEZ2STRParticle(reinterpret_cast(this->position), 5) ); @@ -5759,7 +5759,7 @@ void CEZ2STRScreenEffect::Slot01() { InitParticleQuad(particle->vertices); this->particle = particle; - this->Slot34(particle, this->id); + this->InitParticle(particle, this->id); CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); this->cameraAngle = static_cast(mode->camera->camera.yaw); @@ -5771,7 +5771,7 @@ void CEZ2STRScreenEffect::Slot01() { // OFFSET: 0x00B531E0 // FUNCTION: fn_19040 -void CEZ2STRScreenEffect::Slot12() { +void CEZ2STRScreenEffect::InitEvents() { switch (this->id) { case 0xCC: case 0xCD: @@ -6223,13 +6223,13 @@ void CEZ2STRScreenEffect::Slot12() { this->particle->flags = 13; switch (this->unknown_00B0) { case 1: - this->Slot22(0.7f); + this->SetScale(0.7f); break; case 2: case 3: case 4: case 5: - this->Slot22(1.25f); + this->SetScale(1.25f); break; } break; diff --git a/Source/Contents/Effects/EZ2STREffect.h b/Source/Contents/Effects/EZ2STREffect.h index 770736471..924deb337 100644 --- a/Source/Contents/Effects/EZ2STREffect.h +++ b/Source/Contents/Effects/EZ2STREffect.h @@ -14,28 +14,28 @@ class CGameActor; class CEZ2STRScreenEffect : public CEffect { public: CEZ2STRScreenEffect(); - void Slot00(int argument) override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void SetRenderFunc(int argument) override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; - void Slot13(int argument) override; - void Slot14(int argument) override; - void Slot15(int argument) override; - void Slot16(int argument) override; - void Slot17(float argument) override; - void Slot20(int argument) override; - void Slot21(int argument) override; - void Slot22(float argument) override; - void Slot23(float argument) override; - void Slot24(int argument1, int argument2, int argument3, int argument4, int argument5) override; - vector3d Slot25() override; - int Slot28() override; - void Slot29(int id) override; - bool Slot33() override; - virtual void Slot34(CEZ2STRParticle* particle, int id); + bool IsAlive() override; + void InitEvents() override; + void AdvanceFrame(int argument) override; + void SetLifeTime(int argument) override; + void SetRepeat(int argument) override; + void SetDelay(int argument) override; + void SetAngle(float argument) override; + void SetResource(int argument) override; + void SetFlags(int argument) override; + void SetScale(float argument) override; + void SetAlpha(float argument) override; + void SetWindowOffset(int argument1, int argument2, int argument3, int argument4, int argument5) override; + vector3d GetWindowOffset() override; + int GetFrame() override; + void SetId(int id) override; + bool IsVisible() override; + virtual void InitParticle(CEZ2STRParticle* particle, int id); bool ApplyHeadOffset(CEZ2STRParticle* particle); bool IsAttachedToHead() const; diff --git a/Source/Contents/Effects/EZ2STREffectEx.cpp b/Source/Contents/Effects/EZ2STREffectEx.cpp index 9e495458a..b9e65e853 100644 --- a/Source/Contents/Effects/EZ2STREffectEx.cpp +++ b/Source/Contents/Effects/EZ2STREffectEx.cpp @@ -22,7 +22,7 @@ void CEZ2STREffectEx::Close() { // OFFSET: 0x006FF770 // FUNCTION: fn_06965 -void CEZ2STREffectEx::Slot31() { +void CEZ2STREffectEx::EnableTimeLimit() { this->timed = 1; } diff --git a/Source/Contents/Effects/EZ2STREffectEx.h b/Source/Contents/Effects/EZ2STREffectEx.h index eb3796765..f9d5b7d16 100644 --- a/Source/Contents/Effects/EZ2STREffectEx.h +++ b/Source/Contents/Effects/EZ2STREffectEx.h @@ -10,22 +10,22 @@ struct EZ2STREmitter; class CEZ2STREffectEx : public CEffect { public: CEZ2STREffectEx(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot14(int argument) override; - void Slot16(int argument) override; - void Slot17(float argument) override; - void Slot18(float argument) override; - void Slot19(float argument) override; - void Slot22(float argument) override; - void Slot23(float argument) override; - void Slot26(int argument) override; - void Slot27(int argument) override; - void Slot31() override; - void Slot32() override; + bool IsAlive() override; + void SetLifeTime(int argument) override; + void SetDelay(int argument) override; + void SetAngle(float argument) override; + void SetPitch(float argument) override; + void SetYaw(float argument) override; + void SetScale(float argument) override; + void SetAlpha(float argument) override; + void SetFlipX(int argument) override; + void SetFlipY(int argument) override; + void EnableTimeLimit() override; + void EnableGroundRender() override; bool IsFinished(); void EndLoop(unsigned char fadeOut); diff --git a/Source/Contents/Effects/Effect.cpp b/Source/Contents/Effects/Effect.cpp index 617c09a2b..ce18ec778 100644 --- a/Source/Contents/Effects/Effect.cpp +++ b/Source/Contents/Effects/Effect.cpp @@ -50,7 +50,7 @@ void CEffect::AddEvent(int kind, const char* text, int frame, int argument) { // OFFSET: 0x00B4DF90 // FUNCTION: fn_18985 bool CEffect::RetireIfInactive() { - if (!this->Slot06()) { + if (!this->IsAlive()) { g_effectMgr->Retire(this, 0); return true; } @@ -60,7 +60,7 @@ bool CEffect::RetireIfInactive() { // OFFSET: 0x00B4E0E0 // FUNCTION: fn_18986 -bool CEffect::Slot33() { +bool CEffect::IsVisible() { EffectActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor || actor->render.unknown_00A8 == 0) { return true; @@ -81,7 +81,7 @@ bool CEffect::Slot33() { // OFFSET: 0x00B4E150 // FUNCTION: fn_18987 -bool CEffect::Slot06() { +bool CEffect::IsAlive() { if (this->actor != 0 && !FindRenderObject(this->actor)) { return false; } @@ -103,8 +103,8 @@ void CEffect::SetEventFrame(int kind, int frame) { // OFFSET: 0x00B4E290 // FUNCTION: fn_18989 void CEffect::UpdateVisibility() { - if ((g_serviceOptions.Get(8) || this->forceRender) && this->Slot33() && !this->outsideRange) { - this->Slot04(); + if ((g_serviceOptions.Get(8) || this->forceRender) && this->IsVisible() && !this->outsideRange) { + this->Render(); } } @@ -134,7 +134,7 @@ void CEffect::Update(std::uint32_t aid) { this->position[2] = actor->render.position.z; } - this->Slot02(); + this->CheckRange(); if (this->outsideRange) { return; } @@ -158,7 +158,7 @@ void CEffect::Update(std::uint32_t aid) { } } - this->Slot03(); + this->OnProcess(); ++this->frame; } @@ -186,7 +186,7 @@ vector3d PlayerPosition() { // OFFSET: 0x00B4E510 // FUNCTION: fn_18994 -void CEffect::Slot02() { +void CEffect::CheckRange() { const vector3d player = PlayerPosition(); const float y = player.y - this->position[1]; const float x = player.x - this->position[0]; diff --git a/Source/Contents/Effects/Effect.h b/Source/Contents/Effects/Effect.h index 44976d1ca..2a8eb13e8 100644 --- a/Source/Contents/Effects/Effect.h +++ b/Source/Contents/Effects/Effect.h @@ -19,40 +19,40 @@ struct EffectEvent { class CEffect { public: explicit CEffect(int id); - virtual void Slot00(int argument); - virtual void Slot01(); - virtual void Slot02(); - virtual void Slot03() {} - virtual void Slot04(); + virtual void SetRenderFunc(int argument); + virtual void Open(); + virtual void CheckRange(); + virtual void OnProcess() {} + virtual void Render(); virtual void Close(); - virtual bool Slot06(); - virtual void Slot07(); - virtual void Slot08(int argument1, int argument2, int argument3); - virtual void Slot09(int argument); - virtual void Slot10(int argument); - virtual void Slot11(std::string name); - virtual void Slot12(); - virtual void Slot13(int argument); - virtual void Slot14(int argument); - virtual void Slot15(int argument); - virtual void Slot16(int) {} - virtual void Slot17(float argument); - virtual void Slot18(float argument); - virtual void Slot19(float argument); - virtual void Slot20(int argument); - virtual void Slot21(int argument); - virtual void Slot22(float argument); - virtual void Slot23(float argument); - virtual void Slot24(int argument1, int argument2, int argument3, int argument4, int argument5); - virtual vector3d Slot25(); - virtual void Slot26(int argument); - virtual void Slot27(int argument); - virtual int Slot28(); - virtual void Slot29(int id); + virtual bool IsAlive(); + virtual void ResetParticles(); + virtual void SetColor(int argument1, int argument2, int argument3); + virtual void SetSourceBlend(int argument); + virtual void SetDestinationBlend(int argument); + virtual void SetParticleTexture(std::string name); + virtual void InitEvents(); + virtual void AdvanceFrame(int argument); + virtual void SetLifeTime(int argument); + virtual void SetRepeat(int argument); + virtual void SetDelay(int) {} + virtual void SetAngle(float argument); + virtual void SetPitch(float argument); + virtual void SetYaw(float argument); + virtual void SetResource(int argument); + virtual void SetFlags(int argument); + virtual void SetScale(float argument); + virtual void SetAlpha(float argument); + virtual void SetWindowOffset(int argument1, int argument2, int argument3, int argument4, int argument5); + virtual vector3d GetWindowOffset(); + virtual void SetFlipX(int argument); + virtual void SetFlipY(int argument); + virtual int GetFrame(); + virtual void SetId(int id); virtual ~CEffect(); - virtual void Slot31(); - virtual void Slot32(); - virtual bool Slot33(); + virtual void EnableTimeLimit(); + virtual void EnableGroundRender(); + virtual bool IsVisible(); void AddEvent(int kind, const char* text, int frame, int argument); void SetActor(std::uint32_t aid); void SetSourceActor(std::uint32_t aid); diff --git a/Source/Contents/Effects/EffectForceRender.cpp b/Source/Contents/Effects/EffectForceRender.cpp index 81aa096c1..857df260a 100644 --- a/Source/Contents/Effects/EffectForceRender.cpp +++ b/Source/Contents/Effects/EffectForceRender.cpp @@ -4,7 +4,7 @@ // OFFSET: 0x00B4E2D0 // FUNCTION: fn_18990 -void CEffect::Slot29(int id) { +void CEffect::SetId(int id) { this->id = id; g_session.m_hotkeyScript->Call("IsForceRenderEffect", "d>b", id, &this->forceRender); } diff --git a/Source/Contents/Effects/EffectLists.cpp b/Source/Contents/Effects/EffectLists.cpp index f4a8d1a94..4f3e53e8f 100644 --- a/Source/Contents/Effects/EffectLists.cpp +++ b/Source/Contents/Effects/EffectLists.cpp @@ -370,7 +370,7 @@ CEffect* EffectLists::Spawn(int actor, int id, float x, float y, float z, std::u effect->position[0] = x; effect->position[1] = y; effect->position[2] = z; - effect->Slot29(id); + effect->SetId(id); if (frame != -1) { effect->unknown_00B0 = frame; } @@ -378,8 +378,8 @@ CEffect* EffectLists::Spawn(int actor, int id, float x, float y, float z, std::u effect->unknown_00C4 = instance; effect->retained = 1; } - effect->Slot01(); - effect->Slot12(); + effect->Open(); + effect->InitEvents(); this->Add(actor, effect); } @@ -557,15 +557,15 @@ void EffectLists::SpawnLevel99(CRenderObject* actor, unsigned char flag, int ext effect->position[0] = position.x; effect->position[1] = position.y; effect->position[2] = position.z; - effect->Slot29(EF_LEVEL99); - effect->Slot01(); - effect->Slot12(); + effect->SetId(EF_LEVEL99); + effect->Open(); + effect->InitEvents(); this->Add(aid, effect); } applyLevel99: - effect->Slot11("effect\\번개3.bmp"); - effect->Slot08(0x50, 0x50, 0xFF); + effect->SetParticleTexture("effect\\번개3.bmp"); + effect->SetColor(0x50, 0x50, 0xFF); } namespace { @@ -1397,7 +1397,7 @@ CGravityControlEffect::~CGravityControlEffect() { // OFFSET: 0x00B3A550 // FUNCTION: fn_18789 -bool CGravityControlEffect::Slot06() { +bool CGravityControlEffect::IsAlive() { return this->ActorExists(); } diff --git a/Source/Contents/Effects/EffectMemoryMgr.cpp b/Source/Contents/Effects/EffectMemoryMgr.cpp index 7da90a593..cae4fb2b2 100644 --- a/Source/Contents/Effects/EffectMemoryMgr.cpp +++ b/Source/Contents/Effects/EffectMemoryMgr.cpp @@ -265,7 +265,7 @@ CParticle* CreateSpriteParticle(const vector3d* position, int flags) { // FUNCTION: fn_19294 void FreeParticle(CParticle* particle) { if (particle) { - particle->Slot01(); + particle->ReleaseResource(); } g_effectMemoryMgr->Free(particle->unknown_02B0, particle); } diff --git a/Source/Contents/Effects/ElectricEffect.cpp b/Source/Contents/Effects/ElectricEffect.cpp index 465525dfd..ab1e8664d 100644 --- a/Source/Contents/Effects/ElectricEffect.cpp +++ b/Source/Contents/Effects/ElectricEffect.cpp @@ -68,19 +68,19 @@ void CElectricEffect::Close() { // OFFSET: 0x00B4EE80 // FUNCTION: fn_19004 -void CElectricEffect::Slot01() { +void CElectricEffect::Open() { this->unknown_002C = 300; } // OFFSET: 0x00B4EF40 // FUNCTION: fn_19005 -bool CElectricEffect::Slot06() { +bool CElectricEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B4EF50 // FUNCTION: fn_19006 -void CElectricEffect::Slot03() { +void CElectricEffect::OnProcess() { if (this->tick >= 20 && this->tick < 24) { this->AddBolt(0); this->AddBolt(180); @@ -186,7 +186,7 @@ void CElectricEffect::Slot03() { // OFFSET: 0x00B4F930 // FUNCTION: fn_19007 -void CElectricEffect::Slot04() { +void CElectricEffect::Render() { for (auto it = this->bolts.begin(); it != this->bolts.end(); ++it) { CParticle* bolt = *it; if (bolt && static_cast(bolt->unknown_000C - 1) <= 17 && bolt->unknown_0008 > 0) { diff --git a/Source/Contents/Effects/ElectricEffect.h b/Source/Contents/Effects/ElectricEffect.h index 45f8615e5..db9380d7d 100644 --- a/Source/Contents/Effects/ElectricEffect.h +++ b/Source/Contents/Effects/ElectricEffect.h @@ -11,11 +11,11 @@ class CParticle; class CElectricEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddBolt(int tilt); diff --git a/Source/Contents/Effects/EmitterEffect.cpp b/Source/Contents/Effects/EmitterEffect.cpp index d423ad6b0..37b9d42e6 100644 --- a/Source/Contents/Effects/EmitterEffect.cpp +++ b/Source/Contents/Effects/EmitterEffect.cpp @@ -35,7 +35,7 @@ void CEmitterEffect::Close() { // OFFSET: 0x00B50050 // FUNCTION: fn_19012 -void CEmitterEffect::Slot01() { +void CEmitterEffect::Open() { for (int i = 0; i < this->count; ++i) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (particle) { @@ -79,7 +79,7 @@ void CEmitterEffect::InitParticle(CParticle* particle) { // OFFSET: 0x00B502B0 // FUNCTION: fn_19014 -void CEmitterEffect::Slot07() { +void CEmitterEffect::ResetParticles() { if (this->fixedAlpha == 1 && this->rateMin == 0.0f && this->rateMax == 0.0f) { this->pool.ActivateAll(); } @@ -95,7 +95,7 @@ void CEmitterEffect::Slot07() { // OFFSET: 0x00B50370 // FUNCTION: fn_19015 -bool CEmitterEffect::Slot06() { +bool CEmitterEffect::IsAlive() { if (this->duration > 0 && this->frame > this->duration) { return false; } @@ -105,7 +105,7 @@ bool CEmitterEffect::Slot06() { // OFFSET: 0x00B50390 // FUNCTION: fn_19016 -void CEmitterEffect::Slot03() { +void CEmitterEffect::OnProcess() { if (!this->unknown_00C1) { const float rate = static_cast(static_cast(RandomRange(this->rateMin, this->rateMax))) * this->timeScale; int spawn = static_cast(rate); @@ -136,7 +136,7 @@ void CEmitterEffect::Slot03() { // OFFSET: 0x00B507E0 // FUNCTION: fn_19017 -void CEmitterEffect::Slot04() { +void CEmitterEffect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { if (CParticle* particle = *it) { ParticleQuad quad; @@ -224,7 +224,7 @@ void CEmitterEffect::SetCount(int value) { if (this->count != value) { this->count = value; this->Close(); - this->Slot01(); + this->Open(); } } @@ -241,7 +241,7 @@ void CEmitterEffect::SetParticleSpeed(float value) { // OFFSET: 0x00B50CE0 // FUNCTION: fn_19021 -void CEmitterEffect::Slot02() { +void CEmitterEffect::CheckRange() { if (this->InRange() == true) { this->outsideRange = 0; this->unknown_00C1 = 0; diff --git a/Source/Contents/Effects/EmitterEffect.h b/Source/Contents/Effects/EmitterEffect.h index 6eb4f98c5..829ad2c4a 100644 --- a/Source/Contents/Effects/EmitterEffect.h +++ b/Source/Contents/Effects/EmitterEffect.h @@ -14,13 +14,13 @@ class CParticle; class CEmitterEffect : public CEffect { public: CEmitterEffect(); - void Slot01() override; - void Slot02() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void CheckRange() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; + bool IsAlive() override; + void ResetParticles() override; ~CEmitterEffect() override; virtual void InitParticle(CParticle* particle); virtual void UpdateParticle(CParticle* particle); diff --git a/Source/Contents/Effects/EnergyOrbEffect.cpp b/Source/Contents/Effects/EnergyOrbEffect.cpp index be31e7434..4b76ce1be 100644 --- a/Source/Contents/Effects/EnergyOrbEffect.cpp +++ b/Source/Contents/Effects/EnergyOrbEffect.cpp @@ -32,7 +32,7 @@ void CEnergyOrbEffect::Close() { // OFFSET: 0x00B50EC0 // FUNCTION: fn_19025 -void CEnergyOrbEffect::Slot01() { +void CEnergyOrbEffect::Open() { for (int i = 0; i < this->count; ++i) { const int angle = std::max(rand() % 360, 0); const int phase = std::max(rand() % 3, 0); @@ -98,13 +98,13 @@ void CEnergyOrbEffect::Slot01() { // OFFSET: 0x00B51240 // FUNCTION: fn_19026 -bool CEnergyOrbEffect::Slot06() { +bool CEnergyOrbEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B51250 // FUNCTION: fn_19027 -void CEnergyOrbEffect::Slot03() { +void CEnergyOrbEffect::OnProcess() { for (CParticle* particle : this->particles) { particle->position.x = this->position[0]; particle->position.y = this->position[1]; @@ -157,7 +157,7 @@ void CEnergyOrbEffect::Slot03() { // OFFSET: 0x00B51750 // FUNCTION: fn_19028 -void CEnergyOrbEffect::Slot04() { +void CEnergyOrbEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); @@ -170,6 +170,6 @@ void CEnergyOrbEffect::Slot04() { void CEnergyOrbEffect::SetCount(int value) { if (this->count != value) { this->count = value; - this->Slot01(); + this->Open(); } } diff --git a/Source/Contents/Effects/EnergyOrbEffect.h b/Source/Contents/Effects/EnergyOrbEffect.h index de0a00f13..9ff09eb6c 100644 --- a/Source/Contents/Effects/EnergyOrbEffect.h +++ b/Source/Contents/Effects/EnergyOrbEffect.h @@ -11,11 +11,11 @@ class CParticle; class CEnergyOrbEffect : public CEffect { public: CEnergyOrbEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; ~CEnergyOrbEffect() override; void SetCount(int value); diff --git a/Source/Contents/Effects/EvilLandEffect.cpp b/Source/Contents/Effects/EvilLandEffect.cpp index 2ed581349..fb283139d 100644 --- a/Source/Contents/Effects/EvilLandEffect.cpp +++ b/Source/Contents/Effects/EvilLandEffect.cpp @@ -24,7 +24,7 @@ void CEvilLandEffect::Close() { // OFFSET: 0x006FE530 // FUNCTION: fn_06948 -void CEvilLandEffect::Slot01() { +void CEvilLandEffect::Open() { CTexture* texture = g_texMgr.Load("effect\\EVILLAND\\demonground.tga", 0, false, true, false); const float textureStepU = static_cast(texture->ImageWidth()) / static_cast(texture->TextureWidth()) / static_cast(this->unknown_00B0); const float textureStepV = static_cast(texture->ImageHeight()) / static_cast(texture->TextureHeight()) / static_cast(this->unknown_00B0); @@ -73,13 +73,13 @@ void CEvilLandEffect::Slot01() { // OFFSET: 0x006FE830 // FUNCTION: fn_06949 -bool CEvilLandEffect::Slot06() { +bool CEvilLandEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x006FE840 // FUNCTION: fn_06950 -void CEvilLandEffect::Slot03() { +void CEvilLandEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (CMultiTexParticle* particle = static_cast(*it)) { particle->offsetV += 0.001f; @@ -89,7 +89,7 @@ void CEvilLandEffect::Slot03() { // OFFSET: 0x006FE8B0 // FUNCTION: fn_06951 -void CEvilLandEffect::Slot04() { +void CEvilLandEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CMultiTexParticle* particle = static_cast(*it); if (particle) { diff --git a/Source/Contents/Effects/EvilLandEffect.h b/Source/Contents/Effects/EvilLandEffect.h index 2260d0fa1..15567a5a4 100644 --- a/Source/Contents/Effects/EvilLandEffect.h +++ b/Source/Contents/Effects/EvilLandEffect.h @@ -11,11 +11,11 @@ class CParticle; class CEvilLandEffect : public CEffect { public: CEvilLandEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector particles; }; diff --git a/Source/Contents/Effects/EvilsPawEffect.cpp b/Source/Contents/Effects/EvilsPawEffect.cpp index 3ce1009b1..150b7c597 100644 --- a/Source/Contents/Effects/EvilsPawEffect.cpp +++ b/Source/Contents/Effects/EvilsPawEffect.cpp @@ -28,7 +28,7 @@ void CEvilsPawEffect::Close() { // OFFSET: 0x006FED20 // FUNCTION: fn_06957 -void CEvilsPawEffect::Slot01() { +void CEvilsPawEffect::Open() { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (particle) { particle->SetColor(255, 255, 255); @@ -54,7 +54,7 @@ void CEvilsPawEffect::Slot01() { // OFFSET: 0x006FEFC0 // FUNCTION: fn_06958 -void CEvilsPawEffect::Slot07() { +void CEvilsPawEffect::ResetParticles() { this->textureIndex = 0; this->delayCounter = this->frameDelay; for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { @@ -70,13 +70,13 @@ void CEvilsPawEffect::Slot07() { // OFFSET: 0x006FF060 // FUNCTION: fn_06959 -bool CEvilsPawEffect::Slot06() { +bool CEvilsPawEffect::IsAlive() { return true; } // OFFSET: 0x006FF070 // FUNCTION: fn_06960 -void CEvilsPawEffect::Slot03() { +void CEvilsPawEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -116,7 +116,7 @@ void CEvilsPawEffect::Slot03() { // OFFSET: 0x006FF3E0 // FUNCTION: fn_06961 -void CEvilsPawEffect::Slot04() { +void CEvilsPawEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/EvilsPawEffect.h b/Source/Contents/Effects/EvilsPawEffect.h index 28c39056d..b24b88fc8 100644 --- a/Source/Contents/Effects/EvilsPawEffect.h +++ b/Source/Contents/Effects/EvilsPawEffect.h @@ -14,12 +14,12 @@ class CEvilsPawEffect : public CEffect { public: CEvilsPawEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; + bool IsAlive() override; + void ResetParticles() override; /* 00CC */ std::vector particles; /* 00D8 */ int frameDelay; diff --git a/Source/Contents/Effects/FlowerCastingEffect.cpp b/Source/Contents/Effects/FlowerCastingEffect.cpp index aa18cf0f3..1bbaa51f1 100644 --- a/Source/Contents/Effects/FlowerCastingEffect.cpp +++ b/Source/Contents/Effects/FlowerCastingEffect.cpp @@ -97,7 +97,7 @@ void CFlowerCastingEffect::Close() { // OFFSET: 0x00B66CA0 // FUNCTION: fn_19061 -void CFlowerCastingEffect::Slot01() { +void CFlowerCastingEffect::Open() { this->unknown_002C = 400; CWorld* world = static_cast(g_modeMgr.GetGameMode())->scene; @@ -110,13 +110,13 @@ void CFlowerCastingEffect::Slot01() { // OFFSET: 0x00B66D20 // FUNCTION: fn_19062 -bool CFlowerCastingEffect::Slot06() { +bool CFlowerCastingEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B66D30 // FUNCTION: fn_19063 -void CFlowerCastingEffect::Slot03() { +void CFlowerCastingEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -185,7 +185,7 @@ void CFlowerCastingEffect::Slot03() { // OFFSET: 0x00B671E0 // FUNCTION: fn_19064 -void CFlowerCastingEffect::Slot04() { +void CFlowerCastingEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle || particle->unknown_000C <= 0) { diff --git a/Source/Contents/Effects/FlowerCastingEffect.h b/Source/Contents/Effects/FlowerCastingEffect.h index 02ca0bdd9..b749c9fc3 100644 --- a/Source/Contents/Effects/FlowerCastingEffect.h +++ b/Source/Contents/Effects/FlowerCastingEffect.h @@ -11,11 +11,11 @@ class CParticle; class CFlowerCastingEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddRing(int kind); diff --git a/Source/Contents/Effects/FortuneKissEffect.cpp b/Source/Contents/Effects/FortuneKissEffect.cpp index 938c14bea..d78d234c2 100644 --- a/Source/Contents/Effects/FortuneKissEffect.cpp +++ b/Source/Contents/Effects/FortuneKissEffect.cpp @@ -19,7 +19,7 @@ void CFortuneKiss::Close() { // OFFSET: 0x00701560 // FUNCTION: fn_06995 -void CFortuneKiss::Slot01() { +void CFortuneKiss::Open() { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (!particle) { return; @@ -43,13 +43,13 @@ void CFortuneKiss::Slot01() { // OFFSET: 0x00701700 // FUNCTION: fn_06996 -bool CFortuneKiss::Slot06() { +bool CFortuneKiss::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00701710 // FUNCTION: fn_06997 -void CFortuneKiss::Slot03() { +void CFortuneKiss::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -89,7 +89,7 @@ void CFortuneKiss::Slot03() { // OFFSET: 0x00701B10 // FUNCTION: fn_06998 -void CFortuneKiss::Slot04() { +void CFortuneKiss::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/FortuneKissEffect.h b/Source/Contents/Effects/FortuneKissEffect.h index 29a2bec2a..b6111bf72 100644 --- a/Source/Contents/Effects/FortuneKissEffect.h +++ b/Source/Contents/Effects/FortuneKissEffect.h @@ -10,11 +10,11 @@ class CParticle; class CFortuneKiss : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ unsigned char unknown_00CC[0x38]; /* 0104 */ int angle; diff --git a/Source/Contents/Effects/FriggSongEffect.cpp b/Source/Contents/Effects/FriggSongEffect.cpp index c4c22407e..126811d45 100644 --- a/Source/Contents/Effects/FriggSongEffect.cpp +++ b/Source/Contents/Effects/FriggSongEffect.cpp @@ -26,7 +26,7 @@ void CFriggSongEffect::Close() { // OFFSET: 0x00701F20 // FUNCTION: fn_07002 -void CFriggSongEffect::Slot01() { +void CFriggSongEffect::Open() { for (int segment = 0; segment <= 21; ++segment) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (!particle) { @@ -87,19 +87,19 @@ void CFriggSongEffect::Slot01() { // OFFSET: 0x007021A0 // FUNCTION: fn_07003 -void CFriggSongEffect::Slot12() { +void CFriggSongEffect::InitEvents() { this->AddEvent(0, "effect\\wm_frigg_song.wav", 0, 0); } // OFFSET: 0x007023D0 // FUNCTION: fn_07004 -bool CFriggSongEffect::Slot06() { +bool CFriggSongEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x007023E0 // FUNCTION: fn_07005 -void CFriggSongEffect::Slot03() { +void CFriggSongEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -135,7 +135,7 @@ void CFriggSongEffect::Slot03() { // OFFSET: 0x007027A0 // FUNCTION: fn_07006 -void CFriggSongEffect::Slot04() { +void CFriggSongEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle) { diff --git a/Source/Contents/Effects/FriggSongEffect.h b/Source/Contents/Effects/FriggSongEffect.h index 1853b5d80..6f5c125f6 100644 --- a/Source/Contents/Effects/FriggSongEffect.h +++ b/Source/Contents/Effects/FriggSongEffect.h @@ -13,12 +13,12 @@ class CFriggSongEffect : public CEffect { public: CFriggSongEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; + bool IsAlive() override; + void InitEvents() override; /* 00CC */ vector3d lastInner[2]; /* 00E4 */ std::vector particles; diff --git a/Source/Contents/Effects/FuumaShouakuEffect.cpp b/Source/Contents/Effects/FuumaShouakuEffect.cpp index 53a1f2c87..a4174e3f6 100644 --- a/Source/Contents/Effects/FuumaShouakuEffect.cpp +++ b/Source/Contents/Effects/FuumaShouakuEffect.cpp @@ -33,7 +33,7 @@ void CFuumaShouakuEffect::Close() { // OFFSET: 0x00702A60 // FUNCTION: fn_07010 -void CFuumaShouakuEffect::Slot01() { +void CFuumaShouakuEffect::Open() { this->retained = 1; CEZ2STRParticle* particle = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); this->first = particle; @@ -61,13 +61,13 @@ void CFuumaShouakuEffect::Slot01() { // OFFSET: 0x00702CC0 // FUNCTION: fn_07011 -bool CFuumaShouakuEffect::Slot06() { +bool CFuumaShouakuEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00702CD0 // FUNCTION: fn_07012 -void CFuumaShouakuEffect::Slot03() { +void CFuumaShouakuEffect::OnProcess() { if (this->frame < this->unknown_00E0) { if (this->first) { this->first->position.x += this->unknown_00D4; @@ -101,7 +101,7 @@ void CFuumaShouakuEffect::Slot03() { // OFFSET: 0x00702F30 // FUNCTION: fn_07013 -void CFuumaShouakuEffect::Slot04() { +void CFuumaShouakuEffect::Render() { if (this->first) { this->first->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } diff --git a/Source/Contents/Effects/FuumaShouakuEffect.h b/Source/Contents/Effects/FuumaShouakuEffect.h index 826db9018..9f6fc8af7 100644 --- a/Source/Contents/Effects/FuumaShouakuEffect.h +++ b/Source/Contents/Effects/FuumaShouakuEffect.h @@ -11,11 +11,11 @@ class CFuumaShouakuEffect : public CEffect { public: CFuumaShouakuEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ CEZ2STRParticle* first; /* 00D0 */ CEZ2STRParticle* second; diff --git a/Source/Contents/Effects/GlassWallEffect.cpp b/Source/Contents/Effects/GlassWallEffect.cpp index 479785ea2..879a0076d 100644 --- a/Source/Contents/Effects/GlassWallEffect.cpp +++ b/Source/Contents/Effects/GlassWallEffect.cpp @@ -49,7 +49,7 @@ void CGlassWall::Close() { // OFFSET: 0x00B449B0 // FUNCTION: fn_18892 -void CGlassWall::Slot01() { +void CGlassWall::Open() { int angle = 180; CRenderObject* actor = FindRenderObject(this->actor); if (actor) { @@ -73,19 +73,19 @@ void CGlassWall::Slot01() { this->effect->position[0] = this->position[0]; this->effect->position[1] = this->position[1]; this->effect->position[2] = this->position[2]; - this->effect->Slot29(this->id); - this->effect->Slot01(); + this->effect->SetId(this->id); + this->effect->Open(); } // OFFSET: 0x00B44BC0 // FUNCTION: fn_18893 -bool CGlassWall::Slot06() { +bool CGlassWall::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B44BE0 // FUNCTION: fn_18894 -void CGlassWall::Slot03() { +void CGlassWall::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; const int frame = this->frame; @@ -124,13 +124,13 @@ void CGlassWall::Slot03() { } if (this->effect) { - this->effect->Slot03(); + this->effect->OnProcess(); } } // OFFSET: 0x00B44F70 // FUNCTION: fn_18895 -void CGlassWall::Slot04() { +void CGlassWall::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; const float width = particle->scale; @@ -151,6 +151,6 @@ void CGlassWall::Slot04() { } if (this->effect) { - this->effect->Slot04(); + this->effect->Render(); } } diff --git a/Source/Contents/Effects/GlassWallEffect.h b/Source/Contents/Effects/GlassWallEffect.h index 542c6ca56..1265046b1 100644 --- a/Source/Contents/Effects/GlassWallEffect.h +++ b/Source/Contents/Effects/GlassWallEffect.h @@ -11,11 +11,11 @@ class CParticle; class CGlassWall : public CEffect { public: ~CGlassWall() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddPanel(float angle, float scale, float x, float y, float z); diff --git a/Source/Contents/Effects/GravityControlEffect.h b/Source/Contents/Effects/GravityControlEffect.h index 127d6ae79..eb7926d1c 100644 --- a/Source/Contents/Effects/GravityControlEffect.h +++ b/Source/Contents/Effects/GravityControlEffect.h @@ -9,11 +9,11 @@ class CGravityControlEffect : public CEffect { public: CGravityControlEffect() : CEffect(-1), target(0), unknown_00D0(0), unknown_00D4(-20.0f) {} - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; ~CGravityControlEffect() override; /* 00CC */ int target; diff --git a/Source/Contents/Effects/HealEffect.cpp b/Source/Contents/Effects/HealEffect.cpp index 6a6c8dd76..871150836 100644 --- a/Source/Contents/Effects/HealEffect.cpp +++ b/Source/Contents/Effects/HealEffect.cpp @@ -323,19 +323,19 @@ void CHealEffect::Close() { // OFFSET: 0x00B69050 // FUNCTION: fn_19075 -bool CHealEffect::Slot06() { +bool CHealEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B68770 // FUNCTION: fn_19072 -void CHealEffect::Slot01() { +void CHealEffect::Open() { this->unknown_002C = 100; } // OFFSET: 0x00B68780 // FUNCTION: fn_19073 -void CHealEffect::Slot12() { +void CHealEffect::InitEvents() { switch (this->id) { case 253: this->AddEvent(0, "effect\\흡기.wav", 0, 0); @@ -431,7 +431,7 @@ void CHealEffect::SpawnParticles() { // OFFSET: 0x00B69160 // FUNCTION: fn_19076 -void CHealEffect::Slot03() { +void CHealEffect::OnProcess() { this->SpawnParticles(); for (auto it = this->columnParticles.begin(); it != this->columnParticles.end(); ++it) { @@ -592,7 +592,7 @@ void CHealEffect::Slot03() { // OFFSET: 0x00B69BC0 // FUNCTION: fn_19077 -void CHealEffect::Slot04() { +void CHealEffect::Render() { for (auto it = this->columnParticles.begin(); it != this->columnParticles.end(); ++it) { CParticle* particle = *it; if (particle && particle->unknown_000C > 0) { diff --git a/Source/Contents/Effects/HealEffect.h b/Source/Contents/Effects/HealEffect.h index 59a2c5494..38e6c932b 100644 --- a/Source/Contents/Effects/HealEffect.h +++ b/Source/Contents/Effects/HealEffect.h @@ -13,12 +13,12 @@ class CHealEffect : public CEffect { public: CHealEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; + bool IsAlive() override; + void InitEvents() override; void AddSparks(int kind); void AddColumn(int kind); diff --git a/Source/Contents/Effects/HealSpEffect.cpp b/Source/Contents/Effects/HealSpEffect.cpp index c4780c1dc..1955b5937 100644 --- a/Source/Contents/Effects/HealSpEffect.cpp +++ b/Source/Contents/Effects/HealSpEffect.cpp @@ -59,7 +59,7 @@ void CHealSp::Close() { // OFFSET: 0x00B45740 // FUNCTION: fn_18901 -void CHealSp::Slot01() { +void CHealSp::Open() { this->AddRing(2.5f, 2.5f, 15.0f, 16); this->AddRing(3.5f, 3.5f, 25.0f, 32); this->AddRing(4.5f, 4.5f, 35.0f, 64); @@ -67,13 +67,13 @@ void CHealSp::Slot01() { // OFFSET: 0x00B457B0 // FUNCTION: fn_18902 -bool CHealSp::Slot06() { +bool CHealSp::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B458E0 // FUNCTION: fn_18903 -void CHealSp::Slot03() { +void CHealSp::OnProcess() { matrix rotation; if (this->frame % 2 == 0) { const float angle = static_cast(std::max(rand() % 360, 0)); @@ -171,7 +171,7 @@ void CHealSp::Slot03() { // OFFSET: 0x00B46230 // FUNCTION: fn_18905 -void CHealSp::Slot04() { +void CHealSp::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; const int segment = particle->unknown_000C; diff --git a/Source/Contents/Effects/HealSpEffect.h b/Source/Contents/Effects/HealSpEffect.h index b87ed81d2..dcb065ae4 100644 --- a/Source/Contents/Effects/HealSpEffect.h +++ b/Source/Contents/Effects/HealSpEffect.h @@ -13,11 +13,11 @@ class CSpriteParticle; class CHealSp : public CEffect { public: ~CHealSp() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddRing(float inner, float outer, float height, int duration); diff --git a/Source/Contents/Effects/HitLineEffect.cpp b/Source/Contents/Effects/HitLineEffect.cpp index 9c7545971..42d7419c9 100644 --- a/Source/Contents/Effects/HitLineEffect.cpp +++ b/Source/Contents/Effects/HitLineEffect.cpp @@ -19,7 +19,7 @@ void CHitLineEffect::Close() { // OFFSET: 0x00705100 // FUNCTION: fn_07036 -void CHitLineEffect::Slot01() { +void CHitLineEffect::Open() { for (int pass = 0; pass < 4; ++pass) { for (int line = 0; line < 4; ++line) { const int delay = -std::max(rand() % 26, 0); @@ -54,13 +54,13 @@ void CHitLineEffect::Slot01() { // OFFSET: 0x00705270 // FUNCTION: fn_07037 -bool CHitLineEffect::Slot06() { +bool CHitLineEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00705280 // FUNCTION: fn_07038 -void CHitLineEffect::Slot03() { +void CHitLineEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -95,7 +95,7 @@ void CHitLineEffect::Slot03() { // OFFSET: 0x00705510 // FUNCTION: fn_07039 -void CHitLineEffect::Slot04() { +void CHitLineEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle || *reinterpret_cast(particle->unknown_0048) <= 0 || particle->unknown_00E8 <= 0) { diff --git a/Source/Contents/Effects/HitLineEffect.h b/Source/Contents/Effects/HitLineEffect.h index 6342f1d29..79d2097cf 100644 --- a/Source/Contents/Effects/HitLineEffect.h +++ b/Source/Contents/Effects/HitLineEffect.h @@ -11,11 +11,11 @@ class CParticle; class CHitLineEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector particles; /* 00D8 */ vector3d previous[2]; diff --git a/Source/Contents/Effects/JupitelThunderStormEffect.cpp b/Source/Contents/Effects/JupitelThunderStormEffect.cpp index f3c397c48..253b3d0a9 100644 --- a/Source/Contents/Effects/JupitelThunderStormEffect.cpp +++ b/Source/Contents/Effects/JupitelThunderStormEffect.cpp @@ -41,7 +41,7 @@ void CJupitelThunderStormEffect::Close() { // OFFSET: 0x00706180 // FUNCTION: fn_07043 -void CJupitelThunderStormEffect::Slot01() { +void CJupitelThunderStormEffect::Open() { const float dy = this->sourcePosition[1] - this->position[1]; const float dx = this->sourcePosition[0] - this->position[0]; const float dz = this->sourcePosition[2] - this->position[2]; @@ -100,7 +100,7 @@ void CJupitelThunderStormEffect::Slot01() { // OFFSET: 0x007065F0 // FUNCTION: fn_07044 -bool CJupitelThunderStormEffect::Slot06() { +bool CJupitelThunderStormEffect::IsAlive() { if (this->particle && ParticleAlive(this->particle)) { return true; } @@ -116,7 +116,7 @@ bool CJupitelThunderStormEffect::Slot06() { // OFFSET: 0x00706690 // FUNCTION: fn_07045 -void CJupitelThunderStormEffect::Slot03() { +void CJupitelThunderStormEffect::OnProcess() { if (CParticle* particle = this->particle) { if (ParticleAlive(particle)) { vector3d position; @@ -146,7 +146,7 @@ void CJupitelThunderStormEffect::Slot03() { // OFFSET: 0x007067C0 // FUNCTION: fn_07046 -void CJupitelThunderStormEffect::Slot04() { +void CJupitelThunderStormEffect::Render() { if (this->particle) { static_cast(this->particle)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } diff --git a/Source/Contents/Effects/JupitelThunderStormEffect.h b/Source/Contents/Effects/JupitelThunderStormEffect.h index c51ea12f5..dc1ba2482 100644 --- a/Source/Contents/Effects/JupitelThunderStormEffect.h +++ b/Source/Contents/Effects/JupitelThunderStormEffect.h @@ -13,11 +13,11 @@ class CJupitelThunderStormEffect : public CEffect { public: CJupitelThunderStormEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ CParticle* particle; /* 00D0 */ std::vector particles; diff --git a/Source/Contents/Effects/Level150Effect.cpp b/Source/Contents/Effects/Level150Effect.cpp index 5114587fd..ae27026a6 100644 --- a/Source/Contents/Effects/Level150Effect.cpp +++ b/Source/Contents/Effects/Level150Effect.cpp @@ -20,7 +20,7 @@ CLevel150Effect::CLevel150Effect() : CEffect(-1) { // OFFSET: 0x00B465A0 // FUNCTION: fn_18908 -void CLevel150Effect::Slot10(int blend) { +void CLevel150Effect::SetDestinationBlend(int blend) { for (std::vector::iterator it = this->bubbles.begin(); it != this->bubbles.end(); ++it) { if (blend != -1) { (*it)->destinationBlend = blend; @@ -36,7 +36,7 @@ void CLevel150Effect::Slot10(int blend) { // OFFSET: 0x00B46600 // FUNCTION: fn_18909 -void CLevel150Effect::Slot08(int red, int green, int blue) { +void CLevel150Effect::SetColor(int red, int green, int blue) { for (std::vector::iterator it = this->bubbles.begin(); it != this->bubbles.end(); ++it) { (*it)->SetColor(red, green, blue); } @@ -198,7 +198,7 @@ void CLevel150Effect::Close() { // OFFSET: 0x00B46D80 // FUNCTION: fn_18913 -void CLevel150Effect::Slot01() { +void CLevel150Effect::Open() { this->AddBubbleRing(45); this->AddBubbleRing(25); this->AddShock(2); @@ -207,13 +207,13 @@ void CLevel150Effect::Slot01() { // OFFSET: 0x00B46DB0 // FUNCTION: fn_18914 -bool CLevel150Effect::Slot06() { +bool CLevel150Effect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B46F00 // FUNCTION: fn_18915 -void CLevel150Effect::Slot03() { +void CLevel150Effect::OnProcess() { for (std::vector::iterator it = this->bubbles.begin(); it != this->bubbles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -293,7 +293,7 @@ void CLevel150Effect::Slot03() { // OFFSET: 0x00B474C0 // FUNCTION: fn_18916 -void CLevel150Effect::Slot04() { +void CLevel150Effect::Render() { for (std::vector::iterator it = this->bubbles.begin(); it != this->bubbles.end(); ++it) { CParticle* particle = *it; if (!particle || particle->unknown_000C <= 0) { @@ -318,7 +318,7 @@ CLevel150SubEffect::CLevel150SubEffect() : CEffect(-1) { // OFFSET: 0x00B477D0 // FUNCTION: fn_18919 -void CLevel150SubEffect::Slot10(int blend) { +void CLevel150SubEffect::SetDestinationBlend(int blend) { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { if (blend != -1) { (*it)->destinationBlend = blend; @@ -328,7 +328,7 @@ void CLevel150SubEffect::Slot10(int blend) { // OFFSET: 0x00B47810 // FUNCTION: fn_18920 -void CLevel150SubEffect::Slot08(int red, int green, int blue) { +void CLevel150SubEffect::SetColor(int red, int green, int blue) { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->SetColor(red, green, blue); } @@ -385,19 +385,19 @@ void CLevel150SubEffect::Close() { // OFFSET: 0x00B47AD0 // FUNCTION: fn_18923 -void CLevel150SubEffect::Slot01() { +void CLevel150SubEffect::Open() { this->Init(); } // OFFSET: 0x00B47AE0 // FUNCTION: fn_18924 -bool CLevel150SubEffect::Slot06() { +bool CLevel150SubEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B47AF0 // FUNCTION: fn_18925 -void CLevel150SubEffect::Slot03() { +void CLevel150SubEffect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -445,7 +445,7 @@ void CLevel150SubEffect::Slot03() { // OFFSET: 0x00B47FD0 // FUNCTION: fn_18926 -void CLevel150SubEffect::Slot04() { +void CLevel150SubEffect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); } diff --git a/Source/Contents/Effects/Level150Effect.h b/Source/Contents/Effects/Level150Effect.h index fd92de970..c6838dd18 100644 --- a/Source/Contents/Effects/Level150Effect.h +++ b/Source/Contents/Effects/Level150Effect.h @@ -12,13 +12,13 @@ class CParticle; class CLevel150Effect : public CEffect { public: CLevel150Effect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot08(int red, int green, int blue) override; - void Slot10(int blend) override; + bool IsAlive() override; + void SetColor(int red, int green, int blue) override; + void SetDestinationBlend(int blend) override; void AddBubbleRing(int alphaOffset); void AddShock(int kind); @@ -30,13 +30,13 @@ public: class CLevel150SubEffect : public CEffect { public: CLevel150SubEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot08(int red, int green, int blue) override; - void Slot10(int blend) override; + bool IsAlive() override; + void SetColor(int red, int green, int blue) override; + void SetDestinationBlend(int blend) override; void Init(); /* 00CC */ std::vector particles; diff --git a/Source/Contents/Effects/Level99Effect.cpp b/Source/Contents/Effects/Level99Effect.cpp index f0f1db814..096204d41 100644 --- a/Source/Contents/Effects/Level99Effect.cpp +++ b/Source/Contents/Effects/Level99Effect.cpp @@ -13,7 +13,7 @@ CLevel99Effect::CLevel99Effect() : CEffect(200) { // OFFSET: 0x00B6A250 // FUNCTION: fn_19081 -void CLevel99Effect::Slot08(int red, int green, int blue) { +void CLevel99Effect::SetColor(int red, int green, int blue) { for (std::vector::iterator it = this->sparkles.begin(); it != this->sparkles.end(); ++it) { (*it)->SetColor(red, green, blue); } @@ -24,7 +24,7 @@ void CLevel99Effect::Slot08(int red, int green, int blue) { // OFFSET: 0x00B6A2D0 // FUNCTION: fn_19082 -void CLevel99Effect::Slot11(std::string name) { +void CLevel99Effect::SetParticleTexture(std::string name) { for (auto it = this->sparkles.begin(); it != this->sparkles.end(); ++it) { (*it)->SetTexture(name); } @@ -123,7 +123,7 @@ void CLevel99Effect::Close() { // OFFSET: 0x00B6AAD0 // FUNCTION: fn_19085 -void CLevel99Effect::Slot01() { +void CLevel99Effect::Open() { int index = 0; int tilt = 0; int angle = 0; @@ -153,13 +153,13 @@ void CLevel99Effect::Slot01() { // OFFSET: 0x00B6ABB0 // FUNCTION: fn_19086 -bool CLevel99Effect::Slot06() { +bool CLevel99Effect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B6AC90 // FUNCTION: fn_19087 -void CLevel99Effect::Slot03() { +void CLevel99Effect::OnProcess() { for (auto it = this->sparkles.begin(); it != this->sparkles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -210,7 +210,7 @@ void CLevel99Effect::Slot03() { // OFFSET: 0x00B6B0E0 // FUNCTION: fn_19088 -void CLevel99Effect::Slot04() { +void CLevel99Effect::Render() { for (std::vector::iterator it = this->sparkles.begin(); it != this->sparkles.end(); ++it) { CParticle* sparkle = *it; if (sparkle) { diff --git a/Source/Contents/Effects/Level99Effect.h b/Source/Contents/Effects/Level99Effect.h index cab1f34d6..44f586b60 100644 --- a/Source/Contents/Effects/Level99Effect.h +++ b/Source/Contents/Effects/Level99Effect.h @@ -13,13 +13,13 @@ class CParticle; class CLevel99Effect : public CEffect { public: CLevel99Effect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot08(int red, int green, int blue) override; - void Slot11(std::string name) override; + bool IsAlive() override; + void SetColor(int red, int green, int blue) override; + void SetParticleTexture(std::string name) override; void AddRings(); diff --git a/Source/Contents/Effects/Level99Orb1Effect.cpp b/Source/Contents/Effects/Level99Orb1Effect.cpp index 83d262991..5cd163c5e 100644 --- a/Source/Contents/Effects/Level99Orb1Effect.cpp +++ b/Source/Contents/Effects/Level99Orb1Effect.cpp @@ -28,7 +28,7 @@ void CLevel99Orb1Effect::Close() { // OFFSET: 0x00B6B3D0 // FUNCTION: fn_19092 -void CLevel99Orb1Effect::Slot01() { +void CLevel99Orb1Effect::Open() { for (int row = 0; row < 4; ++row) { for (int column = 0; column < 4; ++column) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); @@ -61,13 +61,13 @@ void CLevel99Orb1Effect::Slot01() { // OFFSET: 0x00B6B520 // FUNCTION: fn_19093 -bool CLevel99Orb1Effect::Slot06() { +bool CLevel99Orb1Effect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B6B530 // FUNCTION: fn_19094 -void CLevel99Orb1Effect::Slot03() { +void CLevel99Orb1Effect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -144,7 +144,7 @@ void CLevel99Orb1Effect::Slot03() { // OFFSET: 0x00B6BD30 // FUNCTION: fn_19095 -void CLevel99Orb1Effect::Slot04() { +void CLevel99Orb1Effect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/Level99Orb1Effect.h b/Source/Contents/Effects/Level99Orb1Effect.h index 51d79c7e2..83d14da6a 100644 --- a/Source/Contents/Effects/Level99Orb1Effect.h +++ b/Source/Contents/Effects/Level99Orb1Effect.h @@ -12,11 +12,11 @@ class CParticle; class CLevel99Orb1Effect : public CEffect { public: CLevel99Orb1Effect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ vector3d offsets[16]; /* 018C */ std::vector particles; diff --git a/Source/Contents/Effects/Level99Orb2Effect.cpp b/Source/Contents/Effects/Level99Orb2Effect.cpp index 86873c0a1..5f0cf18c3 100644 --- a/Source/Contents/Effects/Level99Orb2Effect.cpp +++ b/Source/Contents/Effects/Level99Orb2Effect.cpp @@ -31,7 +31,7 @@ void CLevel99Orb2Effect::Close() { // OFFSET: 0x00B6BFB0 // FUNCTION: fn_19099 -void CLevel99Orb2Effect::Slot01() { +void CLevel99Orb2Effect::Open() { for (int row = 0; row < 4; ++row) { for (int column = 0; column < 4; ++column) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 13); @@ -66,13 +66,13 @@ void CLevel99Orb2Effect::Slot01() { // OFFSET: 0x00B6C0F0 // FUNCTION: fn_19100 -bool CLevel99Orb2Effect::Slot06() { +bool CLevel99Orb2Effect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B6C100 // FUNCTION: fn_19101 -void CLevel99Orb2Effect::Slot03() { +void CLevel99Orb2Effect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -146,7 +146,7 @@ void CLevel99Orb2Effect::Slot03() { // OFFSET: 0x00B6C920 // FUNCTION: fn_19102 -void CLevel99Orb2Effect::Slot04() { +void CLevel99Orb2Effect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/Level99Orb2Effect.h b/Source/Contents/Effects/Level99Orb2Effect.h index acc63e094..556392494 100644 --- a/Source/Contents/Effects/Level99Orb2Effect.h +++ b/Source/Contents/Effects/Level99Orb2Effect.h @@ -12,11 +12,11 @@ class CParticle; class CLevel99Orb2Effect : public CEffect { public: CLevel99Orb2Effect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; ~CLevel99Orb2Effect() override; /* 00CC */ EffectPoint offsets[4][4]; diff --git a/Source/Contents/Effects/LightSphereEffect.cpp b/Source/Contents/Effects/LightSphereEffect.cpp index d3a4e137f..df08fe201 100644 --- a/Source/Contents/Effects/LightSphereEffect.cpp +++ b/Source/Contents/Effects/LightSphereEffect.cpp @@ -117,7 +117,7 @@ void CLightSphereEffect::Close() { // OFFSET: 0x00B6D060 // FUNCTION: fn_19107 -void CLightSphereEffect::Slot01() { +void CLightSphereEffect::Open() { for (int i = 0; i < 4; ++i) { CParticle* particle = CreateParticle(reinterpret_cast(&this->position), 5); if (particle != nullptr) { @@ -154,7 +154,7 @@ void CLightSphereEffect::Slot01() { // OFFSET: 0x00B6D160 // FUNCTION: fn_19108 -bool CLightSphereEffect::Slot06() { +bool CLightSphereEffect::IsAlive() { std::vector::iterator sphere = this->spheres.begin(); for (; sphere != this->spheres.end(); ++sphere) { if ((*sphere)->alpha > 0) { @@ -174,7 +174,7 @@ bool CLightSphereEffect::Slot06() { // OFFSET: 0x00B6D1C0 // FUNCTION: fn_19109 -void CLightSphereEffect::Slot03() { +void CLightSphereEffect::OnProcess() { for (std::vector::iterator it = this->spheres.begin(); it != this->spheres.end(); ++it) { CParticle* particle = *it; @@ -294,7 +294,7 @@ void CLightSphereEffect::Slot03() { // OFFSET: 0x00B6D990 // FUNCTION: fn_19110 -void CLightSphereEffect::Slot04() { +void CLightSphereEffect::Render() { for (std::vector::iterator it = this->spheres.begin(); it != this->spheres.end(); ++it) { CParticle* particle = *it; diff --git a/Source/Contents/Effects/LightSphereEffect.h b/Source/Contents/Effects/LightSphereEffect.h index 0edc7eb05..276c90fc2 100644 --- a/Source/Contents/Effects/LightSphereEffect.h +++ b/Source/Contents/Effects/LightSphereEffect.h @@ -11,11 +11,11 @@ class CParticle; class CLightSphereEffect : public CEffect { public: CLightSphereEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void CreateRayParticles(int param); diff --git a/Source/Contents/Effects/MagicFloorEffect.cpp b/Source/Contents/Effects/MagicFloorEffect.cpp index 792bac8cf..f893aaf1b 100644 --- a/Source/Contents/Effects/MagicFloorEffect.cpp +++ b/Source/Contents/Effects/MagicFloorEffect.cpp @@ -101,7 +101,7 @@ void CMagicFloorEffect::Close() { // OFFSET: 0x00B48DC0 // FUNCTION: fn_18932 -void CMagicFloorEffect::Slot01() { +void CMagicFloorEffect::Open() { this->AddFloors(); this->AddClouds(0); this->AddClouds(1); @@ -109,7 +109,7 @@ void CMagicFloorEffect::Slot01() { // OFFSET: 0x00B48E70 // FUNCTION: fn_18933 -void CMagicFloorEffect::Slot07() { +void CMagicFloorEffect::ResetParticles() { for (std::vector::iterator it = this->floors.begin(); it != this->floors.end(); ++it) { CParticle* particle = *it; particle->flags = 5; @@ -129,13 +129,13 @@ void CMagicFloorEffect::Slot07() { // OFFSET: 0x00B48F20 // FUNCTION: fn_18934 -bool CMagicFloorEffect::Slot06() { +bool CMagicFloorEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B48F30 // FUNCTION: fn_18935 -void CMagicFloorEffect::Slot03() { +void CMagicFloorEffect::OnProcess() { for (std::vector::iterator it = this->floors.begin(); it != this->floors.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -256,7 +256,7 @@ void CMagicFloorEffect::Slot03() { // OFFSET: 0x00B49760 // FUNCTION: fn_18936 -void CMagicFloorEffect::Slot04() { +void CMagicFloorEffect::Render() { for (std::vector::iterator it = this->floors.begin(); it != this->floors.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/MagicFloorEffect.h b/Source/Contents/Effects/MagicFloorEffect.h index c2ab9f59d..a6565bd9b 100644 --- a/Source/Contents/Effects/MagicFloorEffect.h +++ b/Source/Contents/Effects/MagicFloorEffect.h @@ -12,12 +12,12 @@ class CParticle; class CMagicFloorEffect : public CEffect { public: CMagicFloorEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; + bool IsAlive() override; + void ResetParticles() override; void AddFloors(); void AddClouds(int layer); diff --git a/Source/Contents/Effects/MagnumBreak.cpp b/Source/Contents/Effects/MagnumBreak.cpp index 9ddda81b1..6a943a720 100644 --- a/Source/Contents/Effects/MagnumBreak.cpp +++ b/Source/Contents/Effects/MagnumBreak.cpp @@ -64,7 +64,7 @@ void CMagnumBreak::Close() { // OFFSET: 0x00B49D40 // FUNCTION: fn_18940 -void CMagnumBreak::Slot01() { +void CMagnumBreak::Open() { this->AddRings(); this->AddRings(); this->AddWaves(); @@ -72,13 +72,13 @@ void CMagnumBreak::Slot01() { // OFFSET: 0x00B49E50 // FUNCTION: fn_18941 -bool CMagnumBreak::Slot06() { +bool CMagnumBreak::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B49E60 // FUNCTION: fn_18942 -void CMagnumBreak::Slot03() { +void CMagnumBreak::OnProcess() { for (std::vector::iterator it = this->rings.begin(); it != this->rings.end(); ++it) { CParticle* ring = *it; float& growth = *reinterpret_cast(&ring->unknown_0048[0x0C]); @@ -129,7 +129,7 @@ void CMagnumBreak::Slot03() { // OFFSET: 0x00B4A150 // FUNCTION: fn_18943 -void CMagnumBreak::Slot04() { +void CMagnumBreak::Render() { for (std::vector::iterator it = this->rings.begin(); it != this->rings.end(); ++it) { CParticle* ring = *it; const int angle = static_cast(*reinterpret_cast(&ring->unknown_00C4)); diff --git a/Source/Contents/Effects/MagnumBreak.h b/Source/Contents/Effects/MagnumBreak.h index 4ff0af125..1230aec07 100644 --- a/Source/Contents/Effects/MagnumBreak.h +++ b/Source/Contents/Effects/MagnumBreak.h @@ -10,11 +10,11 @@ class CParticle; class CMagnumBreak : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddRings(); void AddWaves(); diff --git a/Source/Contents/Effects/MapChainEffect.cpp b/Source/Contents/Effects/MapChainEffect.cpp index 1e2d1d27e..912c1af6c 100644 --- a/Source/Contents/Effects/MapChainEffect.cpp +++ b/Source/Contents/Effects/MapChainEffect.cpp @@ -81,7 +81,7 @@ void CMapChainEffect::Close() { // OFFSET: 0x00B4AFE0 // FUNCTION: fn_18949 -void CMapChainEffect::Slot01() { +void CMapChainEffect::Open() { this->CreateChainParticles(25); this->CreateChainParticles(50); this->CreateChainParticles(95); @@ -91,7 +91,7 @@ void CMapChainEffect::Slot01() { // OFFSET: 0x00B4B0A0 // FUNCTION: fn_18950 -void CMapChainEffect::Slot07() { +void CMapChainEffect::ResetParticles() { const char* base = reinterpret_cast(this); for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { @@ -114,13 +114,13 @@ void CMapChainEffect::Slot07() { // OFFSET: 0x00B4B130 // FUNCTION: fn_18951 -bool CMapChainEffect::Slot06() { +bool CMapChainEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B4B140 // FUNCTION: fn_18952 -void CMapChainEffect::Slot03() { +void CMapChainEffect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -207,7 +207,7 @@ void CMapChainEffect::Slot03() { // OFFSET: 0x00B4B740 // FUNCTION: fn_18953 -void CMapChainEffect::Slot04() { +void CMapChainEffect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle && particle->unknown_000C > 0) { diff --git a/Source/Contents/Effects/MapChainEffect.h b/Source/Contents/Effects/MapChainEffect.h index 8386ddbb4..02f5a90f1 100644 --- a/Source/Contents/Effects/MapChainEffect.h +++ b/Source/Contents/Effects/MapChainEffect.h @@ -20,12 +20,12 @@ struct MapChainPoint { class CMapChainEffect : public CEffect { public: CMapChainEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; + bool IsAlive() override; + void ResetParticles() override; void CreateChainParticles(int param); diff --git a/Source/Contents/Effects/MapMagicZoneEffect.cpp b/Source/Contents/Effects/MapMagicZoneEffect.cpp index ce5b78c73..aa604d17e 100644 --- a/Source/Contents/Effects/MapMagicZoneEffect.cpp +++ b/Source/Contents/Effects/MapMagicZoneEffect.cpp @@ -58,7 +58,7 @@ void CMapMagicZoneEffect::Close() { // OFFSET: 0x00B6E1D0 // FUNCTION: fn_19114 -void CMapMagicZoneEffect::Slot01() { +void CMapMagicZoneEffect::Open() { this->AddSpinner(0); this->AddSpinner(1); @@ -113,13 +113,13 @@ void CMapMagicZoneEffect::Slot01() { // OFFSET: 0x00B6E3B0 // FUNCTION: fn_19115 -bool CMapMagicZoneEffect::Slot06() { +bool CMapMagicZoneEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B6E3C0 // FUNCTION: fn_19116 -void CMapMagicZoneEffect::Slot03() { +void CMapMagicZoneEffect::OnProcess() { for (std::vector::iterator it = this->spinners.begin(); it != this->spinners.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -257,7 +257,7 @@ void CMapMagicZoneEffect::UpdateSpinner(CParticle* particle) { // OFFSET: 0x00B6F010 // FUNCTION: fn_19118 -void CMapMagicZoneEffect::Slot04() { +void CMapMagicZoneEffect::Render() { for (std::vector::iterator it = this->spinners.begin(); it != this->spinners.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/MapMagicZoneEffect.h b/Source/Contents/Effects/MapMagicZoneEffect.h index b45ff1745..abaa3613b 100644 --- a/Source/Contents/Effects/MapMagicZoneEffect.h +++ b/Source/Contents/Effects/MapMagicZoneEffect.h @@ -11,11 +11,11 @@ class CParticle; class CMapMagicZoneEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddSpinner(int kind); __declspec(noinline) void UpdateSpinner(CParticle* particle); diff --git a/Source/Contents/Effects/MappillarEffect.cpp b/Source/Contents/Effects/MappillarEffect.cpp index 62abdb0d6..c4a086655 100644 --- a/Source/Contents/Effects/MappillarEffect.cpp +++ b/Source/Contents/Effects/MappillarEffect.cpp @@ -19,7 +19,7 @@ void CMappillarEffect::Close() { // OFFSET: 0x00B4BBF0 // FUNCTION: fn_18956 -void CMappillarEffect::Slot01() { +void CMappillarEffect::Open() { for (int ring = 0; ring < 4; ++ring) { for (int segment = 0; segment <= 21; ++segment) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); @@ -87,13 +87,13 @@ void CMappillarEffect::Slot01() { // OFFSET: 0x00B4C0B0 // FUNCTION: fn_18957 -bool CMappillarEffect::Slot06() { +bool CMappillarEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B4C0C0 // FUNCTION: fn_18958 -void CMappillarEffect::Slot03() { +void CMappillarEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -136,7 +136,7 @@ void CMappillarEffect::Slot03() { // OFFSET: 0x00B4C4C0 // FUNCTION: fn_18959 -void CMappillarEffect::Slot04() { +void CMappillarEffect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/MappillarEffect.h b/Source/Contents/Effects/MappillarEffect.h index 390dbea93..e7287774f 100644 --- a/Source/Contents/Effects/MappillarEffect.h +++ b/Source/Contents/Effects/MappillarEffect.h @@ -11,11 +11,11 @@ class CParticle; class CMappillarEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ vector3d lastInner; /* 00D8 */ vector3d lastOuter; diff --git a/Source/Contents/Effects/MeteorEffect.cpp b/Source/Contents/Effects/MeteorEffect.cpp index 5f1d64990..c29cbfeac 100644 --- a/Source/Contents/Effects/MeteorEffect.cpp +++ b/Source/Contents/Effects/MeteorEffect.cpp @@ -22,7 +22,7 @@ void CMeteorEffect::Close() { // OFFSET: 0x00707810 // FUNCTION: fn_07056 -void CMeteorEffect::Slot01() { +void CMeteorEffect::Open() { switch (this->id) { case 1099: case 1111: { @@ -103,13 +103,13 @@ void CMeteorEffect::Slot01() { // OFFSET: 0x00707B40 // FUNCTION: fn_07057 -bool CMeteorEffect::Slot06() { +bool CMeteorEffect::IsAlive() { return !this->unknown_00CC.empty(); } // OFFSET: 0x00707B50 // FUNCTION: fn_07058 -void CMeteorEffect::Slot03() { +void CMeteorEffect::OnProcess() { for (auto it = this->unknown_00CC.begin(); it != this->unknown_00CC.end(); ) { CParticle* particle = *it; if (particle->life == 0.0f || static_cast(particle->unknown_00E8) < particle->life * 60.0f) { @@ -131,7 +131,7 @@ void CMeteorEffect::Slot03() { // OFFSET: 0x00707CA0 // FUNCTION: fn_07059 -void CMeteorEffect::Slot04() { +void CMeteorEffect::Render() { for (auto it = this->unknown_00CC.begin(); it != this->unknown_00CC.end(); ++it) { CParticle* particle = *it; if ((particle->life == 0.0f || particle->life * 60.0f > static_cast(particle->unknown_00E8)) && particle) { diff --git a/Source/Contents/Effects/MonsterSkillEffects.cpp b/Source/Contents/Effects/MonsterSkillEffects.cpp index f900fbffd..cd9756691 100644 --- a/Source/Contents/Effects/MonsterSkillEffects.cpp +++ b/Source/Contents/Effects/MonsterSkillEffects.cpp @@ -65,7 +65,7 @@ static bool IsEmitterAlive(const EZ2STREmitter* emitter) { // OFFSET: 0x0070C070 // FUNCTION: fn_07123 -bool CCrimsonArrowEffect::Slot06() { +bool CCrimsonArrowEffect::IsAlive() { EZ2STREmitter* emitter = this->emitter; if (emitter) { if (0.0f == emitter->lifetime) { @@ -85,7 +85,7 @@ CRootTwistEffect::CRootTwistEffect() : CEffect(1110) { // OFFSET: 0x0070C0B0 // FUNCTION: fn_07124 -void CCrimsonArrowEffect::Slot03() { +void CCrimsonArrowEffect::OnProcess() { if (!this->emitter) { return; } @@ -98,7 +98,7 @@ void CCrimsonArrowEffect::Slot03() { // OFFSET: 0x0070C120 // FUNCTION: fn_07125 -void CCrimsonArrowEffect::Slot04() { +void CCrimsonArrowEffect::Render() { if (this->emitter) { AsParticle(this->emitter)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -106,7 +106,7 @@ void CCrimsonArrowEffect::Slot04() { // OFFSET: 0x0070C3B0 // FUNCTION: fn_07130 -void CRootTwistEffect::Slot12() { +void CRootTwistEffect::InitEvents() { if (this->id == 1110) { this->AddEvent(0, "effect\\su_roottwist.wav", 0, 0); } @@ -114,13 +114,13 @@ void CRootTwistEffect::Slot12() { // OFFSET: 0x0070C3D0 // FUNCTION: fn_07131 -bool CRootTwistEffect::Slot06() { +bool CRootTwistEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0070C3E0 // FUNCTION: fn_07132 -void CRootTwistEffect::Slot03() { +void CRootTwistEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { const vector3d position = {this->position[0] + 0.0f, this->position[1] + 3.0f, this->position[2] + 0.0f}; EZ2STREmitter* emitter = *it; @@ -131,7 +131,7 @@ void CRootTwistEffect::Slot03() { // OFFSET: 0x0070C440 // FUNCTION: fn_07133 -void CRootTwistEffect::Slot04() { +void CRootTwistEffect::Render() { for (auto emitter = this->emitters.begin(); emitter != this->emitters.end(); ++emitter) { AsSprite(*emitter)->Draw(1); } @@ -139,13 +139,13 @@ void CRootTwistEffect::Slot04() { // OFFSET: 0x0070C7F0 // FUNCTION: fn_07137 -bool CSprArrowEffect::Slot06() { +bool CSprArrowEffect::IsAlive() { return this->unknown_00FD; } // OFFSET: 0x0070C800 // FUNCTION: fn_07138 -void CSprArrowEffect::Slot03() { +void CSprArrowEffect::OnProcess() { const float ticks = static_cast(static_cast(timeGetTime() - static_cast(this->unknown_00D0)) / 24.0); if (this->unknown_00F4 > ticks) { @@ -211,7 +211,7 @@ void CSprArrowEffect::Slot03() { // OFFSET: 0x0070CB80 // FUNCTION: fn_07139 -void CSprArrowEffect::Slot04() { +void CSprArrowEffect::Render() { if (this->unknown_00CC != 0 && this->unknown_00FC) { AsSprite(reinterpret_cast(this->unknown_00CC))->Draw(1); } @@ -317,7 +317,7 @@ CSpriteMableEffect::CSpriteMableEffect() : CEffect(1096) { // OFFSET: 0x0070D040 // FUNCTION: fn_07144 -void CSpriteMableEffect::Slot01() { +void CSpriteMableEffect::Open() { for (int i = 0; i < 3; ++i) { EZ2STREmitter* emitter = reinterpret_cast(CreateSpriteParticle(reinterpret_cast(this->position), 1)); @@ -358,13 +358,13 @@ void CSpriteMableEffect::Slot01() { // OFFSET: 0x0070D150 // FUNCTION: fn_07145 -bool CSpriteMableEffect::Slot06() { +bool CSpriteMableEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0070D2C0 // FUNCTION: fn_07147 -void CSpriteMableEffect::Slot04() { +void CSpriteMableEffect::Render() { if (!g_serviceOptions.Get(240)) { return; } @@ -381,7 +381,7 @@ CStemSpearEffect::CStemSpearEffect() : CEffect(1100) { // OFFSET: 0x0070D4A0 // FUNCTION: fn_07151 -void CStemSpearEffect::Slot01() { +void CStemSpearEffect::Open() { for (int i = 0; i < 4; ++i) { CSpriteParticle* particle = static_cast(CreateSpriteParticle(reinterpret_cast(this->position), 0x101)); @@ -427,7 +427,7 @@ void __stdcall Nullsub226(int) { // OFFSET: 0x0070D660 // FUNCTION: fn_07153 -bool CStemSpearEffect::Slot06() { +bool CStemSpearEffect::IsAlive() { for (auto emitter = this->emitters.begin(); emitter != this->emitters.end(); ++emitter) { if ((*emitter)->elapsed < this->unknown_002C) { return true; @@ -444,7 +444,7 @@ CSvgSpiritEffect::CSvgSpiritEffect() : CEffect(1128), emitter(nullptr) { // OFFSET: 0x0070D690 // FUNCTION: fn_07154 -void CStemSpearEffect::Slot03() { +void CStemSpearEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (emitter->elapsed >= 0) { @@ -475,7 +475,7 @@ void CStemSpearEffect::Slot03() { // OFFSET: 0x0070D810 // FUNCTION: fn_07155 -void CStemSpearEffect::Slot04() { +void CStemSpearEffect::Render() { for (auto emitter = this->emitters.begin(); emitter != this->emitters.end(); ++emitter) { if ((*emitter)->elapsed > 0 && (*emitter)->elapsed < this->unknown_002C) { AsSprite(*emitter)->Draw(1); @@ -485,13 +485,13 @@ void CStemSpearEffect::Slot04() { // OFFSET: 0x0070DB30 // FUNCTION: fn_07160 -bool CSvgSpiritEffect::Slot06() { +bool CSvgSpiritEffect::IsAlive() { return this->emitter->elapsed < this->unknown_002C; } // OFFSET: 0x0070DB50 // FUNCTION: fn_07161 -void CSvgSpiritEffect::Slot03() { +void CSvgSpiritEffect::OnProcess() { EZ2STREmitter* emitter = this->emitter; if (emitter->elapsed >= 0) { this->SetSourceActor(this->sourceActor); @@ -519,7 +519,7 @@ void CSvgSpiritEffect::Slot03() { // OFFSET: 0x0070DCD0 // FUNCTION: fn_07162 -void CSvgSpiritEffect::Slot04() { +void CSvgSpiritEffect::Render() { EZ2STREmitter* emitter = this->emitter; if (emitter->elapsed > 0 && emitter->elapsed < this->unknown_002C) { AsSprite(emitter)->Draw(1); @@ -533,13 +533,13 @@ CTunaPartyEffect::CTunaPartyEffect() : CEffect(1097) { // OFFSET: 0x0070DF30 // FUNCTION: fn_07167 -bool CTunaPartyEffect::Slot06() { +bool CTunaPartyEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0070E090 // FUNCTION: fn_07169 -void CTunaPartyEffect::Slot04() { +void CTunaPartyEffect::Render() { for (auto emitter = this->emitters.begin(); emitter != this->emitters.end(); ++emitter) { AsSprite(*emitter)->Draw(1); } @@ -561,7 +561,7 @@ void CCurseOfCubeEffect::Restart() { // OFFSET: 0x0070EB30 // FUNCTION: fn_07177 -void CCurseOfCubeEffect::Slot01() { +void CCurseOfCubeEffect::Open() { this->retained = 1; this->SpawnStart(); if (!this->emitters.empty()) { @@ -571,7 +571,7 @@ void CCurseOfCubeEffect::Slot01() { // OFFSET: 0x0070EB60 // FUNCTION: fn_07178 -bool CCurseOfCubeEffect::Slot06() { +bool CCurseOfCubeEffect::IsAlive() { if (!this->ActorExists() || this->emitters.empty()) { return false; } @@ -581,7 +581,7 @@ bool CCurseOfCubeEffect::Slot06() { // OFFSET: 0x0070F080 // FUNCTION: fn_07180 -void CCurseOfCubeEffect::Slot04() { +void CCurseOfCubeEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { AsParticle(*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -614,12 +614,12 @@ void CWarningPlaneEffect::AddPlane(vector3d position) { // OFFSET: 0x0070F350 // FUNCTION: fn_07185 -void CWarningPlaneEffect::Slot01() { +void CWarningPlaneEffect::Open() { } // OFFSET: 0x0070F360 // FUNCTION: fn_07186 -bool CWarningPlaneEffect::Slot06() { +bool CWarningPlaneEffect::IsAlive() { if (this->expireTime != 0 && this->expireTime < timeGetTime()) { return false; } @@ -629,7 +629,7 @@ bool CWarningPlaneEffect::Slot06() { // OFFSET: 0x0070FC60 // FUNCTION: fn_07194 -bool CCylinderEffect::Slot06() { +bool CCylinderEffect::IsAlive() { return this->startTime + this->unknown_002C >= timeGetTime(); } @@ -640,7 +640,7 @@ CCylinderEffect::CCylinderEffect() : CEffect(-1) { // OFFSET: 0x0070FB50 // FUNCTION: fn_07193 -void CCylinderEffect::Slot01() { +void CCylinderEffect::Open() { this->startTime = timeGetTime(); for (long long i = 0; i < 21; ++i) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); @@ -670,7 +670,7 @@ void CCylinderEffect::Slot01() { // OFFSET: 0x0070F390 // FUNCTION: fn_07187 -void CWarningPlaneEffect::Slot03() { +void CWarningPlaneEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (this->expireTime != 0 && emitter) { @@ -708,7 +708,7 @@ void CWarningPlaneEffect::Slot03() { // OFFSET: 0x0070F670 // FUNCTION: fn_07188 -void CWarningPlaneEffect::Slot04() { +void CWarningPlaneEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (this->expireTime != 0 && *it) { AsParticle(*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); @@ -718,7 +718,7 @@ void CWarningPlaneEffect::Slot04() { // OFFSET: 0x0070FFA0 // FUNCTION: fn_07196 -void CCylinderEffect::Slot04() { +void CCylinderEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { CEZ2STRParticle* particle = AsParticle(*it); if (!particle) { @@ -745,13 +745,13 @@ CDancingKnifeEffect::CDancingKnifeEffect() : CEffect(1829) { // OFFSET: 0x00710830 // FUNCTION: fn_07203 -bool CDancingKnifeEffect::Slot06() { +bool CDancingKnifeEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00710A20 // FUNCTION: fn_07205 -void CDancingKnifeEffect::Slot04() { +void CDancingKnifeEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { AsParticle(*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -772,7 +772,7 @@ CEternalSlashAttackEffect::CEternalSlashAttackEffect() : CEffect(-1) { // OFFSET: 0x00710C80 // FUNCTION: fn_07209 -void CEternalSlashAttackEffect::Slot01() { +void CEternalSlashAttackEffect::Open() { EZ2STREmitter* bottom = reinterpret_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 13)); if (bottom) { @@ -796,7 +796,7 @@ void CEternalSlashAttackEffect::Slot01() { // OFFSET: 0x00710F50 // FUNCTION: fn_07210 -bool CEternalSlashAttackEffect::Slot06() { +bool CEternalSlashAttackEffect::IsAlive() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (emitter && IsEmitterAlive(emitter) == true) { @@ -809,7 +809,7 @@ bool CEternalSlashAttackEffect::Slot06() { // OFFSET: 0x00710FB0 // FUNCTION: fn_07211 -void CEternalSlashAttackEffect::Slot03() { +void CEternalSlashAttackEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (!emitter) { @@ -826,7 +826,7 @@ void CEternalSlashAttackEffect::Slot03() { // OFFSET: 0x007110A0 // FUNCTION: fn_07212 -void CEternalSlashAttackEffect::Slot04() { +void CEternalSlashAttackEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { AsParticle(*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -841,7 +841,7 @@ CEternalSlashCountEffect::CEternalSlashCountEffect() : CEffect(1913), emitter(nu // OFFSET: 0x00711280 // FUNCTION: fn_07216 -void CEternalSlashCountEffect::Slot01() { +void CEternalSlashCountEffect::Open() { if (static_cast(this->unknown_00B0) - 1 > 4) { return; } @@ -861,7 +861,7 @@ void CEternalSlashCountEffect::Slot01() { // OFFSET: 0x00711340 // FUNCTION: fn_07217 -bool CEternalSlashCountEffect::Slot06() { +bool CEternalSlashCountEffect::IsAlive() { EZ2STREmitter* emitter = this->emitter; if (emitter) { if (0.0f == emitter->lifetime) { @@ -876,7 +876,7 @@ bool CEternalSlashCountEffect::Slot06() { // OFFSET: 0x00711380 // FUNCTION: fn_07218 -void CEternalSlashCountEffect::Slot03() { +void CEternalSlashCountEffect::OnProcess() { if (!this->emitter) { return; } @@ -889,7 +889,7 @@ void CEternalSlashCountEffect::Slot03() { // OFFSET: 0x007113F0 // FUNCTION: fn_07219 -void CEternalSlashCountEffect::Slot04() { +void CEternalSlashCountEffect::Render() { if (this->emitter) { AsParticle(this->emitter)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -902,7 +902,7 @@ CFallenAngelEffect::CFallenAngelEffect() : CEffect(1140), emitter(nullptr), unkn // OFFSET: 0x00711580 // FUNCTION: fn_07223 -void CFallenAngelEffect::Slot01() { +void CFallenAngelEffect::Open() { if (!this->emitter) { CEZ2STRParticle* particle = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); this->emitter = reinterpret_cast(particle); @@ -919,7 +919,7 @@ void CFallenAngelEffect::Slot01() { // OFFSET: 0x00711690 // FUNCTION: fn_07224 -bool CFallenAngelEffect::Slot06() { +bool CFallenAngelEffect::IsAlive() { if (0.0f == this->emitter->lifetime) { return true; } @@ -929,7 +929,7 @@ bool CFallenAngelEffect::Slot06() { // OFFSET: 0x007116D0 // FUNCTION: fn_07225 -void CFallenAngelEffect::Slot03() { +void CFallenAngelEffect::OnProcess() { EZ2STREmitter* emitter = this->emitter; const vector3d start = emitter->position; const float dx = this->unknown_00D0 - this->position[0]; @@ -946,7 +946,7 @@ void CFallenAngelEffect::Slot03() { // OFFSET: 0x007117F0 // FUNCTION: fn_07226 -void CFallenAngelEffect::Slot04() { +void CFallenAngelEffect::Render() { if (this->emitter) { AsParticle(this->emitter)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -971,7 +971,7 @@ CFloralFlareRoad::CFloralFlareRoad() : CEffect(1804) { // OFFSET: 0x00711A70 // FUNCTION: fn_07231 -void CFloralFlareRoad::Slot01() { +void CFloralFlareRoad::Open() { CEZ2STRParticle* bottom = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 13)); this->unknown_00CC = reinterpret_cast(bottom); bottom->Load(std::string("froral_flareroad\\froral_flareroad_bottom\\froral_flareroad_bottom.str")); @@ -996,13 +996,13 @@ void CFloralFlareRoad::Slot01() { // OFFSET: 0x00711DA0 // FUNCTION: fn_07232 -bool CFloralFlareRoad::Slot06() { +bool CFloralFlareRoad::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00711DB0 // FUNCTION: fn_07233 -void CFloralFlareRoad::Slot03() { +void CFloralFlareRoad::OnProcess() { if (this->unknown_00CC) { AsParticle(this->unknown_00CC)->Process(0.0f, -80.0f, 0.0f); } @@ -1023,7 +1023,7 @@ void CFloralFlareRoad::Slot03() { // OFFSET: 0x00711ED0 // FUNCTION: fn_07234 -void CFloralFlareRoad::Slot04() { +void CFloralFlareRoad::Render() { if (this->unknown_00CC) { AsParticle(this->unknown_00CC) ->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -1046,7 +1046,7 @@ CFootprintEffect::CFootprintEffect() : CEffect(2411), stepDistance(50.0), unknow // OFFSET: 0x007123C0 // FUNCTION: fn_07238 -bool CFootprintEffect::Slot33() { +bool CFootprintEffect::IsVisible() { EffectActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor || actor->render.unknown_00A8 == 0) { return true; @@ -1061,7 +1061,7 @@ bool CFootprintEffect::Slot33() { // OFFSET: 0x00712410 // FUNCTION: fn_07239 -void CFootprintEffect::Slot01() { +void CFootprintEffect::Open() { char* leftFile = nullptr; char* rightFile = nullptr; g_session.m_hotkeyScript->Call("GetFootprintPngFile", "d>ss", this->unknown_00C4, &leftFile, &rightFile); @@ -1090,7 +1090,7 @@ void CFootprintEffect::Slot01() { // OFFSET: 0x007127A0 // FUNCTION: fn_07240 -bool CFootprintEffect::Slot06() { +bool CFootprintEffect::IsAlive() { return this->ActorExists(); } @@ -1148,7 +1148,7 @@ CParticle* CFootprintEffect::SpawnFootprint() { // OFFSET: 0x00712A90 // FUNCTION: fn_07242 -void CFootprintEffect::Slot03() { +void CFootprintEffect::OnProcess() { const float dx = this->position[0] - this->lastPosition.x; const float dy = this->position[1] - this->lastPosition.y; const float dz = this->position[2] - this->lastPosition.z; @@ -1175,7 +1175,7 @@ void CFootprintEffect::Slot03() { // OFFSET: 0x00712C50 // FUNCTION: fn_07244 -void CFootprintEffect::Slot04() { +void CFootprintEffect::Render() { for (EZ2STREmitter* emitter : this->emitters) { AsParticle(emitter)->Render(true, 0.0f, 1.0f, 0.0f, 1.0f, false, true); } @@ -1204,7 +1204,7 @@ void CFootprintStrEffect::Close() { // OFFSET: 0x00713370 // FUNCTION: fn_07248 -bool CFootprintStrEffect::Slot33() { +bool CFootprintStrEffect::IsVisible() { EffectActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor || actor->render.unknown_00A8 == 0) { return true; @@ -1219,7 +1219,7 @@ bool CFootprintStrEffect::Slot33() { // OFFSET: 0x007133C0 // FUNCTION: fn_07249 -void CFootprintStrEffect::Slot01() { +void CFootprintStrEffect::Open() { char* leftFile = nullptr; char* rightFile = nullptr; g_session.m_hotkeyScript->Call("GetFootprintStrFileBottom", "d>ss", this->unknown_00C4, &leftFile, &rightFile); @@ -1248,7 +1248,7 @@ void CFootprintStrEffect::Slot01() { // OFFSET: 0x00713830 // FUNCTION: fn_07250 -bool CFootprintStrEffect::Slot06() { +bool CFootprintStrEffect::IsAlive() { return this->ActorExists(); } @@ -1319,7 +1319,7 @@ void CFootprintStrEffect::SpawnFootprint() { // OFFSET: 0x00713E00 // FUNCTION: fn_07252 -void CFootprintStrEffect::Slot03() { +void CFootprintStrEffect::OnProcess() { const float dx = this->position[0] - this->unknown_016C.x; const float dy = this->position[1] - this->unknown_016C.y; const float dz = this->position[2] - this->unknown_016C.z; @@ -1350,7 +1350,7 @@ void CFootprintStrEffect::Slot03() { // OFFSET: 0x00713F70 // FUNCTION: fn_07253 -void CFootprintStrEffect::Slot04() { +void CFootprintStrEffect::Render() { for (EZ2STREmitter* emitter : this->emitters) { AsParticle(emitter)->DrawGround(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -1383,19 +1383,19 @@ void CFromTheAbyssEffect::Close() { // OFFSET: 0x00715400 // FUNCTION: fn_07266 -void CFromTheAbyssEffect::Slot01() { +void CFromTheAbyssEffect::Open() { this->retained = 1; } // OFFSET: 0x00715410 // FUNCTION: fn_07267 -bool CFromTheAbyssEffect::Slot06() { +bool CFromTheAbyssEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00715420 // FUNCTION: fn_07268 -void CFromTheAbyssEffect::Slot03() { +void CFromTheAbyssEffect::OnProcess() { for (auto it = this->unknown_00E8.begin(); it != this->unknown_00E8.end(); ++it) { this->UpdateParticle(it->first, it->second); } @@ -1466,7 +1466,7 @@ void CFromTheAbyssEffect::UpdateParticle(long long key, AbyssParticle particle) // OFFSET: 0x00715C80 // FUNCTION: fn_07270 -void CFromTheAbyssEffect::Slot04() { +void CFromTheAbyssEffect::Render() { for (auto it = this->unknown_00E8.begin(); it != this->unknown_00E8.end(); ++it) { EZ2STREmitter* emitter = it->second.emitter; if (emitter) { @@ -1533,7 +1533,7 @@ CFullScreenEffect::CFullScreenEffect() : CEffect(-1), loaded(1) { // OFFSET: 0x007169A0 // FUNCTION: fn_07277 -void CFullScreenEffect::Slot01() { +void CFullScreenEffect::Open() { std::string texture; if (this->id == 2272) { texture = "effect\\state_effect\\frostbite\\frostbite_screen\\frostbite_screen.tga"; @@ -1563,7 +1563,7 @@ void CFullScreenEffect::Slot01() { // OFFSET: 0x00716BD0 // FUNCTION: fn_07278 -bool CFullScreenEffect::Slot06() { +bool CFullScreenEffect::IsAlive() { if (this->loaded == 1 && this->ActorExists()) { return true; } @@ -1573,7 +1573,7 @@ bool CFullScreenEffect::Slot06() { // OFFSET: 0x00716BF0 // FUNCTION: fn_07279 -void CFullScreenEffect::Slot04() { +void CFullScreenEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle) { @@ -1629,7 +1629,7 @@ CGaleStorm::CGaleStorm() : CEffect(1973), unknown_00D8(5), unknown_00DC(0) { // OFFSET: 0x00717DE0 // FUNCTION: fn_07285 -void CGaleStorm::Slot01() { +void CGaleStorm::Open() { long long table[10] = {5, 5, 5, 5, 7, 7, 7, 9, 9, 11}; unsigned int index = this->unknown_00B0; @@ -1642,7 +1642,7 @@ void CGaleStorm::Slot01() { // OFFSET: 0x00717EB0 // FUNCTION: fn_07286 -bool CGaleStorm::Slot06() { +bool CGaleStorm::IsAlive() { if (this->frame > this->unknown_002C && this->emitters.empty()) { return false; } @@ -1652,7 +1652,7 @@ bool CGaleStorm::Slot06() { // OFFSET: 0x00718040 // FUNCTION: fn_07288 -void CGaleStorm::Slot04() { +void CGaleStorm::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { AsParticle(*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -1662,7 +1662,7 @@ void CGaleStorm::Slot04() { // OFFSET: 0x007183F0 // FUNCTION: fn_07292 -void CGravityControlEffect::Slot04() { +void CGravityControlEffect::Render() { if (!this->target) { return; } @@ -1706,13 +1706,13 @@ void CHawkVumerangEffect::Close() { // OFFSET: 0x00718B90 // FUNCTION: fn_07299 -bool CHawkVumerangEffect::Slot06() { +bool CHawkVumerangEffect::IsAlive() { return this->emitters.size() != 0; } // OFFSET: 0x00718BA0 // FUNCTION: fn_07300 -void CHawkVumerangEffect::Slot03() { +void CHawkVumerangEffect::OnProcess() { if (this->emitters.size() == 0) { return; } @@ -1753,7 +1753,7 @@ void CHawkVumerangEffect::Slot03() { // OFFSET: 0x00718E70 // FUNCTION: fn_07301 -void CHawkVumerangEffect::Slot04() { +void CHawkVumerangEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (emitter) { @@ -1771,7 +1771,7 @@ CDropItemEffect::CDropItemEffect() // OFFSET: 0x00719400 // FUNCTION: fn_07307 -void CDropItemEffect::Slot01() { +void CDropItemEffect::Open() { if (!static_cast(g_modeMgr.GetGameMode())->scene) { return; } @@ -1788,7 +1788,7 @@ void CDropItemEffect::Slot01() { } this->OpenEmitters(); - this->Slot12(); + this->InitEvents(); static_cast(g_modeMgr.GetGameMode())->scene->GetItemByAID(this->actor); this->position.x = this->CEffect::position[0]; this->position.y = this->CEffect::position[1]; @@ -1803,7 +1803,7 @@ void CDropItemEffect::Slot01() { // OFFSET: 0x00719520 // FUNCTION: fn_07308 -void CDropItemEffect::Slot12() { +void CDropItemEffect::InitEvents() { for (std::size_t i = 0; i < this->emitters.size(); ++i) { if (this->emitters[i]) { this->emitters[i]->looping = 1; @@ -1816,7 +1816,7 @@ void CDropItemEffect::Slot12() { // OFFSET: 0x00719660 // FUNCTION: fn_07309 -bool CDropItemEffect::Slot06() { +bool CDropItemEffect::IsAlive() { if (this->actor == 0) { return false; } @@ -1867,7 +1867,7 @@ void CDropItemEffect::OpenEmitters() { // OFFSET: 0x00719C30 // FUNCTION: fn_07311 -void CDropItemEffect::Slot03() { +void CDropItemEffect::OnProcess() { for (std::size_t i = 0; i < this->emitters.size(); ++i) { if (this->emitters[i]) { AsParticle(this->emitters[i])->Process(0.0f, 0.0f, 0.0f); @@ -1878,7 +1878,7 @@ void CDropItemEffect::Slot03() { // OFFSET: 0x00719CA0 // FUNCTION: fn_07312 -void CDropItemEffect::Slot04() { +void CDropItemEffect::Render() { for (std::size_t i = 0; i < this->emitters.size(); ++i) { if (this->emitters[i]) { AsParticle(this->emitters[i])->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -1944,7 +1944,7 @@ void CJupitelThunderHit::SpawnSpark() { // OFFSET: 0x0071C520 // FUNCTION: fn_07323 -void CJupitelThunderHit::Slot01() { +void CJupitelThunderHit::Open() { if (this->id != 1200) { this->SpawnSpark(); } @@ -1954,7 +1954,7 @@ void CJupitelThunderHit::Slot01() { // OFFSET: 0x0071C540 // FUNCTION: fn_07324 -bool CJupitelThunderHit::Slot06() { +bool CJupitelThunderHit::IsAlive() { if (this->id != 1200) { if (this->actor == 0) { return true; @@ -1968,7 +1968,7 @@ bool CJupitelThunderHit::Slot06() { // OFFSET: 0x0071C570 // FUNCTION: fn_07325 -void CJupitelThunderHit::Slot03() { +void CJupitelThunderHit::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { ++(*it)->elapsed; CEZ2STRParticle* particle = AsParticle(*it); @@ -2019,7 +2019,7 @@ void CJupitelThunderHit::Slot03() { // OFFSET: 0x0071CB70 // FUNCTION: fn_07326 -void CJupitelThunderHit::Slot04() { +void CJupitelThunderHit::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (emitter && emitter->elapsed >= 0) { @@ -2072,13 +2072,13 @@ void CNewCloudKillEffect::Close() { // OFFSET: 0x0071DEC0 // FUNCTION: fn_07340 -bool CNewCloudKillEffect::Slot06() { +bool CNewCloudKillEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0071E080 // FUNCTION: fn_07341 -void CNewCloudKillEffect::Slot03() { +void CNewCloudKillEffect::OnProcess() { const unsigned int now = timeGetTime(); for (auto it = this->unknown_00CC.begin(); it != this->unknown_00CC.end(); ++it) { @@ -2316,7 +2316,7 @@ void CPetitioEffect::Close() { // OFFSET: 0x0071F7A0 // FUNCTION: fn_07347 -void CPetitioEffect::Slot01() { +void CPetitioEffect::Open() { CEZ2STRParticle* bottom = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 13)); EZ2STREmitter* bottomEmitter = reinterpret_cast(bottom); bottom->Load(std::string("petitio\\petitio_bottom\\petitio_bottom.str")); @@ -2333,7 +2333,7 @@ void CPetitioEffect::Slot01() { // OFFSET: 0x0071FA30 // FUNCTION: fn_07348 -bool CPetitioEffect::Slot06() { +bool CPetitioEffect::IsAlive() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (IsEmitterAlive(emitter) == true) { @@ -2346,7 +2346,7 @@ bool CPetitioEffect::Slot06() { // OFFSET: 0x0071FA90 // FUNCTION: fn_07349 -void CPetitioEffect::Slot03() { +void CPetitioEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (!emitter) { @@ -2363,7 +2363,7 @@ void CPetitioEffect::Slot03() { // OFFSET: 0x0071FB70 // FUNCTION: fn_07350 -void CPetitioEffect::Slot04() { +void CPetitioEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { AsParticle(*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -2378,7 +2378,7 @@ CPneumaticusProcellaEffect::CPneumaticusProcellaEffect() : CEffect(1957) { // OFFSET: 0x0071FE40 // FUNCTION: fn_07354 -void CPneumaticusProcellaEffect::Slot01() { +void CPneumaticusProcellaEffect::Open() { double scale; switch (this->unknown_00B0) { case 1: @@ -2436,7 +2436,7 @@ void CPneumaticusProcellaEffect::Slot01() { // OFFSET: 0x00720410 // FUNCTION: fn_07356 -void CPneumaticusProcellaEffect::Slot04() { +void CPneumaticusProcellaEffect::Render() { if (this->emitter) { AsParticle(this->emitter)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -2450,7 +2450,7 @@ void CPneumaticusProcellaEffect::Slot04() { // OFFSET: 0x00720310 // FUNCTION: fn_07355 -void CPneumaticusProcellaEffect::Slot03() { +void CPneumaticusProcellaEffect::OnProcess() { if (this->emitter) { AsParticle(this->emitter)->Process(0.0f, -80.0f, 0.0f); } @@ -2485,7 +2485,7 @@ static long long s_randomHitIndex; // OFFSET: 0x007205D0 // FUNCTION: fn_07360 -void CRandomHitEffect::Slot01() { +void CRandomHitEffect::Open() { const double offsetsX[3] = {0.0, 4.0, -4.0}; const double offsetsY[3] = {-7.0, -6.0, -5.0}; const double angles[3] = {0.0, 320.0, 40.0}; @@ -2521,7 +2521,7 @@ void CRandomHitEffect::Slot01() { // OFFSET: 0x007208A0 // FUNCTION: fn_07362 -void CRandomHitEffect::Slot03() { +void CRandomHitEffect::OnProcess() { if (!this->emitter) { return; } @@ -2536,7 +2536,7 @@ void CRandomHitEffect::Slot03() { // OFFSET: 0x00720940 // FUNCTION: fn_07363 -void CRandomHitEffect::Slot04() { +void CRandomHitEffect::Render() { if (this->emitter) { AsParticle(this->emitter)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -2549,7 +2549,7 @@ CRandomOptEffect::CRandomOptEffect() : CEffect(-1), offsets{} { // OFFSET: 0x00720AF0 // FUNCTION: fn_07366 -void CRandomOptEffect::Slot08(int red, int green, int blue) { +void CRandomOptEffect::SetColor(int red, int green, int blue) { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->SetColor(red, green, blue); } @@ -2557,7 +2557,7 @@ void CRandomOptEffect::Slot08(int red, int green, int blue) { // OFFSET: 0x00720B30 // FUNCTION: fn_07367 -void CRandomOptEffect::Slot11(std::string name) { +void CRandomOptEffect::SetParticleTexture(std::string name) { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->SetTexture(name); } @@ -2664,13 +2664,13 @@ void CRandomOptEffect::Init() { // OFFSET: 0x00721220 // FUNCTION: fn_07370 -void CRandomOptEffect::Slot01() { +void CRandomOptEffect::Open() { this->Init(); } // OFFSET: 0x00721230 // FUNCTION: fn_07371 -bool CRandomOptEffect::Slot06() { +bool CRandomOptEffect::IsAlive() { if (this->actor == 0) { return false; } @@ -2693,7 +2693,7 @@ bool CRandomOptEffect::Slot06() { // OFFSET: 0x00721270 // FUNCTION: fn_07372 -void CRandomOptEffect::Slot03() { +void CRandomOptEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -2717,7 +2717,7 @@ void CRandomOptEffect::Slot03() { // OFFSET: 0x00721430 // FUNCTION: fn_07373 -void CRandomOptEffect::Slot04() { +void CRandomOptEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle) { @@ -2748,7 +2748,7 @@ CRichsCoinEffect::CRichsCoinEffect() : CEffect(1135), unknown_00E4(0) { // OFFSET: 0x007218D0 // FUNCTION: fn_07377 -void CRichsCoinEffect::Slot01() { +void CRichsCoinEffect::Open() { int count = this->unknown_00E4; if (count > 5) { count = 5; @@ -2790,13 +2790,13 @@ void CRichsCoinEffect::Slot01() { // OFFSET: 0x00721AE0 // FUNCTION: fn_07378 -bool CRichsCoinEffect::Slot06() { +bool CRichsCoinEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00721F80 // FUNCTION: fn_07380 -void CRichsCoinEffect::Slot04() { +void CRichsCoinEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); @@ -2820,7 +2820,7 @@ CSavageImpactEffect::CSavageImpactEffect() : CEffect(1837) { // OFFSET: 0x00722460 // FUNCTION: fn_07385 -bool CSavageImpactEffect::Slot06() { +bool CSavageImpactEffect::IsAlive() { if (0.0f == this->emitter->lifetime) { return true; } @@ -2830,7 +2830,7 @@ bool CSavageImpactEffect::Slot06() { // OFFSET: 0x007224A0 // FUNCTION: fn_07386 -void CSavageImpactEffect::Slot03() { +void CSavageImpactEffect::OnProcess() { CEZ2STRParticle* particle = AsParticle(this->emitter); const vector3d position = {this->position[0] + 0.0f, this->position[1] - 12.0f, this->position[2] + 0.0f}; particle->position = position; @@ -2839,7 +2839,7 @@ void CSavageImpactEffect::Slot03() { // OFFSET: 0x00722560 // FUNCTION: fn_07387 -void CSavageImpactEffect::Slot04() { +void CSavageImpactEffect::Render() { AsParticle(this->emitter)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -2940,7 +2940,7 @@ void CServantWeaponNewEffect::Close() { // OFFSET: 0x007237E0 // FUNCTION: fn_07400 -void CServantWeaponEffect::Slot01() { +void CServantWeaponEffect::Open() { this->retained = 1; for (int column = 0; column < 5; ++column) { @@ -2971,19 +2971,19 @@ void CServantWeaponEffect::Slot01() { // OFFSET: 0x00723A90 // FUNCTION: fn_07401 -void CServantWeaponNewEffect::Slot01() { +void CServantWeaponNewEffect::Open() { this->retained = 1; } // OFFSET: 0x00723AA0 // FUNCTION: fn_07402 -bool CServantWeaponEffect::Slot06() { +bool CServantWeaponEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00723AB0 // FUNCTION: fn_07403 -bool CServantWeaponNewEffect::Slot06() { +bool CServantWeaponNewEffect::IsAlive() { return this->ActorExists(); } @@ -3052,7 +3052,7 @@ static __forceinline void PlaceServantEmitter(CServantWeaponEffect* effect, EZ2S // OFFSET: 0x00724100 // FUNCTION: fn_07405 -void CServantWeaponEffect::Slot03() { +void CServantWeaponEffect::OnProcess() { for (int column = 0; column < 5; ++column) { EZ2STREmitter* emitter = this->emitters[0][column]; if (emitter != nullptr) { @@ -3100,7 +3100,7 @@ static __forceinline void OrbitServantEmitter(const CServantWeaponNewEffect* eff // OFFSET: 0x00724900 // FUNCTION: fn_07406 -void CServantWeaponNewEffect::Slot03() { +void CServantWeaponNewEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end();) { if (!AsParticle(*it)->Process(0.0f, 0.0f, 0.0f)) { const float angle = (*it)->angle; @@ -3138,7 +3138,7 @@ void CServantWeaponNewEffect::Slot03() { // OFFSET: 0x00724EB0 // FUNCTION: fn_07407 -void CServantWeaponEffect::Slot04() { +void CServantWeaponEffect::Render() { for (int column = 0; column < 5; ++column) { if (this->emitters[0][column] != nullptr) { AsParticle(this->emitters[0][column])->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); @@ -3154,7 +3154,7 @@ void CServantWeaponEffect::Slot04() { // OFFSET: 0x00724F40 // FUNCTION: fn_07408 -void CServantWeaponNewEffect::Slot04() { +void CServantWeaponNewEffect::Render() { for (EZ2STREmitter* emitter : this->emitters) { AsParticle(emitter)->DrawBillboards(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -3210,7 +3210,7 @@ void __stdcall fn_07334(CParticle* particle) { // OFFSET: 0x0071D760 // FUNCTION: fn_07335 -void CNewCloudKillEffect::Slot01() { +void CNewCloudKillEffect::Open() { this->unknown_00F4 = static_cast(timeGetTime()); this->unknown_00F8 = static_cast(timeGetTime()); @@ -3873,7 +3873,7 @@ void CSevereRainStorm::Close() { // OFFSET: 0x007278C0 // FUNCTION: fn_07423 -void CSevereRainStorm::Slot01() { +void CSevereRainStorm::Open() { this->unknown_00D4 = 0; if (this->id == 2348) { this->retained = 1; @@ -3882,7 +3882,7 @@ void CSevereRainStorm::Slot01() { // OFFSET: 0x007278E0 // FUNCTION: fn_07424 -bool CSevereRainStorm::Slot06() { +bool CSevereRainStorm::IsAlive() { switch (this->id) { case 1752: case 2165: @@ -3917,7 +3917,7 @@ bool CSevereRainStorm::Slot06() { // OFFSET: 0x00727A10 // FUNCTION: fn_07425 -void CSevereRainStorm::Slot03() { +void CSevereRainStorm::OnProcess() { this->SpawnParticles(); for (auto it = this->emitters.begin(); it != this->emitters.end();) { EZ2STREmitter* emitter = *it; @@ -3956,7 +3956,7 @@ void CSevereRainStorm::Slot03() { // OFFSET: 0x00727C70 // FUNCTION: fn_07426 -void CSevereRainStorm::Slot04() { +void CSevereRainStorm::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; if (emitter) { @@ -3981,7 +3981,7 @@ void CCrimsonArrowEffect::Close() { // OFFSET: 0x0070B970 // FUNCTION: fn_07122 -void CCrimsonArrowEffect::Slot01() { +void CCrimsonArrowEffect::Open() { CEZ2STRParticle* arrow = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); if (!arrow) { return; @@ -4047,7 +4047,7 @@ void CCrimsonArrowEffect::Slot01() { // OFFSET: 0x0070DE90 // FUNCTION: fn_07166 -void CTunaPartyEffect::Slot01() { +void CTunaPartyEffect::Open() { EZ2STREmitter* emitter = reinterpret_cast(CreateSpriteParticle(reinterpret_cast(this->position), 0x101)); if (!emitter) { @@ -4070,7 +4070,7 @@ void CTunaPartyEffect::Slot01() { // OFFSET: 0x0070DF40 // FUNCTION: fn_07168 -void CTunaPartyEffect::Slot03() { +void CTunaPartyEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { CSpriteParticle* particle = AsSprite(*it); const float phase = particle->unknown_0054 + 0.05f; @@ -4099,7 +4099,7 @@ void CTunaPartyEffect::Slot03() { // OFFSET: 0x0070C2F0 // FUNCTION: fn_07129 -void CRootTwistEffect::Slot01() { +void CRootTwistEffect::Open() { EZ2STREmitter* emitter = reinterpret_cast(CreateSpriteParticle(reinterpret_cast(this->position), 0x101)); if (emitter) { @@ -4120,7 +4120,7 @@ void CRootTwistEffect::Slot01() { // OFFSET: 0x0070D9B0 // FUNCTION: fn_07159 -void CSvgSpiritEffect::Slot01() { +void CSvgSpiritEffect::Open() { this->emitter = reinterpret_cast(CreateSpriteParticle(reinterpret_cast(this->position), 0x101)); if (!this->emitter) { return; @@ -4177,7 +4177,7 @@ void CCurseOfCubeEffect::SpawnShock() { // OFFSET: 0x0071F0C0 // FUNCTION: fn_07342 -void CNewCloudKillEffect::Slot04() { +void CNewCloudKillEffect::Render() { for (auto it = this->unknown_00CC.begin(); it != this->unknown_00CC.end(); ++it) { CEZ2STRParticle* particle = AsParticle(*it); if (particle->unknown_00A8 != 0 || !particle) { @@ -4269,7 +4269,7 @@ void CDancingKnifeEffect::SpawnSecondStrike() { // OFFSET: 0x00710800 // FUNCTION: fn_07202 -void CDancingKnifeEffect::Slot01() { +void CDancingKnifeEffect::Open() { this->secondStrike = 0; this->SpawnFirstStrike(); this->AddEvent(0, "effect\\SHC_DANCING_KNIFE.wav", 0, 0); @@ -4277,7 +4277,7 @@ void CDancingKnifeEffect::Slot01() { // OFFSET: 0x00710840 // FUNCTION: fn_07204 -void CDancingKnifeEffect::Slot03() { +void CDancingKnifeEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end();) { EZ2STREmitter* emitter = *it; if (IsEmitterAlive(emitter) == true) { @@ -4375,7 +4375,7 @@ void CCurseOfCubeEffect::SpawnStart() { // OFFSET: 0x0070EB90 // FUNCTION: fn_07179 -void CCurseOfCubeEffect::Slot03() { +void CCurseOfCubeEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end();) { EZ2STREmitter* emitter = *it; if (IsEmitterAlive(emitter)) { @@ -4413,7 +4413,7 @@ void CCurseOfCubeEffect::Slot03() { // OFFSET: 0x0070C750 // FUNCTION: fn_07136 -void CSprArrowEffect::Slot01() { +void CSprArrowEffect::Open() { CSpriteParticle* particle = static_cast(CreateSpriteParticle(reinterpret_cast(this->position), 0x101)); this->unknown_00CC = reinterpret_cast(particle); if (!particle) { @@ -4472,7 +4472,7 @@ __declspec(noinline) vector3d* CylinderSlice::ComputePoints(vector3d points[2], // OFFSET: 0x0070FC80 // FUNCTION: fn_07195 -void CCylinderEffect::Slot03() { +void CCylinderEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { EZ2STREmitter* emitter = *it; emitter->position.x = this->position[0]; @@ -4516,7 +4516,7 @@ void CCylinderEffect::Slot03() { // OFFSET: 0x0070D160 // FUNCTION: fn_07146 -void CSpriteMableEffect::Slot03() { +void CSpriteMableEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { CSpriteParticle* particle = AsSprite(*it); particle->unknown_0054 += 0.02f; @@ -4567,7 +4567,7 @@ void CGravityControlEffect::Close() { // OFFSET: 0x007182E0 // FUNCTION: fn_07291 -void CGravityControlEffect::Slot03() { +void CGravityControlEffect::OnProcess() { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { return; @@ -4640,7 +4640,7 @@ void CGaleStorm::SpawnStorm() { // OFFSET: 0x00717ED0 // FUNCTION: fn_07287 -void CGaleStorm::Slot03() { +void CGaleStorm::OnProcess() { const int frame = this->frame; if (frame <= this->unknown_002C) { if (frame % (100 / this->count) == 0) { @@ -4667,7 +4667,7 @@ void CGaleStorm::Slot03() { // OFFSET: 0x007181D0 // FUNCTION: fn_07290 -void CGravityControlEffect::Slot01() { +void CGravityControlEffect::Open() { if (this->id == 0x4B1) { CEZ2STRParticle* particle = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); if (particle) { @@ -4683,7 +4683,7 @@ void CGravityControlEffect::Slot01() { // OFFSET: 0x007188C0 // FUNCTION: fn_07298 -void CHawkVumerangEffect::Slot01() { +void CHawkVumerangEffect::Open() { this->unknown_00FC = timeGetTime(); this->unknown_0100.x = this->position[0]; this->unknown_0100.y = this->position[1]; @@ -4717,7 +4717,7 @@ void CHawkVumerangEffect::Slot01() { // OFFSET: 0x00721AF0 // FUNCTION: fn_07379 -void CRichsCoinEffect::Slot03() { +void CRichsCoinEffect::OnProcess() { char name[256]; for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { @@ -4765,7 +4765,7 @@ void CRichsCoinEffect::Slot03() { // OFFSET: 0x007221C0 // FUNCTION: fn_07384 -void CSavageImpactEffect::Slot01() { +void CSavageImpactEffect::Open() { this->emitter = reinterpret_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); float toReciprocalDepth = 0.0f; float fromReciprocalDepth = 0.0f; diff --git a/Source/Contents/Effects/MonsterSkillEffects.h b/Source/Contents/Effects/MonsterSkillEffects.h index de41778e7..773f1ddf7 100644 --- a/Source/Contents/Effects/MonsterSkillEffects.h +++ b/Source/Contents/Effects/MonsterSkillEffects.h @@ -15,11 +15,11 @@ class CParticle; class CCrimsonArrowEffect : public CEffect { public: CCrimsonArrowEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ EZ2STREmitter* emitter; }; @@ -27,11 +27,11 @@ public: class CRootTwistEffect : public CEffect { public: CRootTwistEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; - void Slot12() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; + void InitEvents() override; void Close() override; /* 00CC */ std::vector emitters; @@ -40,10 +40,10 @@ public: class CSpriteMableEffect : public CEffect { public: CSpriteMableEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ std::vector emitters; @@ -52,10 +52,10 @@ public: class CStemSpearEffect : public CEffect { public: CStemSpearEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ std::vector emitters; @@ -64,10 +64,10 @@ public: class CSvgSpiritEffect : public CEffect { public: CSvgSpiritEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ EZ2STREmitter* emitter; @@ -76,10 +76,10 @@ public: class CTunaPartyEffect : public CEffect { public: CTunaPartyEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ std::vector emitters; @@ -88,10 +88,10 @@ public: class CCurseOfCubeEffect : public CEffect { public: CCurseOfCubeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; virtual void SpawnStart(); virtual void SpawnLoop(); @@ -108,10 +108,10 @@ public: class CWarningPlaneEffect : public CEffect { public: CWarningPlaneEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void AddPlane(vector3d position); @@ -124,10 +124,10 @@ public: class CCylinderEffect : public CEffect { public: CCylinderEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ unsigned int startTime; @@ -137,10 +137,10 @@ public: class CDancingKnifeEffect : public CEffect { public: CDancingKnifeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void SpawnFirstStrike(); void SpawnSecondStrike(); @@ -154,10 +154,10 @@ public: class CEternalSlashAttackEffect : public CEffect { public: CEternalSlashAttackEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ std::vector emitters; @@ -166,10 +166,10 @@ public: class CEternalSlashCountEffect : public CEffect { public: CEternalSlashCountEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ EZ2STREmitter* emitter; @@ -178,10 +178,10 @@ public: class CFallenAngelEffect : public CEffect { public: CFallenAngelEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void SetPosition(vector3d position); @@ -194,10 +194,10 @@ public: class CFloralFlareRoad : public CEffect { public: CFloralFlareRoad(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ EZ2STREmitter* unknown_00CC; @@ -207,11 +207,11 @@ public: class CFootprintEffect : public CEffect { public: CFootprintEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; - bool Slot33() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; + bool IsVisible() override; void Close() override; CParticle* SpawnFootprint(); @@ -230,11 +230,11 @@ public: class CFootprintStrEffect : public CEffect { public: CFootprintStrEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; - bool Slot33() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; + bool IsVisible() override; void Close() override; void SpawnFootprint(); @@ -269,11 +269,11 @@ public: CFromTheAbyssEffect(); void UpdateParticle(long long key, AbyssParticle particle); void SetLevel(long long level); - void Slot03() override; - void Slot01() override; - void Slot04() override; + void OnProcess() override; + void Open() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ unsigned char unknown_00CC[4]; /* 00D0 */ long long maxLevel; @@ -287,9 +287,9 @@ class CParticle; class CFullScreenEffect : public CEffect { public: CFullScreenEffect(); - void Slot01() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ std::vector particles; @@ -300,11 +300,11 @@ public: class CPetitioEffect : public CEffect { public: CPetitioEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector emitters; }; @@ -312,9 +312,9 @@ public: class CPneumaticusProcellaEffect : public CEffect { public: CPneumaticusProcellaEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; /* 00CC */ EZ2STREmitter* emitter; @@ -324,12 +324,12 @@ public: class CRandomHitEffect : public CEffect { public: CRandomHitEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; // INLINED - bool Slot06() override { + bool IsAlive() override { return this->active; } @@ -341,12 +341,12 @@ public: class CRandomOptEffect : public CEffect { public: CRandomOptEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; - void Slot08(int red, int green, int blue) override; - void Slot11(std::string name) override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; + void SetColor(int red, int green, int blue) override; + void SetParticleTexture(std::string name) override; void Close() override; void Init(); @@ -357,10 +357,10 @@ public: class CRichsCoinEffect : public CEffect { public: CRichsCoinEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ std::vector particles; @@ -371,10 +371,10 @@ public: class CSavageImpactEffect : public CEffect { public: CSavageImpactEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; /* 00CC */ EZ2STREmitter* emitter; @@ -384,10 +384,10 @@ public: class CServantWeaponEffect : public CEffect { public: CServantWeaponEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void SetShoot(int column); void SetPhantomShot(long long column); @@ -401,10 +401,10 @@ class CServantWeaponNewEffect : public CEffect { public: CServantWeaponNewEffect(); ~CServantWeaponNewEffect() override; - bool Slot06() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + bool IsAlive() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; void AddWeapon(); EZ2STREmitter* CreateShot(float angle, int skill); @@ -418,11 +418,11 @@ class CSevereRainStorm : public CEffect { public: CSevereRainStorm(); ~CSevereRainStorm() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void SpawnParticles(); void SpawnCrossRain(); @@ -441,10 +441,10 @@ public: class CGaleStorm : public CEffect { public: CGaleStorm(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void SpawnArrow(); void SpawnStorm(); @@ -462,10 +462,10 @@ public: class CJupitelThunderHit : public CEffect { public: CJupitelThunderHit(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void SpawnHit(); void SpawnSpark(); @@ -479,10 +479,10 @@ class CNewCloudKillEffect : public CEffect { public: CNewCloudKillEffect(); ~CNewCloudKillEffect() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; void ResetMistParticle(CParticle* particle); void ResetCloudParticle(CParticle* particle); @@ -502,12 +502,12 @@ public: class CDropItemEffect : public CEffect { public: CDropItemEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void OnProcess() override; + void Render() override; + bool IsAlive() override; void Close() override; - void Slot12() override; + void InitEvents() override; void OpenEmitters(); /* 00CC */ int unknown_00CC; @@ -523,11 +523,11 @@ class CHawkVumerangEffect : public CEffect { public: CHawkVumerangEffect(); ~CHawkVumerangEffect() override; - void Slot01() override; - void Slot04() override; - bool Slot06() override; + void Open() override; + void Render() override; + bool IsAlive() override; void Close() override; - void Slot03() override; + void OnProcess() override; /* 00CC */ std::list emitters; /* 00D4 */ std::list unknown_00D4; diff --git a/Source/Contents/Effects/NyanggrassEffect.cpp b/Source/Contents/Effects/NyanggrassEffect.cpp index f04fd0dad..9103c77d0 100644 --- a/Source/Contents/Effects/NyanggrassEffect.cpp +++ b/Source/Contents/Effects/NyanggrassEffect.cpp @@ -31,7 +31,7 @@ CMultiTexParticle::~CMultiTexParticle() { // OFFSET: 0x00707F60 // FUNCTION: fn_07066 -void CMultiTexParticle::Slot01() { +void CMultiTexParticle::ReleaseResource() { } // OFFSET: 0x00707F70 @@ -139,7 +139,7 @@ void CNyanggrassEffect::Close() { // OFFSET: 0x007085F0 // FUNCTION: fn_07073 -void CNyanggrassEffect::Slot01() { +void CNyanggrassEffect::Open() { switch (this->unknown_00B0) { case 1: case 2: @@ -179,13 +179,13 @@ void CNyanggrassEffect::Slot01() { // OFFSET: 0x00708820 // FUNCTION: fn_07074 -bool CNyanggrassEffect::Slot06() { +bool CNyanggrassEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00708830 // FUNCTION: fn_07075 -void CNyanggrassEffect::Slot03() { +void CNyanggrassEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/NyanggrassEffect.h b/Source/Contents/Effects/NyanggrassEffect.h index f367cb46b..8d524cac5 100644 --- a/Source/Contents/Effects/NyanggrassEffect.h +++ b/Source/Contents/Effects/NyanggrassEffect.h @@ -12,7 +12,7 @@ class CMultiTexParticle : public CParticle { public: CMultiTexParticle(vector3d position, int flags); ~CMultiTexParticle() override; - void Slot01() override; + void ReleaseResource() override; void Reset(); void AllocateVertices(int count); @@ -31,11 +31,11 @@ class CNyanggrassEffect : public CEffect { public: CNyanggrassEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector particles; /* 00D8 */ int unknown_00D8; diff --git a/Source/Contents/Effects/Particle.cpp b/Source/Contents/Effects/Particle.cpp index fa665afa4..de0a0be1c 100644 --- a/Source/Contents/Effects/Particle.cpp +++ b/Source/Contents/Effects/Particle.cpp @@ -140,7 +140,7 @@ CEZ2STRParticle::~CEZ2STRParticle() { // OFFSET: 0x00B3CFC0 // FUNCTION: fn_18815 -void CEZ2STRParticle::Slot01() { +void CEZ2STRParticle::ReleaseResource() { this->m_res = CResPtr(); } diff --git a/Source/Contents/Effects/Particle.h b/Source/Contents/Effects/Particle.h index 6130ddfde..9c7527723 100644 --- a/Source/Contents/Effects/Particle.h +++ b/Source/Contents/Effects/Particle.h @@ -47,7 +47,7 @@ class CParticle { public: __declspec(noinline) CParticle(vector3d position, int flags); virtual ~CParticle(); - virtual void Slot01() {} + virtual void ReleaseResource() {} void Reset(); void SetQuad(RenderVertex* vertices, float top, float bottom, float left, float right); @@ -108,7 +108,7 @@ class CEZ2STRParticle : public CParticle { public: CEZ2STRParticle(vector3d position, int flags); ~CEZ2STRParticle() override; - void Slot01() override; + void ReleaseResource() override; void Clear(); std::string ResolvePath(const std::string& name); diff --git a/Source/Contents/Effects/PartyMemberEffects.cpp b/Source/Contents/Effects/PartyMemberEffects.cpp index e6f2f7fec..5ad9cbcc5 100644 --- a/Source/Contents/Effects/PartyMemberEffects.cpp +++ b/Source/Contents/Effects/PartyMemberEffects.cpp @@ -57,7 +57,7 @@ int CRollingCutterRagEffect::GetDuration() { // OFFSET: 0x00612010 // FUNCTION: fn_04339 -std::uint32_t CRagEffect::Slot13() { +std::uint32_t CRagEffect::GetStateFlags() { return 0; } diff --git a/Source/Contents/Effects/PokJukEffect.cpp b/Source/Contents/Effects/PokJukEffect.cpp index 45ec585ae..476523bbb 100644 --- a/Source/Contents/Effects/PokJukEffect.cpp +++ b/Source/Contents/Effects/PokJukEffect.cpp @@ -78,19 +78,19 @@ void CPokJukEffect::Close() { // OFFSET: 0x00B6F7B0 // FUNCTION: fn_19122 -void CPokJukEffect::Slot01() { +void CPokJukEffect::Open() { this->SpawnParticles(); } // OFFSET: 0x00B6F7C0 // FUNCTION: fn_19123 -bool CPokJukEffect::Slot06() { +bool CPokJukEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B6F7D0 // FUNCTION: fn_19124 -void CPokJukEffect::Slot03() { +void CPokJukEffect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; vector3d& position = particle->position; @@ -177,7 +177,7 @@ void CPokJukEffect::Slot03() { // OFFSET: 0x00B6FEA0 // FUNCTION: fn_19125 -void CPokJukEffect::Slot04() { +void CPokJukEffect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; diff --git a/Source/Contents/Effects/PokJukEffect.h b/Source/Contents/Effects/PokJukEffect.h index 7869cf5bf..22fe7685f 100644 --- a/Source/Contents/Effects/PokJukEffect.h +++ b/Source/Contents/Effects/PokJukEffect.h @@ -11,11 +11,11 @@ class CParticle; class CPokJukEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void SpawnParticles(); __declspec(noinline) void FaceCamera(vector3d* corners); diff --git a/Source/Contents/Effects/PowderingEffect.cpp b/Source/Contents/Effects/PowderingEffect.cpp index 82535dd32..2788e974f 100644 --- a/Source/Contents/Effects/PowderingEffect.cpp +++ b/Source/Contents/Effects/PowderingEffect.cpp @@ -32,7 +32,7 @@ void CPowderingEffect::Close() { // OFFSET: 0x00709330 // FUNCTION: fn_07089 -void CPowderingEffect::Slot01() { +void CPowderingEffect::Open() { if (this->unknown_00B0 == 1 || this->unknown_00B0 == 2) { this->unknown_00E4 = 3; } else if (this->unknown_00B0 == 3 || this->unknown_00B0 == 4) { @@ -133,7 +133,7 @@ void CPowderingEffect::InitSpriteParticle(CParticle* particle) { // OFFSET: 0x00709690 // FUNCTION: fn_07091 -void CPowderingEffect::Slot12() { +void CPowderingEffect::InitEvents() { if (this->id == 1104) { this->AddEvent(0, "effect\\su_cn_powdering.wav", 0, 0); } @@ -169,7 +169,7 @@ void CPowderingEffect::InitSmokeParticle(CParticle* particle) { // OFFSET: 0x007097B0 // FUNCTION: fn_07093 -bool CPowderingEffect::Slot06() { +bool CPowderingEffect::IsAlive() { for (CParticle* particle : this->smokeParticles) { if (particle->unknown_00A8 != 2) { return true; @@ -187,7 +187,7 @@ bool CPowderingEffect::Slot06() { // OFFSET: 0x00709800 // FUNCTION: fn_07094 -void CPowderingEffect::Slot03() { +void CPowderingEffect::OnProcess() { for (auto it = this->smokeParticles.begin(); it != this->smokeParticles.end(); ++it) { CParticle* particle = *it; if (!particle || particle->unknown_00A8 == 2) { @@ -279,7 +279,7 @@ void CPowderingEffect::Slot03() { // OFFSET: 0x00709E40 // FUNCTION: fn_07095 -void CPowderingEffect::Slot04() { +void CPowderingEffect::Render() { for (auto it = this->smokeParticles.begin(); it != this->smokeParticles.end(); ++it) { CParticle* particle = *it; if (particle && particle->unknown_00A8 != 2) { diff --git a/Source/Contents/Effects/PowderingEffect.h b/Source/Contents/Effects/PowderingEffect.h index 1d67bc83d..537551ef4 100644 --- a/Source/Contents/Effects/PowderingEffect.h +++ b/Source/Contents/Effects/PowderingEffect.h @@ -13,12 +13,12 @@ class CPowderingEffect : public CEffect { public: CPowderingEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; + bool IsAlive() override; + void InitEvents() override; void InitSpriteParticle(CParticle* particle); void InitSmokeParticle(CParticle* particle); diff --git a/Source/Contents/Effects/RagEffect.cpp b/Source/Contents/Effects/RagEffect.cpp index 876049cd8..d2b3aff71 100644 --- a/Source/Contents/Effects/RagEffect.cpp +++ b/Source/Contents/Effects/RagEffect.cpp @@ -10218,7 +10218,7 @@ void CRagEffect::NapalmFragments() { // OFFSET: 0x00C20240 // FUNCTION: fn_20086 -bool CRagEffect::Slot14() { +bool CRagEffect::OnProcess2() { switch (this->state.type) { case 300: if (this->state.stateCnt == 0) { @@ -16685,7 +16685,7 @@ void CRagEffect::EmpShockBurst(const char* name, char flag) { // OFFSET: 0x00C64CA0 // FUNCTION: fn_20264 -void CPc::Slot29(int value) { +void CPc::SetSprShoe(int value) { this->unknown_0460[0] = value; } @@ -19545,7 +19545,7 @@ void CRagEffect::TexturedClassChange(char kind) { // OFFSET: 0x00C213C0 // FUNCTION: fn_20087 -bool CRagEffect::Slot15() { +bool CRagEffect::OnProcess3() { switch (this->state.type) { case 1003: if ((this->state.parent->render.flags & 0x4000) == 0) { @@ -22763,7 +22763,7 @@ bool CRagEffect::Slot15() { plant->SetActionName(ResourceMgr::Instance(), "sprite\\몬스터\\red_plant.act"); plant->SetActorJob(1078); } - plant->Slot18(plant->GetEffectiveJob(-1), plant->unknown_0260, 0); + plant->SetSprAct(plant->GetEffectiveJob(-1), plant->unknown_0260, 0); WorldObjects().push_back(plant); } break; @@ -23260,11 +23260,11 @@ bool CRagEffect::OnProcess() { } if (this->state.type >= 300 && this->state.type <= 373) { - if (!this->Slot14()) { + if (!this->OnProcess2()) { return false; } } else if (this->state.type >= 491) { - if (!this->Slot15()) { + if (!this->OnProcess3()) { return false; } } else { diff --git a/Source/Contents/Effects/RagEffect.h b/Source/Contents/Effects/RagEffect.h index 14310e3e7..9c09a5831 100644 --- a/Source/Contents/Effects/RagEffect.h +++ b/Source/Contents/Effects/RagEffect.h @@ -346,9 +346,9 @@ struct CRagEffect : CRenderObject { void TorchDust(char kind); void Render(int argument) override; - std::uint32_t Slot13() override; - virtual bool Slot14(); - virtual bool Slot15(); + std::uint32_t GetStateFlags() override; + virtual bool OnProcess2(); + virtual bool OnProcess3(); virtual void SendMsg(CGameObject* sender, int message, int first, std::int64_t second, int third, int fourth, int fifth, int sixth); virtual void Init(EffectActor* parent, int id, vector3d deltaPos); virtual int GetDuration(); diff --git a/Source/Contents/Effects/RainbowEffect.cpp b/Source/Contents/Effects/RainbowEffect.cpp index 773ce90a8..c83fc11d1 100644 --- a/Source/Contents/Effects/RainbowEffect.cpp +++ b/Source/Contents/Effects/RainbowEffect.cpp @@ -21,7 +21,7 @@ void CRainbowEffect::Close() { // OFFSET: 0x00B70CF0 // FUNCTION: fn_19129 -void CRainbowEffect::Slot01() { +void CRainbowEffect::Open() { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); const int angle = (360 - static_cast(mode->camera->camera.yaw)) % 360; for (int row = 0; row < 7; ++row) { @@ -49,13 +49,13 @@ void CRainbowEffect::Slot01() { // OFFSET: 0x00B70DF0 // FUNCTION: fn_19130 -bool CRainbowEffect::Slot06() { +bool CRainbowEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B70E00 // FUNCTION: fn_19131 -void CRainbowEffect::Slot03() { +void CRainbowEffect::OnProcess() { for (std::vector::iterator it = this->bands.begin(); it != this->bands.end(); ++it) { CParticle* particle = *it; vector3d& position = particle->position; @@ -157,7 +157,7 @@ void CRainbowEffect::Slot03() { // OFFSET: 0x00B714C0 // FUNCTION: fn_19132 -void CRainbowEffect::Slot04() { +void CRainbowEffect::Render() { for (std::vector::iterator it = this->bands.begin(); it != this->bands.end(); ++it) { CParticle* particle = *it; diff --git a/Source/Contents/Effects/RainbowEffect.h b/Source/Contents/Effects/RainbowEffect.h index de727270d..6c9c89dcc 100644 --- a/Source/Contents/Effects/RainbowEffect.h +++ b/Source/Contents/Effects/RainbowEffect.h @@ -11,11 +11,11 @@ class CParticle; class CRainbowEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ vector3d previousOuter; /* 00D8 */ vector3d previousInner; diff --git a/Source/Contents/Effects/RectUpEffect.cpp b/Source/Contents/Effects/RectUpEffect.cpp index ace2111b1..3baca1613 100644 --- a/Source/Contents/Effects/RectUpEffect.cpp +++ b/Source/Contents/Effects/RectUpEffect.cpp @@ -17,7 +17,7 @@ CRectUpEffect::CRectUpEffect() : CEffect(1088), unknown_00CC{} { // OFFSET: 0x0070A410 // FUNCTION: fn_07100 -void CRectUpEffect::Slot12() { +void CRectUpEffect::InitEvents() { if (this->id == 1088) { this->AddEvent(0, "effect\\EF_FireWall.wav", 0, 0); } @@ -25,13 +25,13 @@ void CRectUpEffect::Slot12() { // OFFSET: 0x0070A430 // FUNCTION: fn_07101 -bool CRectUpEffect::Slot06() { +bool CRectUpEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0070A440 // FUNCTION: fn_07102 -void CRectUpEffect::Slot03() { +void CRectUpEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0] + particle->unknown_00D0; @@ -49,7 +49,7 @@ void CRectUpEffect::Slot03() { height *= g_sinTable[particle->unknown_00E8]; } particle->unknown_0054 = height; - this->Slot34(particle); + this->ProcessParticle(particle); matrix rotation; std::memcpy(rotation.values, g_identityMatrix, sizeof(rotation.values)); @@ -61,7 +61,7 @@ void CRectUpEffect::Slot03() { // OFFSET: 0x0070A700 // FUNCTION: fn_07103 -void CRectUpEffect::Slot04() { +void CRectUpEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { @@ -104,7 +104,7 @@ void CRectUpEffect::Slot04() { // OFFSET: 0x0070AA30 // FUNCTION: fn_07104 -void CRectUpEffect::Slot34(CParticle* particle) { +void CRectUpEffect::ProcessParticle(CParticle* particle) { if (particle && this->id == 1088) { particle->unknown_004C += particle->unknown_004C + 1 < 360 ? 1 : -359; const int base = *reinterpret_cast(particle->unknown_0048); @@ -114,7 +114,7 @@ void CRectUpEffect::Slot34(CParticle* particle) { // OFFSET: 0x0070AAA0 // FUNCTION: fn_07105 -void CRectUpEffect::Slot35(CParticle* particle) { +void CRectUpEffect::InitParticle(CParticle* particle) { if (particle && this->id == 1088) { particle->SetTexture("effect\\ring_yellow.tga"); } @@ -131,7 +131,7 @@ void CRectUpEffect::Close() { // OFFSET: 0x0070A260 // FUNCTION: fn_07099 -void CRectUpEffect::Slot01() { +void CRectUpEffect::Open() { if (this->id != 1088) { return; } @@ -164,7 +164,7 @@ void CRectUpEffect::Slot01() { std::memcpy(particle->unknown_0048, &shade, sizeof(shade)); particle->unknown_004C = 0; } - this->Slot35(particle); + this->InitParticle(particle); InitParticleQuad(particle->vertices); this->particles.push_back(particle); } diff --git a/Source/Contents/Effects/RectUpEffect.h b/Source/Contents/Effects/RectUpEffect.h index 05ec53ef8..817e2a824 100644 --- a/Source/Contents/Effects/RectUpEffect.h +++ b/Source/Contents/Effects/RectUpEffect.h @@ -13,14 +13,14 @@ class CRectUpEffect : public CEffect { public: CRectUpEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; - virtual void Slot34(CParticle* particle); - virtual void Slot35(CParticle* particle); + bool IsAlive() override; + void InitEvents() override; + virtual void ProcessParticle(CParticle* particle); + virtual void InitParticle(CParticle* particle); /* 00CC */ vector3d unknown_00CC[2]; /* 00E4 */ int unknown_00E4; diff --git a/Source/Contents/Effects/RedLineEffect.cpp b/Source/Contents/Effects/RedLineEffect.cpp index e7f0694cf..44a3a9e2c 100644 --- a/Source/Contents/Effects/RedLineEffect.cpp +++ b/Source/Contents/Effects/RedLineEffect.cpp @@ -58,7 +58,7 @@ void CRedLineEffect::Close() { // OFFSET: 0x00B71BC0 // FUNCTION: fn_19136 -void CRedLineEffect::Slot01() { +void CRedLineEffect::Open() { this->CreateLines(0); this->CreateLines(1); this->unknown_002C = 75; @@ -66,13 +66,13 @@ void CRedLineEffect::Slot01() { // OFFSET: 0x00B71BE0 // FUNCTION: fn_19137 -bool CRedLineEffect::Slot06() { +bool CRedLineEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B71EA0 // FUNCTION: fn_19138 -void CRedLineEffect::Slot03() { +void CRedLineEffect::OnProcess() { for (std::vector::iterator it = this->lines.begin(); it != this->lines.end(); ++it) { CParticle* particle = *it; vector3d& position = particle->position; @@ -165,7 +165,7 @@ void CRedLineEffect::Slot03() { // OFFSET: 0x00B72240 // FUNCTION: fn_19139 -void CRedLineEffect::Slot04() { +void CRedLineEffect::Render() { for (std::vector::iterator it = this->lines.begin(); it != this->lines.end(); ++it) { CParticle* particle = *it; diff --git a/Source/Contents/Effects/RedLineEffect.h b/Source/Contents/Effects/RedLineEffect.h index f2e3982a2..c65468c50 100644 --- a/Source/Contents/Effects/RedLineEffect.h +++ b/Source/Contents/Effects/RedLineEffect.h @@ -11,11 +11,11 @@ class CParticle; class CRedLineEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void CreateLines(int layer); diff --git a/Source/Contents/Effects/RichManKim.cpp b/Source/Contents/Effects/RichManKim.cpp index 343d95513..27c9dd516 100644 --- a/Source/Contents/Effects/RichManKim.cpp +++ b/Source/Contents/Effects/RichManKim.cpp @@ -18,7 +18,7 @@ void CRichManKim::Close() { // OFFSET: 0x0070B1A0 // FUNCTION: fn_07115 -void CRichManKim::Slot01() { +void CRichManKim::Open() { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (!particle) { return; @@ -43,13 +43,13 @@ void CRichManKim::Slot01() { // OFFSET: 0x0070B370 // FUNCTION: fn_07116 -bool CRichManKim::Slot06() { +bool CRichManKim::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0070B380 // FUNCTION: fn_07117 -void CRichManKim::Slot03() { +void CRichManKim::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -92,7 +92,7 @@ void CRichManKim::Slot03() { // OFFSET: 0x0070B780 // FUNCTION: fn_07118 -void CRichManKim::Slot04() { +void CRichManKim::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/RichManKim.h b/Source/Contents/Effects/RichManKim.h index 1dce0e9dc..baeb8f49b 100644 --- a/Source/Contents/Effects/RichManKim.h +++ b/Source/Contents/Effects/RichManKim.h @@ -10,11 +10,11 @@ class CParticle; class CRichManKim : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ unsigned char unknown_00CC[0x38]; /* 0104 */ int angleIndex; diff --git a/Source/Contents/Effects/RotateBgEffect.cpp b/Source/Contents/Effects/RotateBgEffect.cpp index 3fcda0cad..1a876d0ef 100644 --- a/Source/Contents/Effects/RotateBgEffect.cpp +++ b/Source/Contents/Effects/RotateBgEffect.cpp @@ -26,7 +26,7 @@ void CRotateBgEffect::Close() { // OFFSET: 0x00B727D0 // FUNCTION: fn_19142 -void CRotateBgEffect::Slot01() { +void CRotateBgEffect::Open() { for (int ring = 0; ring < 2; ++ring) { const int start = std::max(rand() % 360, 0); for (int index = 0; index < 10; ++index) { @@ -77,13 +77,13 @@ void CRotateBgEffect::Slot01() { // OFFSET: 0x00B729E0 // FUNCTION: fn_19143 -bool CRotateBgEffect::Slot06() { +bool CRotateBgEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B729F0 // FUNCTION: fn_19144 -void CRotateBgEffect::Slot03() { +void CRotateBgEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -230,7 +230,7 @@ void CRotateBgEffect::Slot03() { // OFFSET: 0x00B734E0 // FUNCTION: fn_19145 -void CRotateBgEffect::Slot04() { +void CRotateBgEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/RotateBgEffect.h b/Source/Contents/Effects/RotateBgEffect.h index 628208783..aec7a787b 100644 --- a/Source/Contents/Effects/RotateBgEffect.h +++ b/Source/Contents/Effects/RotateBgEffect.h @@ -12,11 +12,11 @@ class CParticle; class CRotateBgEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ float height; /* 00D0 */ float radius; diff --git a/Source/Contents/Effects/RotateItemEffect.cpp b/Source/Contents/Effects/RotateItemEffect.cpp index 894d64cfe..168553631 100644 --- a/Source/Contents/Effects/RotateItemEffect.cpp +++ b/Source/Contents/Effects/RotateItemEffect.cpp @@ -28,7 +28,7 @@ void CRotateItemEffect::Close() { // OFFSET: 0x00B739F0 // FUNCTION: fn_19149 -void CRotateItemEffect::Slot01() { +void CRotateItemEffect::Open() { for (int index = 0; index < 4; ++index) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (!particle) { @@ -53,13 +53,13 @@ void CRotateItemEffect::Slot01() { // OFFSET: 0x00B73AC0 // FUNCTION: fn_19150 -bool CRotateItemEffect::Slot06() { +bool CRotateItemEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B73AD0 // FUNCTION: fn_19151 -void CRotateItemEffect::Slot03() { +void CRotateItemEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -113,7 +113,7 @@ void CRotateItemEffect::Slot03() { // OFFSET: 0x00B74110 // FUNCTION: fn_19152 -void CRotateItemEffect::Slot04() { +void CRotateItemEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/RotateItemEffect.h b/Source/Contents/Effects/RotateItemEffect.h index 9f9bc4b32..bcde10dfb 100644 --- a/Source/Contents/Effects/RotateItemEffect.h +++ b/Source/Contents/Effects/RotateItemEffect.h @@ -12,11 +12,11 @@ class CRotateItemEffect : public CEffect { public: CRotateItemEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ int alpha; /* 00D0 */ float angle; diff --git a/Source/Contents/Effects/RotateLineEffect.cpp b/Source/Contents/Effects/RotateLineEffect.cpp index 0a5ef089f..68b37f7a4 100644 --- a/Source/Contents/Effects/RotateLineEffect.cpp +++ b/Source/Contents/Effects/RotateLineEffect.cpp @@ -24,7 +24,7 @@ void CRotateLineEffect::Close() { // OFFSET: 0x00B743A0 // FUNCTION: fn_19156 -void CRotateLineEffect::Slot01() { +void CRotateLineEffect::Open() { int ring = 0; for (int startAngle = 0; startAngle < 360; startAngle += 90) { const int tilt = std::max(0, rand() % 21) + 80; @@ -65,13 +65,13 @@ void CRotateLineEffect::Slot01() { // OFFSET: 0x00B74580 // FUNCTION: fn_19157 -bool CRotateLineEffect::Slot06() { +bool CRotateLineEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B74590 // FUNCTION: fn_19158 -void CRotateLineEffect::Slot03() { +void CRotateLineEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -153,7 +153,7 @@ void CRotateLineEffect::Slot03() { // OFFSET: 0x00B74B00 // FUNCTION: fn_19159 -void CRotateLineEffect::Slot04() { +void CRotateLineEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (CParticle* particle = *it) { const int segment = particle->unknown_000C; diff --git a/Source/Contents/Effects/RotateLineEffect.h b/Source/Contents/Effects/RotateLineEffect.h index f8c57968e..ad10aa7f5 100644 --- a/Source/Contents/Effects/RotateLineEffect.h +++ b/Source/Contents/Effects/RotateLineEffect.h @@ -13,11 +13,11 @@ class CRotateLineEffect : public CEffect { public: CRotateLineEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ float scale; /* 00D0 */ int angle; diff --git a/Source/Contents/Effects/SaintCastingEffect.cpp b/Source/Contents/Effects/SaintCastingEffect.cpp index e05545642..69738c636 100644 --- a/Source/Contents/Effects/SaintCastingEffect.cpp +++ b/Source/Contents/Effects/SaintCastingEffect.cpp @@ -92,7 +92,7 @@ void CSaintCastingEffect::Close() { // OFFSET: 0x00B752B0 // FUNCTION: fn_19163 -void CSaintCastingEffect::Slot01() { +void CSaintCastingEffect::Open() { CWorld* world = static_cast(g_modeMgr.GetGameMode())->scene; const vector3d& player = reinterpret_cast(world->player)->render.position; @@ -158,13 +158,13 @@ void CSaintCastingEffect::Slot01() { // OFFSET: 0x00B756A0 // FUNCTION: fn_19164 -bool CSaintCastingEffect::Slot06() { +bool CSaintCastingEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B756B0 // FUNCTION: fn_19165 -void CSaintCastingEffect::Slot03() { +void CSaintCastingEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -237,7 +237,7 @@ void CSaintCastingEffect::Slot03() { // OFFSET: 0x00B75BB0 // FUNCTION: fn_19166 -void CSaintCastingEffect::Slot04() { +void CSaintCastingEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle || particle->unknown_000C <= 0) { diff --git a/Source/Contents/Effects/SaintCastingEffect.h b/Source/Contents/Effects/SaintCastingEffect.h index cbc3bc13b..e69709997 100644 --- a/Source/Contents/Effects/SaintCastingEffect.h +++ b/Source/Contents/Effects/SaintCastingEffect.h @@ -11,11 +11,11 @@ class CParticle; class CSaintCastingEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddRing(const char* texture, int alpha); /* 00CC */ vector3d lastInner; diff --git a/Source/Contents/Effects/ScatterEffect.cpp b/Source/Contents/Effects/ScatterEffect.cpp index 3dc5156e0..611da596b 100644 --- a/Source/Contents/Effects/ScatterEffect.cpp +++ b/Source/Contents/Effects/ScatterEffect.cpp @@ -25,7 +25,7 @@ void CScatterEffect::Close() { // OFFSET: 0x00B75EB0 // FUNCTION: fn_19170 -void CScatterEffect::Slot01() { +void CScatterEffect::Open() { for (int i = 0; i < 50; ++i) { CSpriteParticle* particle = static_cast(CreateSpriteParticle(reinterpret_cast(this->position), 1)); if (!particle) { @@ -58,13 +58,13 @@ void CScatterEffect::Slot01() { // OFFSET: 0x00B76120 // FUNCTION: fn_19171 -bool CScatterEffect::Slot06() { +bool CScatterEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B76130 // FUNCTION: fn_19172 -void CScatterEffect::Slot03() { +void CScatterEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -91,7 +91,7 @@ void CScatterEffect::Slot03() { // OFFSET: 0x00B76390 // FUNCTION: fn_19173 -void CScatterEffect::Slot04() { +void CScatterEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Draw(1); diff --git a/Source/Contents/Effects/ScatterEffect.h b/Source/Contents/Effects/ScatterEffect.h index 25b2b10a6..dc84d1a27 100644 --- a/Source/Contents/Effects/ScatterEffect.h +++ b/Source/Contents/Effects/ScatterEffect.h @@ -12,11 +12,11 @@ class CScatterEffect : public CEffect { public: CScatterEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector particles; }; diff --git a/Source/Contents/Effects/ShadowExceedEffect.cpp b/Source/Contents/Effects/ShadowExceedEffect.cpp index 095f057cc..dd493327c 100644 --- a/Source/Contents/Effects/ShadowExceedEffect.cpp +++ b/Source/Contents/Effects/ShadowExceedEffect.cpp @@ -35,7 +35,7 @@ void CShadowExceed::Close() { // OFFSET: 0x00727FC0 // FUNCTION: fn_07431 -void CShadowExceed::Slot01() { +void CShadowExceed::Open() { this->unknown_00D8 = 0; CRenderObject* actor = FindRenderObject(this->actor); @@ -83,13 +83,13 @@ void CShadowExceed::Slot01() { // OFFSET: 0x007289C0 // FUNCTION: fn_07433 -bool CShadowExceed::Slot06() { +bool CShadowExceed::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00728A50 // FUNCTION: fn_07435 -void CShadowExceed::Slot03() { +void CShadowExceed::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end();) { CEZ2STRParticle* emitter = *it; if (emitter->life == 0.0f || emitter->life * 60.0f > static_cast(emitter->unknown_00E8)) { @@ -128,7 +128,7 @@ void CShadowExceed::Slot03() { // OFFSET: 0x00729230 // FUNCTION: fn_07437 -void CShadowExceed::Slot04() { +void CShadowExceed::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { (*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/ShadowExceedEffect.h b/Source/Contents/Effects/ShadowExceedEffect.h index 2053da637..5671ed449 100644 --- a/Source/Contents/Effects/ShadowExceedEffect.h +++ b/Source/Contents/Effects/ShadowExceedEffect.h @@ -11,11 +11,11 @@ class CEZ2STRParticle; class CShadowExceed : public CEffect { public: CShadowExceed(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector emitters; /* 00D8 */ unsigned char unknown_00D8; diff --git a/Source/Contents/Effects/ShadowExceedNewEffect.cpp b/Source/Contents/Effects/ShadowExceedNewEffect.cpp index 1bc0841fa..eb03b1ab8 100644 --- a/Source/Contents/Effects/ShadowExceedNewEffect.cpp +++ b/Source/Contents/Effects/ShadowExceedNewEffect.cpp @@ -29,7 +29,7 @@ void CShadowExceedNew::Close() { // OFFSET: 0x00728500 // FUNCTION: fn_07432 -void CShadowExceedNew::Slot01() { +void CShadowExceedNew::Open() { this->retained = 1; this->AddEvent(0, "effect\\SHC_SHADOW_EXCEED.wav", 0, 0); @@ -78,7 +78,7 @@ void CShadowExceedNew::Slot01() { // OFFSET: 0x007289D0 // FUNCTION: fn_07434 -bool CShadowExceedNew::Slot06() { +bool CShadowExceedNew::IsAlive() { CRenderObject* actor = FindRenderObject(this->actor); if (actor) { if (this->frontEmitters.size() != 0 && this->backEmitters.size() != 0) { @@ -93,7 +93,7 @@ bool CShadowExceedNew::Slot06() { // OFFSET: 0x00728DC0 // FUNCTION: fn_07436 -void CShadowExceedNew::Slot03() { +void CShadowExceedNew::OnProcess() { CRenderObject* actor = FindRenderObject(this->actor); if (!actor) { return; @@ -139,7 +139,7 @@ void CShadowExceedNew::Slot03() { // OFFSET: 0x00729280 // FUNCTION: fn_07438 -void CShadowExceedNew::Slot04() { +void CShadowExceedNew::Render() { if (!this->unknown_00CC) { for (auto it = this->frontEmitters.begin(); it != this->frontEmitters.end(); ++it) { (*it)->DrawBillboards(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/SkillEffects.h b/Source/Contents/Effects/SkillEffects.h index 5e46cbd66..4b7736470 100644 --- a/Source/Contents/Effects/SkillEffects.h +++ b/Source/Contents/Effects/SkillEffects.h @@ -14,11 +14,11 @@ class CMeteorEffect : public CEffect { public: CMeteorEffect() : CEffect(-1), unknown_00D8(12), unknown_00DC(0) {} - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; ~CMeteorEffect() override; /* 00CC */ std::vector unknown_00CC; @@ -30,11 +30,11 @@ class CShadowExceedNew : public CEffect { public: CShadowExceedNew() : CEffect(2467), unknown_00CC(0) {} - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; ~CShadowExceedNew() override; /* 00CC */ unsigned char unknown_00CC; @@ -49,11 +49,11 @@ public: unknown_00E4(0), unknown_00E8(0), unknown_00EC(1.0f), unknown_00F0(0), unknown_00F4(0), unknown_00F8(0), unknown_00FC(0), unknown_00FD(1) {} - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; ~CSprArrowEffect() override; void SetBulletSprite(int job); /* 00CC */ int unknown_00CC; diff --git a/Source/Contents/Effects/SmokeEffect.cpp b/Source/Contents/Effects/SmokeEffect.cpp index 2a82b80a8..1aff8c867 100644 --- a/Source/Contents/Effects/SmokeEffect.cpp +++ b/Source/Contents/Effects/SmokeEffect.cpp @@ -25,7 +25,7 @@ void CSmokeEffect::Close() { // OFFSET: 0x00B76580 // FUNCTION: fn_19177 -void CSmokeEffect::Slot01() { +void CSmokeEffect::Open() { for (int i = 0; i < 4; ++i) { CSpriteParticle* particle = static_cast(CreateSpriteParticle(reinterpret_cast(this->position), 1)); if (particle) { @@ -40,13 +40,13 @@ void CSmokeEffect::Slot01() { // OFFSET: 0x00B76710 // FUNCTION: fn_19178 -bool CSmokeEffect::Slot06() { +bool CSmokeEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B76720 // FUNCTION: fn_19179 -void CSmokeEffect::Slot03() { +void CSmokeEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -94,7 +94,7 @@ void CSmokeEffect::Slot03() { // OFFSET: 0x00B76D80 // FUNCTION: fn_19180 -void CSmokeEffect::Slot04() { +void CSmokeEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it && (*it)->unknown_000C < this->visibleCount) { (*it)->Draw(1); diff --git a/Source/Contents/Effects/SmokeEffect.h b/Source/Contents/Effects/SmokeEffect.h index 953b7928c..a96964ecd 100644 --- a/Source/Contents/Effects/SmokeEffect.h +++ b/Source/Contents/Effects/SmokeEffect.h @@ -12,11 +12,11 @@ class CSmokeEffect : public CEffect { public: CSmokeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ int visibleCount; /* 00D0 */ std::vector particles; diff --git a/Source/Contents/Effects/SoulCollectEffect.cpp b/Source/Contents/Effects/SoulCollectEffect.cpp index d7da3054b..e243f69e6 100644 --- a/Source/Contents/Effects/SoulCollectEffect.cpp +++ b/Source/Contents/Effects/SoulCollectEffect.cpp @@ -33,7 +33,7 @@ void CSoulCollectEffect::Close() { // OFFSET: 0x0072A5F0 // FUNCTION: fn_07460 -void CSoulCollectEffect::Slot01() { +void CSoulCollectEffect::Open() { const int count = this->unknown_00B0; if (count < 0) { return; @@ -77,13 +77,13 @@ void CSoulCollectEffect::Slot01() { // OFFSET: 0x0072A7F0 // FUNCTION: fn_07462 -bool CSoulCollectEffect::Slot06() { +bool CSoulCollectEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0072A800 // FUNCTION: fn_07463 -void CSoulCollectEffect::Slot03() { +void CSoulCollectEffect::OnProcess() { float& rotation = reinterpret_cast(this->unknown_0050); for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { @@ -158,7 +158,7 @@ void CSoulCollectEffect::Slot03() { // OFFSET: 0x0072AD90 // FUNCTION: fn_07464 -void CSoulCollectEffect::Slot04() { +void CSoulCollectEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle && particle->alpha > 0) { diff --git a/Source/Contents/Effects/SoulCollectEffect.h b/Source/Contents/Effects/SoulCollectEffect.h index 263a7fb2b..9bd2ee43c 100644 --- a/Source/Contents/Effects/SoulCollectEffect.h +++ b/Source/Contents/Effects/SoulCollectEffect.h @@ -12,11 +12,11 @@ class CSoulCollectEffect : public CEffect { public: CSoulCollectEffect(); ~CSoulCollectEffect() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::list particles; }; diff --git a/Source/Contents/Effects/SoulUnityEffect.cpp b/Source/Contents/Effects/SoulUnityEffect.cpp index 3cd9ae969..c90435b92 100644 --- a/Source/Contents/Effects/SoulUnityEffect.cpp +++ b/Source/Contents/Effects/SoulUnityEffect.cpp @@ -31,7 +31,7 @@ void CSoulUnityEffect::Close() { // OFFSET: 0x0072B2A0 // FUNCTION: fn_07469 -void CSoulUnityEffect::Slot01() { +void CSoulUnityEffect::Open() { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 0); if (particle) { particle->SetTexture("effect\\soul_unity\\soul_unity.bmp"); @@ -48,13 +48,13 @@ void CSoulUnityEffect::Slot01() { // OFFSET: 0x0072B3B0 // FUNCTION: fn_07471 -bool CSoulUnityEffect::Slot06() { +bool CSoulUnityEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0072B3C0 // FUNCTION: fn_07472 -void CSoulUnityEffect::Slot03() { +void CSoulUnityEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle) { @@ -95,7 +95,7 @@ void CSoulUnityEffect::Slot03() { // OFFSET: 0x0072B920 // FUNCTION: fn_07473 -void CSoulUnityEffect::Slot04() { +void CSoulUnityEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle && particle->texture) { diff --git a/Source/Contents/Effects/SoulUnityEffect.h b/Source/Contents/Effects/SoulUnityEffect.h index 30053f114..9b126570f 100644 --- a/Source/Contents/Effects/SoulUnityEffect.h +++ b/Source/Contents/Effects/SoulUnityEffect.h @@ -12,11 +12,11 @@ class CSoulUnityEffect : public CEffect { public: CSoulUnityEffect(); ~CSoulUnityEffect() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::list particles; }; diff --git a/Source/Contents/Effects/SphereWind2Effect.cpp b/Source/Contents/Effects/SphereWind2Effect.cpp index 4868a2405..38a28cab0 100644 --- a/Source/Contents/Effects/SphereWind2Effect.cpp +++ b/Source/Contents/Effects/SphereWind2Effect.cpp @@ -24,7 +24,7 @@ void CSphereWind2Effect::Close() { // OFFSET: 0x00B77380 // FUNCTION: fn_19183 -void CSphereWind2Effect::Slot01() { +void CSphereWind2Effect::Open() { for (int base = 0; base < 45; base += 9) { int angle = base; for (int ring = 0; ring < 4; ++ring) { @@ -71,13 +71,13 @@ void CSphereWind2Effect::Slot01() { // OFFSET: 0x00B775E0 // FUNCTION: fn_19184 -bool CSphereWind2Effect::Slot06() { +bool CSphereWind2Effect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B775F0 // FUNCTION: fn_19185 -void CSphereWind2Effect::Slot03() { +void CSphereWind2Effect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->position.x = this->position[0]; (*it)->position.y = this->position[1]; @@ -143,7 +143,7 @@ void CSphereWind2Effect::Slot03() { // OFFSET: 0x00B77B40 // FUNCTION: fn_19186 -void CSphereWind2Effect::Slot04() { +void CSphereWind2Effect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle && particle->unknown_00E8 > 0 && particle->unknown_000C > 0) { diff --git a/Source/Contents/Effects/SphereWind2Effect.h b/Source/Contents/Effects/SphereWind2Effect.h index d7021beee..f28d62045 100644 --- a/Source/Contents/Effects/SphereWind2Effect.h +++ b/Source/Contents/Effects/SphereWind2Effect.h @@ -11,11 +11,11 @@ class CParticle; class CSphereWind2Effect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ vector3d lastOuter; /* 00D8 */ vector3d lastInner; diff --git a/Source/Contents/Effects/SphereWindEffect.cpp b/Source/Contents/Effects/SphereWindEffect.cpp index a25b8e434..72ca999d6 100644 --- a/Source/Contents/Effects/SphereWindEffect.cpp +++ b/Source/Contents/Effects/SphereWindEffect.cpp @@ -23,7 +23,7 @@ void CSphereWindEffect::Close() { // OFFSET: 0x00B78220 // FUNCTION: fn_19189 -void CSphereWindEffect::Slot01() { +void CSphereWindEffect::Open() { for (int start = 0; start < 45; start += 9) { const int id = this->id; int tilt = start; @@ -70,13 +70,13 @@ void CSphereWindEffect::Slot01() { // OFFSET: 0x00B78420 // FUNCTION: fn_19190 -bool CSphereWindEffect::Slot06() { +bool CSphereWindEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B78430 // FUNCTION: fn_19191 -void CSphereWindEffect::Slot03() { +void CSphereWindEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -141,7 +141,7 @@ __declspec(noinline) void CSphereWindEffect::UpdateParticle(CParticle* particle) // OFFSET: 0x00B78710 // FUNCTION: fn_19193 -void CSphereWindEffect::Slot04() { +void CSphereWindEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle || particle->unknown_000C <= 0) { diff --git a/Source/Contents/Effects/SphereWindEffect.h b/Source/Contents/Effects/SphereWindEffect.h index ca86e748d..a4f51c965 100644 --- a/Source/Contents/Effects/SphereWindEffect.h +++ b/Source/Contents/Effects/SphereWindEffect.h @@ -11,11 +11,11 @@ class CParticle; class CSphereWindEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void UpdateParticle(CParticle* particle); /* 00CC */ vector3d lastInner; diff --git a/Source/Contents/Effects/SpriteEffect.cpp b/Source/Contents/Effects/SpriteEffect.cpp index 71149cfc6..93ed04fed 100644 --- a/Source/Contents/Effects/SpriteEffect.cpp +++ b/Source/Contents/Effects/SpriteEffect.cpp @@ -69,7 +69,7 @@ void CSpriteEffect::Close() { // OFFSET: 0x00B78B40 // FUNCTION: fn_19197 -void CSpriteEffect::Slot01() { +void CSpriteEffect::Open() { CSpriteParticle* particle = static_cast(CreateSpriteParticle(reinterpret_cast(this->position), 0x200)); if (!particle) { return; @@ -381,7 +381,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { // OFFSET: 0x00B79C40 // FUNCTION: fn_19201 -void CSpriteEffect::Slot04() { +void CSpriteEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CSpriteParticle* particle = *it; if (particle->unknown_00E8 > 0) { @@ -392,7 +392,7 @@ void CSpriteEffect::Slot04() { // OFFSET: 0x00B79520 // FUNCTION: fn_19199 -bool CSpriteEffect::Slot06() { +bool CSpriteEffect::IsAlive() { switch (this->id) { case 0x3DE: return !this->IsFinished(); @@ -461,7 +461,7 @@ bool CSpriteEffect::Slot06() { // OFFSET: 0x00B79780 // FUNCTION: fn_19200 -void CSpriteEffect::Slot03() { +void CSpriteEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CSpriteParticle* particle = *it; ++particle->unknown_00E8; diff --git a/Source/Contents/Effects/SpriteEffect.h b/Source/Contents/Effects/SpriteEffect.h index a006dd8b3..4c0e08799 100644 --- a/Source/Contents/Effects/SpriteEffect.h +++ b/Source/Contents/Effects/SpriteEffect.h @@ -12,11 +12,11 @@ class CSpriteEffect : public CEffect { public: CSpriteEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void SetupParticle(CSpriteParticle* particle); diff --git a/Source/Contents/Effects/SpriteParticle.cpp b/Source/Contents/Effects/SpriteParticle.cpp index 1aea861e7..ed820a4cb 100644 --- a/Source/Contents/Effects/SpriteParticle.cpp +++ b/Source/Contents/Effects/SpriteParticle.cpp @@ -234,7 +234,7 @@ void CSpriteParticle::Draw(char mode) { float offsetX = this->unknown_02C0; float offsetY = this->unknown_02C4; CGameActor* actor = static_cast(renderObject); - if (actor->Slot55() <= 0) { + if (actor->GetMonsterTransformJob() <= 0) { if (this->unknown_02BC != 0) { float extent[2]; float* p = actor->GetExtent(extent); diff --git a/Source/Contents/Effects/SquareRangeEffect.cpp b/Source/Contents/Effects/SquareRangeEffect.cpp index 164cb532b..6084d7a1a 100644 --- a/Source/Contents/Effects/SquareRangeEffect.cpp +++ b/Source/Contents/Effects/SquareRangeEffect.cpp @@ -23,7 +23,7 @@ void CSquareRangeEffect::Close() { // OFFSET: 0x00B4C790 // FUNCTION: fn_18963 -void CSquareRangeEffect::Slot01() { +void CSquareRangeEffect::Open() { if (this->id == 991) { this->size = 7.0f; } @@ -48,7 +48,7 @@ void CSquareRangeEffect::Slot01() { // OFFSET: 0x00B4C8C0 // FUNCTION: fn_18964 -bool CSquareRangeEffect::Slot06() { +bool CSquareRangeEffect::IsAlive() { if (this->id == 991) { return !this->IsFinished(); } @@ -58,7 +58,7 @@ bool CSquareRangeEffect::Slot06() { // OFFSET: 0x00B4C8E0 // FUNCTION: fn_18965 -void CSquareRangeEffect::Slot03() { +void CSquareRangeEffect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -87,7 +87,7 @@ void CSquareRangeEffect::Slot03() { // OFFSET: 0x00B4CB40 // FUNCTION: fn_18966 -void CSquareRangeEffect::Slot04() { +void CSquareRangeEffect::Render() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/SquareRangeEffect.h b/Source/Contents/Effects/SquareRangeEffect.h index b3d09abca..89db16139 100644 --- a/Source/Contents/Effects/SquareRangeEffect.h +++ b/Source/Contents/Effects/SquareRangeEffect.h @@ -11,11 +11,11 @@ class CParticle; class CSquareRangeEffect : public CEffect { public: CSquareRangeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ float size; /* 00D0 */ unsigned char resize; diff --git a/Source/Contents/Effects/StarEffect.cpp b/Source/Contents/Effects/StarEffect.cpp index e9ee35f08..d3498db1f 100644 --- a/Source/Contents/Effects/StarEffect.cpp +++ b/Source/Contents/Effects/StarEffect.cpp @@ -39,7 +39,7 @@ void CStarEffect::Close() { // OFFSET: 0x00B79F10 // FUNCTION: fn_19204 -void CStarEffect::Slot01() { +void CStarEffect::Open() { for (int ring = 0; ring < 65; ++ring) { for (int index = 0; index < 4; ++index) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); @@ -91,13 +91,13 @@ void CStarEffect::SetupParticle(CParticle* particle) { // OFFSET: 0x00B7A160 // FUNCTION: fn_19206 -bool CStarEffect::Slot06() { +bool CStarEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B7A170 // FUNCTION: fn_19207 -void CStarEffect::Slot03() { +void CStarEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -187,7 +187,7 @@ void CStarEffect::UpdateParticle(CParticle* particle) { // OFFSET: 0x00B7A540 // FUNCTION: fn_19209 -void CStarEffect::Slot04() { +void CStarEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/StarEffect.h b/Source/Contents/Effects/StarEffect.h index 853f44321..2934ffa67 100644 --- a/Source/Contents/Effects/StarEffect.h +++ b/Source/Contents/Effects/StarEffect.h @@ -10,11 +10,11 @@ class CParticle; class CStarEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void SetupParticle(CParticle* particle); void UpdateParticle(CParticle* particle); diff --git a/Source/Contents/Effects/StarEmperorEffect.cpp b/Source/Contents/Effects/StarEmperorEffect.cpp index 7308ee5a9..dca9b0eac 100644 --- a/Source/Contents/Effects/StarEmperorEffect.cpp +++ b/Source/Contents/Effects/StarEmperorEffect.cpp @@ -81,7 +81,7 @@ void CStarEmperorEffect::Close() { // OFFSET: 0x0072C490 // FUNCTION: fn_07478 -void CStarEmperorEffect::Slot01() { +void CStarEmperorEffect::Open() { this->unknown_002C = this->id != 1203 ? 30 : 60; this->BuildSphere(); @@ -99,7 +99,7 @@ void CStarEmperorEffect::Slot01() { // OFFSET: 0x0072C540 // FUNCTION: fn_07479 -void CStarEmperorEffect::Slot12() { +void CStarEmperorEffect::InitEvents() { if (this->id == 1203) { this->AddEvent(0, "effect\\wizard_fire_pillar_a.wav", 1, 0); this->AddEvent(0, "effect\\wizard_fire_pillar_b.wav", 31, 0); @@ -108,7 +108,7 @@ void CStarEmperorEffect::Slot12() { // OFFSET: 0x0072C580 // FUNCTION: fn_07480 -bool CStarEmperorEffect::Slot06() { +bool CStarEmperorEffect::IsAlive() { return !this->IsFinished(); } @@ -181,7 +181,7 @@ void CStarEmperorEffect::UpdateRing(CParticle* particle) { // OFFSET: 0x0072C830 // FUNCTION: fn_07482 -void CStarEmperorEffect::Slot03() { +void CStarEmperorEffect::OnProcess() { for (std::vector::iterator it = this->sphere.begin(); it != this->sphere.end(); ++it) { if (CParticle* particle = *it) { const int frame = particle->unknown_00E8; @@ -233,7 +233,7 @@ void CStarEmperorEffect::Slot03() { // OFFSET: 0x0072CCA0 // FUNCTION: fn_07483 -void CStarEmperorEffect::Slot04() { +void CStarEmperorEffect::Render() { for (auto it = this->sphere.begin(); it != this->sphere.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/StarEmperorEffect.h b/Source/Contents/Effects/StarEmperorEffect.h index 6e4377ba7..b7f182db5 100644 --- a/Source/Contents/Effects/StarEmperorEffect.h +++ b/Source/Contents/Effects/StarEmperorEffect.h @@ -12,12 +12,12 @@ class CStarEmperorEffect : public CEffect { public: CStarEmperorEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; + bool IsAlive() override; + void InitEvents() override; void BuildSphere(); void UpdateRing(CParticle* particle); diff --git a/Source/Contents/Effects/StealEffect.cpp b/Source/Contents/Effects/StealEffect.cpp index 1f9c303da..855c0bf49 100644 --- a/Source/Contents/Effects/StealEffect.cpp +++ b/Source/Contents/Effects/StealEffect.cpp @@ -91,19 +91,19 @@ void CSteal::Close() { // OFFSET: 0x00B4D270 // FUNCTION: fn_18972 -void CSteal::Slot01() { +void CSteal::Open() { this->SpawnParticles(); } // OFFSET: 0x00B4D280 // FUNCTION: fn_18973 -bool CSteal::Slot06() { +bool CSteal::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B4D290 // FUNCTION: fn_18974 -void CSteal::Slot03() { +void CSteal::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CSpriteParticle* particle = *it; const vector3d origin = *reinterpret_cast(this->position); @@ -147,7 +147,7 @@ void CSteal::Slot03() { // OFFSET: 0x00B4D720 // FUNCTION: fn_18975 -void CSteal::Slot04() { +void CSteal::Render() { for (std::list::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { (*it)->Draw(1); } diff --git a/Source/Contents/Effects/StealEffect.h b/Source/Contents/Effects/StealEffect.h index 251623f77..5cb536f9a 100644 --- a/Source/Contents/Effects/StealEffect.h +++ b/Source/Contents/Effects/StealEffect.h @@ -12,11 +12,11 @@ class CSpriteParticle; class CSteal : public CEffect { public: ~CSteal() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void SpawnParticles(); diff --git a/Source/Contents/Effects/StormCannonEffect.cpp b/Source/Contents/Effects/StormCannonEffect.cpp index da8e8bc9f..35c003413 100644 --- a/Source/Contents/Effects/StormCannonEffect.cpp +++ b/Source/Contents/Effects/StormCannonEffect.cpp @@ -25,7 +25,7 @@ void CStormCannonEffect::Close() { // OFFSET: 0x0072CFA0 // FUNCTION: fn_07487 -void CStormCannonEffect::Slot01() { +void CStormCannonEffect::Open() { CEZ2STRParticle* bottom = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 13)); if (bottom) { bottom->Load(std::string("stormcannon\\stormcannon_bottom\\stormcannon_bottom.str")); @@ -65,13 +65,13 @@ void CStormCannonEffect::Slot01() { // OFFSET: 0x0072D350 // FUNCTION: fn_07488 -bool CStormCannonEffect::Slot06() { +bool CStormCannonEffect::IsAlive() { return this->Alpha() > 0; } // OFFSET: 0x0072D360 // FUNCTION: fn_07489 -void CStormCannonEffect::Slot03() { +void CStormCannonEffect::OnProcess() { const float speed = static_cast(this->speed); this->position[1] = speed * this->direction.y + this->position[1]; this->position[0] = speed * this->direction.x + this->position[0]; @@ -102,7 +102,7 @@ void CStormCannonEffect::Slot03() { // OFFSET: 0x0072D540 // FUNCTION: fn_07490 -void CStormCannonEffect::Slot04() { +void CStormCannonEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { (*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/StormCannonEffect.h b/Source/Contents/Effects/StormCannonEffect.h index 8b8d96fa3..f9edcba89 100644 --- a/Source/Contents/Effects/StormCannonEffect.h +++ b/Source/Contents/Effects/StormCannonEffect.h @@ -12,11 +12,11 @@ class CEZ2STRParticle; class CStormCannonEffect : public CEffect { public: CStormCannonEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; // INLINED int& Alpha() { diff --git a/Source/Contents/Effects/StormGustEffect.cpp b/Source/Contents/Effects/StormGustEffect.cpp index 5d6f88b72..5dcc34bea 100644 --- a/Source/Contents/Effects/StormGustEffect.cpp +++ b/Source/Contents/Effects/StormGustEffect.cpp @@ -21,7 +21,7 @@ void CStormGustEffect::Close() { // OFFSET: 0x00B7AA60 // FUNCTION: fn_19212 -void CStormGustEffect::Slot01() { +void CStormGustEffect::Open() { if (g_serviceOptions.Get(229)) { return; } @@ -61,13 +61,13 @@ void CStormGustEffect::Slot01() { // OFFSET: 0x00B7ADA0 // FUNCTION: fn_19213 -bool CStormGustEffect::Slot06() { +bool CStormGustEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00B7ADB0 // FUNCTION: fn_19214 -void CStormGustEffect::Slot03() { +void CStormGustEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -117,7 +117,7 @@ void CStormGustEffect::Slot03() { // OFFSET: 0x00B7B240 // FUNCTION: fn_19215 -void CStormGustEffect::Slot04() { +void CStormGustEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/StormGustEffect.h b/Source/Contents/Effects/StormGustEffect.h index bfdb50919..1624f2842 100644 --- a/Source/Contents/Effects/StormGustEffect.h +++ b/Source/Contents/Effects/StormGustEffect.h @@ -10,11 +10,11 @@ class CParticle; class CStormGustEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::vector particles; }; diff --git a/Source/Contents/Effects/StormKickEffect.cpp b/Source/Contents/Effects/StormKickEffect.cpp index 67af6f085..e27cdccf2 100644 --- a/Source/Contents/Effects/StormKickEffect.cpp +++ b/Source/Contents/Effects/StormKickEffect.cpp @@ -183,7 +183,7 @@ void CStormKickEffect::Close() { // OFFSET: 0x00B7BC90 // FUNCTION: fn_19222 -void CStormKickEffect::Slot01() { +void CStormKickEffect::Open() { g_modeMgr.GetGameMode(); switch (this->id) { @@ -227,7 +227,7 @@ void CStormKickEffect::Slot01() { // OFFSET: 0x00B7BDD0 // FUNCTION: fn_19223 -void CStormKickEffect::Slot12() { +void CStormKickEffect::InitEvents() { switch (this->id) { case 435: this->AddEvent(0, "effect\\T_회오리차기.wav", 5, 0); @@ -243,13 +243,13 @@ void CStormKickEffect::Slot12() { // OFFSET: 0x00B7BF60 // FUNCTION: fn_19224 -bool CStormKickEffect::Slot06() { +bool CStormKickEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B7BF70 // FUNCTION: fn_19225 -void CStormKickEffect::Slot03() { +void CStormKickEffect::OnProcess() { for (auto it = this->storms.begin(); it != this->storms.end(); ++it) { CParticle* particle = *it; particle->position.x = this->position[0]; @@ -376,7 +376,7 @@ void CStormKickEffect::Slot03() { // OFFSET: 0x00B7C7D0 // FUNCTION: fn_19226 -void CStormKickEffect::Slot04() { +void CStormKickEffect::Render() { for (auto it = this->storms.begin(); it != this->storms.end(); ++it) { CParticle* particle = *it; const int alpha = particle->alpha; diff --git a/Source/Contents/Effects/StormKickEffect.h b/Source/Contents/Effects/StormKickEffect.h index fec755b63..e63ec5d27 100644 --- a/Source/Contents/Effects/StormKickEffect.h +++ b/Source/Contents/Effects/StormKickEffect.h @@ -13,12 +13,12 @@ class CStormKickEffect : public CEffect { public: CStormKickEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; + bool IsAlive() override; + void InitEvents() override; void CreateStorms(int layer); void CreateClouds(int layer); void UpdateStorm(CParticle* particle); diff --git a/Source/Contents/Effects/SunStanceEffect.cpp b/Source/Contents/Effects/SunStanceEffect.cpp index 304027ae6..7745371c9 100644 --- a/Source/Contents/Effects/SunStanceEffect.cpp +++ b/Source/Contents/Effects/SunStanceEffect.cpp @@ -30,7 +30,7 @@ void CSunStanceEffect::Close() { // OFFSET: 0x0072D980 // FUNCTION: fn_07495 -void CSunStanceEffect::Slot01() { +void CSunStanceEffect::Open() { for (int index = 0; index < 3; ++index) { CParticle* particle = CreateParticle(reinterpret_cast(this->position), 5); if (!particle) { @@ -75,13 +75,13 @@ void CSunStanceEffect::Slot01() { // OFFSET: 0x0072DB00 // FUNCTION: fn_07496 -bool CSunStanceEffect::Slot06() { +bool CSunStanceEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0072DB10 // FUNCTION: fn_07497 -void CSunStanceEffect::Slot03() { +void CSunStanceEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle) { @@ -108,7 +108,7 @@ void CSunStanceEffect::Slot03() { // OFFSET: 0x0072DDD0 // FUNCTION: fn_07498 -void CSunStanceEffect::Slot04() { +void CSunStanceEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(false, 0.0f, 1.0f, 0.0f, 1.0f, false, true); diff --git a/Source/Contents/Effects/SunStanceEffect.h b/Source/Contents/Effects/SunStanceEffect.h index a69aa1667..0abc16cb0 100644 --- a/Source/Contents/Effects/SunStanceEffect.h +++ b/Source/Contents/Effects/SunStanceEffect.h @@ -12,11 +12,11 @@ class CSunStanceEffect : public CEffect { public: CSunStanceEffect(); ~CSunStanceEffect() override; - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; /* 00CC */ std::list particles; }; diff --git a/Source/Contents/Effects/TalismanMarkEffect.cpp b/Source/Contents/Effects/TalismanMarkEffect.cpp index 493502516..e216479d4 100644 --- a/Source/Contents/Effects/TalismanMarkEffect.cpp +++ b/Source/Contents/Effects/TalismanMarkEffect.cpp @@ -88,7 +88,7 @@ void CTalismanMarkEffect::PlayEnd() { // OFFSET: 0x0072E0F0 // FUNCTION: fn_07503 -void CTalismanMarkEffect::Slot01() { +void CTalismanMarkEffect::Open() { this->retained = 1; for (int i = 0; i < std::min(this->unknown_00B0, 4); ++i) { @@ -112,7 +112,7 @@ void CTalismanMarkEffect::Slot01() { // OFFSET: 0x0072E240 // FUNCTION: fn_07505 -void CTalismanMarkEffect::Slot03() { +void CTalismanMarkEffect::OnProcess() { for (auto it = this->particles.begin(); it != this->particles.end();) { CEZ2STRParticle* particle = *it; if (!particle) { @@ -170,7 +170,7 @@ void CTalismanMarkEffect::Slot03() { // OFFSET: 0x0072E210 // FUNCTION: fn_07504 -bool CTalismanMarkEffect::Slot06() { +bool CTalismanMarkEffect::IsAlive() { if (this->ActorExists() == true && !this->particles.empty()) { return true; } @@ -215,7 +215,7 @@ void CTalismanMarkEffect::UpdateParticle(CEZ2STRParticle* particle) { // OFFSET: 0x0072E5F0 // FUNCTION: fn_07507 -void CTalismanMarkEffect::Slot04() { +void CTalismanMarkEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CEZ2STRParticle* particle = *it; if (particle) { diff --git a/Source/Contents/Effects/TalismanMarkEffect.h b/Source/Contents/Effects/TalismanMarkEffect.h index 247f46fad..3bf3a0f74 100644 --- a/Source/Contents/Effects/TalismanMarkEffect.h +++ b/Source/Contents/Effects/TalismanMarkEffect.h @@ -13,11 +13,11 @@ public: /* 00CC */ std::vector particles; CTalismanMarkEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void PlayEnd(); __declspec(noinline) void UpdateParticle(CEZ2STRParticle* particle); diff --git a/Source/Contents/Effects/TetraBallEffect.cpp b/Source/Contents/Effects/TetraBallEffect.cpp index 086b26ab3..9e4ae221e 100644 --- a/Source/Contents/Effects/TetraBallEffect.cpp +++ b/Source/Contents/Effects/TetraBallEffect.cpp @@ -76,20 +76,20 @@ unsigned char CTetraBallEffect::ActiveCount() { // OFFSET: 0x0072EAE0 // FUNCTION: fn_07515 -void CTetraBallEffect::Slot01() { +void CTetraBallEffect::Open() { this->retained = 1; this->AddBall(this->id, 0); } // OFFSET: 0x0072EB00 // FUNCTION: fn_07516 -bool CTetraBallEffect::Slot06() { +bool CTetraBallEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x0072EB10 // FUNCTION: fn_07517 -void CTetraBallEffect::Slot03() { +void CTetraBallEffect::OnProcess() { for (int index = 0; index < 5; ++index) { CEZ2STRParticle* ball = this->balls[index]; if (ball) { @@ -104,7 +104,7 @@ void CTetraBallEffect::Slot03() { // OFFSET: 0x0072EBD0 // FUNCTION: fn_07518 -void CTetraBallEffect::Slot04() { +void CTetraBallEffect::Render() { for (int index = 0; index < 5; ++index) { if (this->balls[index]) { this->balls[index]->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/TetraBallEffect.h b/Source/Contents/Effects/TetraBallEffect.h index 0f6fda42e..e5668397d 100644 --- a/Source/Contents/Effects/TetraBallEffect.h +++ b/Source/Contents/Effects/TetraBallEffect.h @@ -11,11 +11,11 @@ class CTetraBallEffect : public CEffect { public: CTetraBallEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddBall(int id, int index); void RemoveBall(int index); diff --git a/Source/Contents/Effects/ThrowEffects.cpp b/Source/Contents/Effects/ThrowEffects.cpp index d7a27f173..ec244009d 100644 --- a/Source/Contents/Effects/ThrowEffects.cpp +++ b/Source/Contents/Effects/ThrowEffects.cpp @@ -31,7 +31,7 @@ void CThrowItemEffect::Close() { // OFFSET: 0x00B7CD30 // FUNCTION: fn_19230 -void CThrowItemEffect::Slot01() { +void CThrowItemEffect::Open() { switch (this->id) { case 981: this->unknown_00D4 = 8; @@ -272,7 +272,7 @@ void CThrowItemEffect::InitSpinParticle(CParticle* particle) { // OFFSET: 0x00B7D8B0 // FUNCTION: fn_19234 -void CThrowItemEffect::Slot12() { +void CThrowItemEffect::InitEvents() { switch (this->id) { case 613: case 614: @@ -291,13 +291,13 @@ void CThrowItemEffect::Slot12() { // OFFSET: 0x00B7DE60 // FUNCTION: fn_19235 -bool CThrowItemEffect::Slot06() { +bool CThrowItemEffect::IsAlive() { return !this->IsFinished(); } // OFFSET: 0x00B7DE70 // FUNCTION: fn_19236 -void CThrowItemEffect::Slot03() { +void CThrowItemEffect::OnProcess() { for (auto particle = this->particles.begin(); particle != this->particles.end(); ++particle) { CParticle* target = *particle; @@ -382,7 +382,7 @@ void CThrowItemEffect::Slot03() { // OFFSET: 0x00B7E660 // FUNCTION: fn_19237 -void CThrowItemEffect::Slot04() { +void CThrowItemEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { if (*it) { (*it)->Render(true, 0.0f, 1.0f, 0.0f, 1.0f, false, true); @@ -523,7 +523,7 @@ void CVolcanoEffect::Close() { // OFFSET: 0x00B7EEC0 // FUNCTION: fn_19242 -void CVolcanoEffect::Slot01() { +void CVolcanoEffect::Open() { switch (this->id) { case 223: case 225: @@ -545,7 +545,7 @@ void CVolcanoEffect::Slot01() { // OFFSET: 0x00B7F190 // FUNCTION: fn_19243 -bool CVolcanoEffect::Slot06() { +bool CVolcanoEffect::IsAlive() { for (auto particle = this->particles.begin(); particle != this->particles.end(); ++particle) { if ((*particle)->alpha > 0) { return true; @@ -557,7 +557,7 @@ bool CVolcanoEffect::Slot06() { // OFFSET: 0x00B7F1C0 // FUNCTION: fn_19244 -void CVolcanoEffect::Slot03() { +void CVolcanoEffect::OnProcess() { int fadeIn; int fadeOut; @@ -661,7 +661,7 @@ void CVolcanoEffect::Slot03() { // OFFSET: 0x00B7F7B0 // FUNCTION: fn_19245 -void CVolcanoEffect::Slot04() { +void CVolcanoEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle || particle->unknown_000C <= 0) { diff --git a/Source/Contents/Effects/ThrowEffects.h b/Source/Contents/Effects/ThrowEffects.h index 2d2adc97a..0426b01b4 100644 --- a/Source/Contents/Effects/ThrowEffects.h +++ b/Source/Contents/Effects/ThrowEffects.h @@ -12,12 +12,12 @@ class CParticle; class CThrowItemEffect : public CEffect { public: CThrowItemEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot12() override; + bool IsAlive() override; + void InitEvents() override; void InitFlameParticle(CParticle* particle); void InitPotionParticle(CParticle* particle, int kind); void InitSpinParticle(CParticle* particle); @@ -43,11 +43,11 @@ static_assert(offsetof(CThrowItemEffect, particles) == 0xF8); class CVolcanoEffect : public CEffect { public: - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void AddRings(); /* 00CC */ vector3d lastInner; diff --git a/Source/Contents/Effects/TriangleShotArrow.cpp b/Source/Contents/Effects/TriangleShotArrow.cpp index b84e7c809..403cd9332 100644 --- a/Source/Contents/Effects/TriangleShotArrow.cpp +++ b/Source/Contents/Effects/TriangleShotArrow.cpp @@ -26,7 +26,7 @@ void CTriangleShotArrow::Close() { // OFFSET: 0x0072EE90 // FUNCTION: fn_07524 -void CTriangleShotArrow::Slot01() { +void CTriangleShotArrow::Open() { this->current.x = this->position[0]; this->current.y = this->position[1]; this->current.z = this->position[2]; @@ -88,7 +88,7 @@ void CTriangleShotArrow::Slot01() { // OFFSET: 0x0072F2B0 // FUNCTION: fn_07525 -bool CTriangleShotArrow::Slot06() { +bool CTriangleShotArrow::IsAlive() { if (static_cast(this->step) > 8.0f / this->speed) { return false; } @@ -98,7 +98,7 @@ bool CTriangleShotArrow::Slot06() { // OFFSET: 0x0072F2E0 // FUNCTION: fn_07526 -void CTriangleShotArrow::Slot03() { +void CTriangleShotArrow::OnProcess() { if (this->delay > 0) { this->delay -= 16; return; @@ -124,7 +124,7 @@ void CTriangleShotArrow::Slot03() { // OFFSET: 0x0072F470 // FUNCTION: fn_07527 -void CTriangleShotArrow::Slot04() { +void CTriangleShotArrow::Render() { if (this->arrow) { this->arrow->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); } @@ -132,6 +132,6 @@ void CTriangleShotArrow::Slot04() { // OFFSET: 0x0072F4D0 // FUNCTION: fn_07528 -void CTriangleShotArrow::Slot16(int delay) { +void CTriangleShotArrow::SetDelay(int delay) { this->delay = delay; } diff --git a/Source/Contents/Effects/TriangleShotArrow.h b/Source/Contents/Effects/TriangleShotArrow.h index f3f3a6e52..9459846ce 100644 --- a/Source/Contents/Effects/TriangleShotArrow.h +++ b/Source/Contents/Effects/TriangleShotArrow.h @@ -12,12 +12,12 @@ class CTriangleShotArrow : public CEffect { public: CTriangleShotArrow(); - void Slot01() override; - void Slot03() override; + void Open() override; + void OnProcess() override; void Close() override; - void Slot04() override; - bool Slot06() override; - void Slot16(int delay) override; + void Render() override; + bool IsAlive() override; + void SetDelay(int delay) override; /* 00CC */ CEZ2STRParticle* arrow; /* 00D0 */ int step; diff --git a/Source/Contents/Effects/ViolentQuakeEffect.cpp b/Source/Contents/Effects/ViolentQuakeEffect.cpp index 44f29b20f..057045e3a 100644 --- a/Source/Contents/Effects/ViolentQuakeEffect.cpp +++ b/Source/Contents/Effects/ViolentQuakeEffect.cpp @@ -56,7 +56,7 @@ void CViolentQuakeEffect::Close() { // OFFSET: 0x0072FBE0 // FUNCTION: fn_07533 -void CViolentQuakeEffect::Slot01() { +void CViolentQuakeEffect::Open() { switch (this->id) { case 1760: { CEZ2STRParticle* emitter = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); @@ -76,7 +76,7 @@ void CViolentQuakeEffect::Slot01() { // OFFSET: 0x0072FD00 // FUNCTION: fn_07534 -bool CViolentQuakeEffect::Slot06() { +bool CViolentQuakeEffect::IsAlive() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { CEZ2STRParticle* emitter = *it; if (emitter->life == 0.0f || (emitter->life * 60.0f > static_cast(emitter->unknown_00E8)) == true) { @@ -89,7 +89,7 @@ bool CViolentQuakeEffect::Slot06() { // OFFSET: 0x0072FD60 // FUNCTION: fn_07535 -void CViolentQuakeEffect::Slot03() { +void CViolentQuakeEffect::OnProcess() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { CEZ2STRParticle* emitter = *it; if (!emitter) { @@ -113,7 +113,7 @@ void CViolentQuakeEffect::Slot03() { // OFFSET: 0x00730190 // FUNCTION: fn_07536 -void CViolentQuakeEffect::Slot04() { +void CViolentQuakeEffect::Render() { for (auto it = this->emitters.begin(); it != this->emitters.end(); ++it) { if (*it) { (*it)->DrawScreen(static_cast(g_modeMgr.GetGameMode())->camera->frame.view); diff --git a/Source/Contents/Effects/ViolentQuakeEffect.h b/Source/Contents/Effects/ViolentQuakeEffect.h index c727b7189..4c74ed44d 100644 --- a/Source/Contents/Effects/ViolentQuakeEffect.h +++ b/Source/Contents/Effects/ViolentQuakeEffect.h @@ -12,11 +12,11 @@ class CViolentQuakeEffect : public CEffect { public: CViolentQuakeEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; + bool IsAlive() override; void InitAllBloom(); diff --git a/Source/Contents/Effects/WindEffect.cpp b/Source/Contents/Effects/WindEffect.cpp index 6d8854209..899805978 100644 --- a/Source/Contents/Effects/WindEffect.cpp +++ b/Source/Contents/Effects/WindEffect.cpp @@ -72,26 +72,26 @@ void CWindEffect::Close() { // OFFSET: 0x00730850 // FUNCTION: fn_07541 -void CWindEffect::Slot01() { +void CWindEffect::Open() { this->Init(); } // OFFSET: 0x00730860 // FUNCTION: fn_07542 -void CWindEffect::Slot07() { +void CWindEffect::ResetParticles() { this->Close(); this->Init(); } // OFFSET: 0x00730870 // FUNCTION: fn_07543 -bool CWindEffect::Slot06() { +bool CWindEffect::IsAlive() { return this->ActorExists(); } // OFFSET: 0x00730880 // FUNCTION: fn_07544 -void CWindEffect::Slot03() { +void CWindEffect::OnProcess() { for (std::vector::iterator it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (particle == nullptr) { @@ -168,7 +168,7 @@ void CWindEffect::Slot03() { // OFFSET: 0x00731030 // FUNCTION: fn_07545 -void CWindEffect::Slot04() { +void CWindEffect::Render() { for (auto it = this->particles.begin(); it != this->particles.end(); ++it) { CParticle* particle = *it; if (!particle) { diff --git a/Source/Contents/Effects/WindEffect.h b/Source/Contents/Effects/WindEffect.h index 0646f6006..b56e5fa55 100644 --- a/Source/Contents/Effects/WindEffect.h +++ b/Source/Contents/Effects/WindEffect.h @@ -14,12 +14,12 @@ class CWindEffect : public CEffect { public: CWindEffect(); - void Slot01() override; - void Slot03() override; - void Slot04() override; + void Open() override; + void OnProcess() override; + void Render() override; void Close() override; - bool Slot06() override; - void Slot07() override; + bool IsAlive() override; + void ResetParticles() override; void Init(); diff --git a/Source/Contents/Ground/GroundGeometry.cpp b/Source/Contents/Ground/GroundGeometry.cpp index 17053552a..7d48813b0 100644 --- a/Source/Contents/Ground/GroundGeometry.cpp +++ b/Source/Contents/Ground/GroundGeometry.cpp @@ -356,12 +356,12 @@ void GroundBase::Build(CGndRes&, const float*, const float*, const float*) { // OFFSET: 0x00AC0990 // FUNCTION: fn_17566 -void GroundGeometry::Slot04(int) { +void GroundGeometry::RenderLod(int) { } // OFFSET: 0x00AC09A0 // FUNCTION: fn_17567 -void GroundBase::Slot04(int) { +void GroundBase::RenderLod(int) { } // OFFSET: 0x00AC1510 @@ -371,18 +371,18 @@ void GroundBase::UpdateWater() { // OFFSET: 0x00AC1520 // FUNCTION: fn_17583 -bool GroundGeometry::Slot10() { +bool GroundGeometry::IsNewVer() { return true; } // OFFSET: 0x00AC3080 // FUNCTION: fn_17598 -void GroundBase::Slot15(float, int, int) { +void GroundBase::SetGndRiseAmount(float, int, int) { } // OFFSET: 0x00AC1530 // FUNCTION: fn_17584 -bool GroundBase::Slot10() { +bool GroundBase::IsNewVer() { return false; } diff --git a/Source/Contents/Ground/GroundGeometry.h b/Source/Contents/Ground/GroundGeometry.h index 5eba48d93..9ea978ae7 100644 --- a/Source/Contents/Ground/GroundGeometry.h +++ b/Source/Contents/Ground/GroundGeometry.h @@ -38,18 +38,18 @@ public: virtual void Reset(int columns, int rows); virtual void Build(CGndRes& resource, const float* lightDirection, const float* diffuse, const float* ambient); virtual void ClearGeometry(); - virtual void Slot04(int first); + virtual void RenderLod(int first); virtual void Draw(const float* matrix, const int* rectangle, bool clip); virtual void DrawLit(const float* matrix, const int* rectangle, bool clip); virtual void CellBounds(int column, int row, float& minimum, float& maximum) const; virtual void HeightBounds(const int* rectangle, float& minimum, float& maximum) const; virtual void MarkRay(const float* ray, int column, int row, float limit); - virtual bool Slot10(); + virtual bool IsNewVer(); virtual void InitializeLighting(); virtual int Lighting(int column, int row, float& red, float& green, float& blue) const; virtual void ImportWater(const CGndRes& resource); virtual void DrawGrid(const float* matrix, int column, int row, std::uint32_t color) const; - virtual void Slot15(float alpha, int x, int y); + virtual void SetGndRiseAmount(float alpha, int x, int y); virtual void DrawCellDecal(const float* matrix, int column, int row, std::uint32_t color, CTexture& texture, const float* uv) const; virtual void DrawTerrainOverlay(const float* matrix, int column, int row, std::uint32_t color, CTexture* texture) const; virtual bool CellVertices(float* vertices, int column, int row) const; @@ -84,13 +84,13 @@ public: void Reset(int columns, int rows) override; void Build(CGndRes& resource, const float* lightDirection, const float* diffuse, const float* ambient) override; void ClearGeometry() override; - void Slot04(int first) override; + void RenderLod(int first) override; void Draw(const float* matrix, const int* rectangle, bool clip) override; void DrawLit(const float* matrix, const int* rectangle, bool clip) override; void CellBounds(int column, int row, float& minimum, float& maximum) const override; void HeightBounds(const int* rectangle, float& minimum, float& maximum) const override; void MarkRay(const float* ray, int column, int row, float limit) override; - bool Slot10() override; + bool IsNewVer() override; void InitializeLighting() override; int Lighting(int column, int row, float& red, float& green, float& blue) const override; void ImportWater(const CGndRes& resource) override; diff --git a/Source/Contents/Ground/GroundLightingInitialization.cpp b/Source/Contents/Ground/GroundLightingInitialization.cpp index e91653eec..09bdf9c35 100644 --- a/Source/Contents/Ground/GroundLightingInitialization.cpp +++ b/Source/Contents/Ground/GroundLightingInitialization.cpp @@ -4,7 +4,7 @@ // OFFSET: 0x00ABFB10 // FUNCTION: fn_17558 void GroundGeometry::InitializeLighting() { - if (!this->Slot10()) { + if (!this->IsNewVer()) { return; } diff --git a/Source/Contents/GuildInfo.cpp b/Source/Contents/GuildInfo.cpp index 1718aeb3b..e8bdda623 100644 --- a/Source/Contents/GuildInfo.cpp +++ b/Source/Contents/GuildInfo.cpp @@ -114,7 +114,7 @@ void GuildInfo::Init() { if (g_modeMgr.GetGameMode() && static_cast(g_modeMgr.GetGameMode())->scene && static_cast(g_modeMgr.GetGameMode())->scene->player) { - static_cast(g_modeMgr.GetGameMode())->scene->player->Slot48(0); + static_cast(g_modeMgr.GetGameMode())->scene->player->SetGdid(0); } this->unknown_00AC = 0; @@ -191,7 +191,7 @@ int GuildInfo::DeleteMemberByCharacterId(int characterId) { if (g_modeMgr.GetGameMode() && static_cast(g_modeMgr.GetGameMode())->scene) { CRenderObject* actor = static_cast(g_modeMgr.GetGameMode())->scene->GetActorByGID(it->characterId); if (actor != nullptr) { - static_cast(actor)->Slot48(0); + static_cast(actor)->SetGdid(0); } } this->m_members.erase(it); @@ -326,7 +326,7 @@ void GuildInfo::AddMember(const Member& member) { if (g_modeMgr.GetGameMode() && static_cast(g_modeMgr.GetGameMode())->scene) { CRenderObject* actor = static_cast(g_modeMgr.GetGameMode())->scene->GetActorByGID(member.characterId); if (actor != nullptr) { - static_cast(actor)->Slot48(this->m_guildId); + static_cast(actor)->SetGdid(this->m_guildId); } } } diff --git a/Source/Contents/Jobs/JobInheritance.cpp b/Source/Contents/Jobs/JobInheritance.cpp index c6d4643f6..5616d8e5e 100644 --- a/Source/Contents/Jobs/JobInheritance.cpp +++ b/Source/Contents/Jobs/JobInheritance.cpp @@ -2694,7 +2694,7 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame for (int delay = 600; delay < 1200; delay += 200) { CEffect* arrow = g_effectMgr->Spawn(target->render.accountId, effectId + 1, position.x, position.y, position.z, 0, -1, 0, 0); if (arrow) { - arrow->Slot16(delay); + arrow->SetDelay(delay); } } break; @@ -2751,11 +2751,11 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame const int delay = std::max(std::rand() % 10, 0) * 50; CEffect* spawned = g_effectMgr->Spawn(0, 0x661, spot.x, spot.y, spot.z, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(delay); + spawned->SetDelay(delay); } spawned = g_effectMgr->Spawn(0, 0x662, spot.x, spot.y, spot.z, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(delay); + spawned->SetDelay(delay); } } break; @@ -2893,26 +2893,26 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame if (g_serviceOptions.Get(0xE5)) { spawned = g_effectMgr->Spawn(source->render.accountId, effectId + 0x86, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x5DF, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x5E0, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } else { spawned = g_effectMgr->Spawn(source->render.accountId, effectId, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x559, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x55A, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } if (g_serviceOptions.Get(0xE5)) { g_effectMgr->Spawn(source->render.accountId, 0x5E1, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2955,7 +2955,7 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame const int duration = static_cast(source->render.speed * 100.0f + 100.0f); CEffect* spawned = g_effectMgr->Spawn(source->render.accountId, effectId + 0x6F, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } } } else { @@ -2964,7 +2964,7 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame const int duration = static_cast(source->render.speed * 100.0f + 100.0f); CEffect* spawned = g_effectMgr->Spawn(source->render.accountId, effectId, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } } } @@ -3034,11 +3034,11 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame const int duration = static_cast(source->render.speed * 100.0f + 150.0f); CEffect* spawned = g_effectMgr->Spawn(target->render.accountId, 0x572, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x573, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } break; } @@ -3048,24 +3048,24 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame if (g_serviceOptions.Get(0xE5)) { spawned = g_effectMgr->Spawn(target->render.accountId, 0x5B3, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x5B4, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } else { spawned = g_effectMgr->Spawn(target->render.accountId, 0x510, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn(target->render.accountId, 0x511, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } spawned = g_effectMgr->Spawn( 0, 0x52C, source->render.position.x, source->render.position.y, source->render.position.z, target->render.accountId, -1, 0, 0 ); if (spawned) { - spawned->Slot16(duration); + spawned->SetDelay(duration); } break; } @@ -3084,7 +3084,7 @@ void CSession::PlaySkillEffect(int skillId, int level, CGameActor* source, CGame g_effectMgr->Spawn(source->render.accountId, 0x6A8, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); CEffect* spawned = g_effectMgr->Spawn(target->render.accountId, 0x6A9, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (spawned) { - spawned->Slot17(static_cast(std::max(std::rand() % 36, 0)) * 10.0f); + spawned->SetAngle(static_cast(std::max(std::rand() % 36, 0)) * 10.0f); } source->LaunchEffect(0x308, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); break; diff --git a/Source/Contents/MapSkyMgr.cpp b/Source/Contents/MapSkyMgr.cpp index 21f7cb1d7..16b55adbf 100644 --- a/Source/Contents/MapSkyMgr.cpp +++ b/Source/Contents/MapSkyMgr.cpp @@ -390,7 +390,7 @@ void CMapSkyMgr::CreateClouds(const std::string& mapName) { cloud->spanX = spanX; cloud->spanZ = spanZ; cloud->flag = flag; - cloud->Slot07(); + cloud->ResetParticles(); } } } diff --git a/Source/Contents/Messenger/ClientMessenger.cpp b/Source/Contents/Messenger/ClientMessenger.cpp index 4ad6b2bd1..ebaae04a0 100644 --- a/Source/Contents/Messenger/ClientMessenger.cpp +++ b/Source/Contents/Messenger/ClientMessenger.cpp @@ -4681,9 +4681,9 @@ int GetCategoryJob(lua_State* state) { } struct EquipLocationSource { - virtual void Slot00(); - virtual void Slot01(); - virtual void Slot02(); + virtual void Destroy(); + virtual void Load(); + virtual void Clear(); virtual int GetLocation(); }; @@ -5483,7 +5483,7 @@ bool CGameMode::IsRegisterCell(int x, int y) { if (actor == nullptr) { return true; } - if (!StateFlag01(actor->Slot13())) { + if (!StateFlag01(actor->GetStateFlags())) { return true; } } diff --git a/Source/Contents/Messenger/MessengerMember.cpp b/Source/Contents/Messenger/MessengerMember.cpp index c8c5278ed..a1a85f7f4 100644 --- a/Source/Contents/Messenger/MessengerMember.cpp +++ b/Source/Contents/Messenger/MessengerMember.cpp @@ -86,9 +86,9 @@ class UIDragMiniPartyWnd : public UIFrameWnd { public: __declspec(noinline) UIDragMiniPartyWnd(MessengerMember member); ~UIDragMiniPartyWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot31(int argument1, int argument2) override; + void OnLBtnUp(int argument1, int argument2) override; void MoveGauge(int x, int y); void RemoveGauge(); void SetUnknown010C(int first, int second); @@ -107,8 +107,8 @@ class UIFriendOptionWnd : public UIFrameWnd { public: UIFriendOptionWnd(); ~UIFriendOptionWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -124,9 +124,9 @@ public: __declspec(noinline) UIJobIconButton(); ~UIJobIconButton() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; /* 0120 */ int unknown_0120; }; @@ -135,16 +135,16 @@ class UIMessengerGroupWnd : public UIFrameWnd { public: UIMessengerGroupWnd(); ~UIMessengerGroupWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) override; MessengerMember MemberAt(int x, int y); void OpenMiniPartyWnd(int cell, const MessengerMember& member); void DropMember(int x, int y, int index); @@ -316,7 +316,7 @@ UIDragMiniPartyWnd::~UIDragMiniPartyWnd() = default; // OFFSET: 0x00738640 // FUNCTION: fn_07669 -void UIDragMiniPartyWnd::Slot15(int, int) { +void UIDragMiniPartyWnd::OnCreate(int, int) { this->iconPositions.resize(2); this->iconPositions[0] = {5, 5, 34}; this->iconPositions[1] = {4, 1, 27}; @@ -429,7 +429,7 @@ __declspec(noinline) void UIDragMiniPartyWnd::MoveGauge(int x, int y) { // OFFSET: 0x00738CE0 // FUNCTION: fn_07671 -void UIDragMiniPartyWnd::Slot31(int argument1, int argument2) { +void UIDragMiniPartyWnd::OnLBtnUp(int argument1, int argument2) { auto* window = static_cast(g_windowMgr.LookupWindow(34)); if (window) { window->DropMember(argument1 + this->geometry.x, argument2 + this->geometry.y, this->unknown_0108); @@ -484,7 +484,7 @@ UIFriendOptionWnd::~UIFriendOptionWnd() = default; // OFFSET: 0x00738F30 // FUNCTION: fn_07681 -void UIFriendOptionWnd::Slot15(int, int) { +void UIFriendOptionWnd::OnCreate(int, int) { const char* label = LookupMessage(361); int width = std::min(this->TextWidth(label, 0, 0, 12, 0, 0) + 12, this->geometry.width - 15); @@ -567,7 +567,7 @@ int FriendOptionWndInfo::IsValid() const { // OFFSET: 0x007392F0 // FUNCTION: fn_07684 -void UIFriendOptionWnd::Slot11() { +void UIFriendOptionWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -624,25 +624,25 @@ void UIJobIconButton::Paint() { // OFFSET: 0x007395E0 // FUNCTION: fn_07688 -void UIJobIconButton::Slot25(int x, int y) { +void UIJobIconButton::OnLBtnDown(int x, int y) { if (UIWindow* window = g_windowMgr.LookupWindow(34)) { - window->Slot25(x + this->geometry.x, y + this->geometry.y); + window->OnLBtnDown(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x00739610 // FUNCTION: fn_07689 -void UIJobIconButton::Slot31(int x, int y) { +void UIJobIconButton::OnLBtnUp(int x, int y) { if (UIWindow* window = g_windowMgr.LookupWindow(34)) { - window->Slot31(x + this->geometry.x, y + this->geometry.y); + window->OnLBtnUp(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x00739640 // FUNCTION: fn_07690 -void UIJobIconButton::Slot33(int x, int y) { +void UIJobIconButton::OnRBtnUp(int x, int y) { if (UIWindow* window = g_windowMgr.LookupWindow(34)) { - window->Slot33(x + this->geometry.x, y + this->geometry.y); + window->OnRBtnUp(x + this->geometry.x, y + this->geometry.y); } } @@ -757,7 +757,7 @@ __declspec(noinline) MessengerMember UIMessengerGroupWnd::MemberAtIndex(int inde // OFFSET: 0x0073A630 // FUNCTION: fn_07706 -void UIMessengerGroupWnd::Slot15(int, int) { +void UIMessengerGroupWnd::OnCreate(int, int) { this->iconPositions.resize(2); this->iconPositions[0] = {5, 5, 34}; this->iconPositions[1] = {4, 1, 27}; @@ -1095,7 +1095,7 @@ void UIMessengerGroupWnd::Paint() { // OFFSET: 0x0073CD30 // FUNCTION: fn_07708 -void UIMessengerGroupWnd::Slot26(int, int) { +void UIMessengerGroupWnd::OnLBtnDblClk(int, int) { if (!g_session.m_lockMouse) { this->SendMsg(nullptr, 6, 232, 0, 0, 0); } @@ -1103,7 +1103,7 @@ void UIMessengerGroupWnd::Slot26(int, int) { // OFFSET: 0x0073D460 // FUNCTION: fn_07713 -void UIMessengerGroupWnd::Slot33(int x, int y) { +void UIMessengerGroupWnd::OnRBtnUp(int x, int y) { if (g_session.m_lockMouse) { return; } @@ -1121,9 +1121,9 @@ void UIMessengerGroupWnd::Slot33(int x, int y) { // OFFSET: 0x0073CD60 // FUNCTION: fn_07709 -void UIMessengerGroupWnd::Slot25(int x, int y) { +void UIMessengerGroupWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot33(x, y); + UIFrameWnd::OnRBtnUp(x, y); if (UIWindow* window = this->CompanionWindow()) { window->geometry.targetAlpha = 128; window->geometry.alphaStart = timeGetTime(); @@ -1183,8 +1183,8 @@ void UIMessengerGroupWnd::Slot25(int x, int y) { // OFFSET: 0x0073D080 // FUNCTION: fn_07710 -void UIMessengerGroupWnd::Slot31(int x, int y) { - UIFrameWnd::Slot31(x, y); +void UIMessengerGroupWnd::OnLBtnUp(int x, int y) { + UIFrameWnd::OnLBtnUp(x, y); if (UIWindow* window = this->CompanionWindow()) { window->geometry.targetAlpha = 255; window->geometry.alphaStart = timeGetTime(); @@ -1195,9 +1195,9 @@ void UIMessengerGroupWnd::Slot31(int x, int y) { // OFFSET: 0x0073D0E0 // FUNCTION: fn_07711 -void UIMessengerGroupWnd::Slot28(int x, int y) { +void UIMessengerGroupWnd::OnMouseHover(int x, int y) { if (y < 17) { - UIFrameWnd::Slot28(x, y); + UIFrameWnd::OnMouseHover(x, y); } if (this->mode == 0) { @@ -1242,8 +1242,8 @@ void UIMessengerGroupWnd::Slot28(int x, int y) { // OFFSET: 0x0073D3F0 // FUNCTION: fn_07712 -void UIMessengerGroupWnd::Slot27(int x, int y) { - UIFrameWnd::Slot27(x, y); +void UIMessengerGroupWnd::OnMouseMove(int x, int y) { + UIFrameWnd::OnMouseMove(x, y); if (UIWindow* window = this->CompanionWindow()) { x = 0; y = 0; @@ -1254,7 +1254,7 @@ void UIMessengerGroupWnd::Slot27(int x, int y) { // OFFSET: 0x0073D530 // FUNCTION: fn_07714 -void UIMessengerGroupWnd::Slot35(int delta) { +void UIMessengerGroupWnd::OnWheel(int delta) { if (this->scrollable) { int step = this->visibleRows - 1; if (step > 3) { @@ -1996,7 +1996,7 @@ void UIGage::SetColor(std::uint32_t color) { // OFFSET: 0x0073FD90 // FUNCTION: fn_07719 -void UIMessengerGroupWnd::Slot11() { +void UIMessengerGroupWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -2023,7 +2023,7 @@ MessengerMember UIMiniPartyWnd::GetMember() { // OFFSET: 0x00740250 // FUNCTION: fn_07729 -void UIMiniPartyInfoWnd::Slot15(int width, int) { +void UIMiniPartyInfoWnd::OnCreate(int width, int) { if (!this->m_gauge) { this->m_gauge = new UIPcGage(); this->m_gauge->SetSize(static_cast(static_cast(width) * 0.38f), 5); diff --git a/Source/Contents/Messenger/MessengerWindows.h b/Source/Contents/Messenger/MessengerWindows.h index b70ad74fb..e017af2a4 100644 --- a/Source/Contents/Messenger/MessengerWindows.h +++ b/Source/Contents/Messenger/MessengerWindows.h @@ -30,9 +30,9 @@ class UIDragMiniPartyWnd : public UIFrameWnd { public: UIDragMiniPartyWnd(MessengerMember member); ~UIDragMiniPartyWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot31(int argument1, int argument2) override; + void OnLBtnUp(int argument1, int argument2) override; void MoveGauge(int x, int y); void RemoveGauge(); void SetUnknown010C(int first, int second); @@ -51,8 +51,8 @@ class UIFriendOptionWnd : public UIFrameWnd { public: UIFriendOptionWnd(); ~UIFriendOptionWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -67,16 +67,16 @@ class UIMessengerGroupWnd : public UIFrameWnd { public: UIMessengerGroupWnd(); ~UIMessengerGroupWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) override; MessengerMember MemberAt(int x, int y); void OpenMiniPartyWnd(int cell, const MessengerMember& member); void DropMember(int x, int y, int index); diff --git a/Source/Contents/SignBoard/SignBoard.cpp b/Source/Contents/SignBoard/SignBoard.cpp index 879a17a7a..a3ba71efa 100644 --- a/Source/Contents/SignBoard/SignBoard.cpp +++ b/Source/Contents/SignBoard/SignBoard.cpp @@ -249,12 +249,12 @@ void CSignBoardWnd::ApplyColor() { // OFFSET: 0x00821B40 // FUNCTION: fn_10263 -void CBmpObjWnd::Slot15(int width, int height) { +void CBmpObjWnd::OnCreate(int width, int height) { } // OFFSET: 0x00821B50 // FUNCTION: fn_10264 -void CSignBoardWnd::Slot15(int width, int height) { +void CSignBoardWnd::OnCreate(int width, int height) { CBitmapRes* bitmap = static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\signboard\\bg_signboard.bmp"))); this->Resize(bitmap->image.width, bitmap->image.height); this->text = new (std::nothrow) UIStaticText(); diff --git a/Source/Contents/SignBoard/SignBoard.h b/Source/Contents/SignBoard/SignBoard.h index 51e5ccb40..ba1d82f59 100644 --- a/Source/Contents/SignBoard/SignBoard.h +++ b/Source/Contents/SignBoard/SignBoard.h @@ -14,7 +14,7 @@ class CBmpObjWnd : public UIWindow { public: CBmpObjWnd(); ~CBmpObjWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; /* 007C */ std::string path; @@ -24,7 +24,7 @@ class CSignBoardWnd : public UIWindow { public: CSignBoardWnd(); ~CSignBoardWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; void ApplyColor(); diff --git a/Source/Contents/Skills/SkillActionAlitea.cpp b/Source/Contents/Skills/SkillActionAlitea.cpp index fee10c8d8..4ea1cf2f9 100644 --- a/Source/Contents/Skills/SkillActionAlitea.cpp +++ b/Source/Contents/Skills/SkillActionAlitea.cpp @@ -60,8 +60,8 @@ private: class CSkillAction_AnimalForm : public CSkillAction { public: bool CanUse(CGameActor* actor); - virtual bool Slot17(CGameActor* actor) = 0; - virtual void Slot18(CGameActor* actor) = 0; + virtual bool IsInForm(CGameActor* actor) = 0; + virtual void PlayFormAttackEffect(CGameActor* actor) = 0; }; class CSkillAction_Direction { @@ -76,344 +76,344 @@ public: void SpawnAttack00Effect(int sourceActor, CGameActor* target); __declspec(noinline) void SpawnAttack01Effect(int level, CGameActor* source); __declspec(noinline) void SpawnAttack02Effect(int level, CGameActor* source); - void Slot16(int level, CGameActor* source, CGameActor* target) override; - bool Slot17(CGameActor* actor) override; - void Slot18(CGameActor* actor) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + bool IsInForm(CGameActor* actor) override; + void PlayFormAttackEffect(CGameActor* actor) override; }; class CSkillAction_DamageWereWolfForm : public CSkillAction_AnimalForm { public: - void Slot16(int level, CGameActor* source, CGameActor* target) override; - bool Slot17(CGameActor* actor) override; - void Slot18(CGameActor* actor) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + bool IsInForm(CGameActor* actor) override; + void PlayFormAttackEffect(CGameActor* actor) override; }; class CSkillAction_Earthing : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_Icing : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; void SpawnIcing(CGameActor* target); }; class CSkillAction_Thundering : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; - virtual void Slot17(CGameActor* source) = 0; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + virtual void PlayThunderEffect(CGameActor* source) = 0; }; class CSkillAction_ThunderingBasic : public CSkillAction_Thundering { public: - void Slot17(CGameActor* source) override; + void PlayThunderEffect(CGameActor* source) override; }; class CSkillAction_ThunderingExpand : public CSkillAction_Thundering { public: - void Slot17(CGameActor* source) override; + void PlayThunderEffect(CGameActor* source) override; }; class CEfstAction_BasicAction : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - virtual int Slot05(int efstId, int argument4) = 0; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + virtual int GetEffectId(int efstId, int argument4) = 0; }; class CEfstAction_AnimalForm : public CEfstAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; void ResetAnimalForm(CRenderObject* actor); void ApplyAnimalForm(CRenderObject* actor, int form); - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_AT_ALPHA_CLAW : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_PULSE_OF_MADNESS : public CSkillAction_DamageWereWolfForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_PULSE_OF_MADNESS : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_PRIMAL_CLAW : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_FERAL_CLAW : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_FRENZY_FANG : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_PINION_SHOT : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_QUILL_SPEAR : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_QUILL_SPEAR_S : public CSkillAction_DamageWereRaptorForm { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_NATURE_HARMONY : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_NATURE_HARMONY : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_GRAVITY_HOLE : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_CHILLING_BLAST : public CSkillAction_Icing { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_GLACIER_MONOLITH : public CSkillAction_Icing { public: - int Slot02() override; - int Slot14() override; + int GetSkillAttackMotion() override; + int GetSkillScopeType() override; }; class CSkillObjectAction_AT_GLACIER_MONOLITH : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; class CSkillAction_AT_GLACIER_NOVA : public CSkillAction_Icing { public: - int Slot02() override; - void Slot12(vector3d position, int argument2, int argument3) override; + int GetSkillAttackMotion() override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_AT_GLACIER_SHARD : public CSkillAction_Icing { public: - void Slot10(int level, CGameActor* source, int argument3, int argument4, int argument5) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnGroundSkillCast(int level, CGameActor* source, int argument3, int argument4, int argument5) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_GLACIER_STOMP : public CSkillAction_Icing { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_ROARING_CHARGE : public CSkillAction_ThunderingBasic { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_ROARING_CHARGE_S : public CSkillAction_ThunderingExpand { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_ROARING_PIERCER : public CSkillAction_ThunderingBasic { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_ROARING_PIERCEER_S : public CSkillAction_ThunderingExpand { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_FURIOS_STORM : public CSkillAction_Thundering { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot17(CGameActor* source) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void PlayThunderEffect(CGameActor* source) override; }; class CEfstAction_FURIOS_STORM : public CEfstAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_AT_ALPHA_PHASE : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_ALPHA_PHASE : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_APEX_PHASE : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_AT_APEX_PHASE : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_FLIP_FLAP : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_FLIP_FLAP : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_AERO_SYNC : public CSkillAction { public: - bool Slot00() override; - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_FLIP_FLAP_TARGET : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_SAVAGE_LUNGE : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_TEMPEST_FLAP : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_TERRA_HARVEST : public CSkillAction_Earthing { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AT_TERRA_WAVE : public CSkillAction_Earthing { public: - void Slot12(vector3d position, int argument2, int argument3) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_AT_SOLID_STOMP : public CSkillAction_Earthing { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_SOLID_STOMP : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_AT_ZEPHYR_LINK : public CSkillAction { public: - int Slot02() override; + int GetSkillAttackMotion() override; }; class CEfstAction_ZEPHYR_LINK : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_INSANE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_INSANE2 : public CEfstAction_INSANE { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; }; class CEfstAction_INSANE3 : public CEfstAction_INSANE { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; }; // OFFSET: 0x005A50B0 // FUNCTION: fn_03155 -void CSkillAction_DamageWereRaptorForm::Slot18(CGameActor* actor) { +void CSkillAction_DamageWereRaptorForm::PlayFormAttackEffect(CGameActor* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -427,7 +427,7 @@ void CSkillAction_DamageWereRaptorForm::Slot18(CGameActor* actor) { // OFFSET: 0x005A52B0 // FUNCTION: fn_03156 -void CSkillAction_DamageWereWolfForm::Slot18(CGameActor* actor) { +void CSkillAction_DamageWereWolfForm::PlayFormAttackEffect(CGameActor* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -448,14 +448,14 @@ void CSkillAction_Icing::SpawnIcing(CGameActor* target) { thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot22(0.9f); + effect->SetScale(0.9f); } } } // OFFSET: 0x005A56C0 // FUNCTION: fn_03158 -void CSkillAction_ThunderingBasic::Slot17(CGameActor* source) { +void CSkillAction_ThunderingBasic::PlayThunderEffect(CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -469,7 +469,7 @@ void CSkillAction_ThunderingBasic::Slot17(CGameActor* source) { // OFFSET: 0x005A58C0 // FUNCTION: fn_03159 -void CSkillAction_ThunderingExpand::Slot17(CGameActor* source) { +void CSkillAction_ThunderingExpand::PlayThunderEffect(CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -495,26 +495,26 @@ void CSkillAction_Direction::SpawnDirectionalEffect(CGameActor* source, CGameAct const bool flipped = direction == 1 || direction == 2; EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(name.data()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot26(flipped); - effect->Slot17(static_cast((static_cast(angle + (flipped ? -180.0f : 0.0f)) + 360) % 360)); + effect->SetFlipX(flipped); + effect->SetAngle(static_cast((static_cast(angle + (flipped ? -180.0f : 0.0f)) + 360) % 360)); } } // OFFSET: 0x005A5D20 // FUNCTION: fn_03161 -int CSkillAction_Earthing::Slot01() { +int CSkillAction_Earthing::GetSkillCastMotion() { return 60; } // OFFSET: 0x005A5D30 // FUNCTION: fn_03162 -int CSkillAction_Icing::Slot01() { +int CSkillAction_Icing::GetSkillCastMotion() { return 61; } // OFFSET: 0x005A5D40 // FUNCTION: fn_03163 -int CSkillAction_Thundering::Slot01() { +int CSkillAction_Thundering::GetSkillCastMotion() { return 61; } @@ -538,31 +538,31 @@ int CSkillAction_Direction::GetDirection(float angle) { // OFFSET: 0x005A5DE0 // FUNCTION: fn_03165 -int CSkillAction_Earthing::Slot02() { +int CSkillAction_Earthing::GetSkillAttackMotion() { return 62; } // OFFSET: 0x005A5DF0 // FUNCTION: fn_03166 -int CSkillAction_Icing::Slot02() { +int CSkillAction_Icing::GetSkillAttackMotion() { return 64; } // OFFSET: 0x005A5E00 // FUNCTION: fn_03167 -int CSkillAction_Thundering::Slot02() { +int CSkillAction_Thundering::GetSkillAttackMotion() { return 64; } // OFFSET: 0x005A5E10 // FUNCTION: fn_03168 -bool CSkillAction_DamageWereRaptorForm::Slot17(CGameActor* actor) { +bool CSkillAction_DamageWereRaptorForm::IsInForm(CGameActor* actor) { return actor->GetUnknown0404() == 2; } // OFFSET: 0x005A5E30 // FUNCTION: fn_03169 -bool CSkillAction_DamageWereWolfForm::Slot17(CGameActor* actor) { +bool CSkillAction_DamageWereWolfForm::IsInForm(CGameActor* actor) { return actor->GetUnknown0404() == 1; } @@ -574,19 +574,19 @@ bool CSkillAction_Direction::IsValidDirection(unsigned int direction) { // OFFSET: 0x005A5EA0 // FUNCTION: fn_03172 -void CSkillAction_DamageWereRaptorForm::Slot16(int level, CGameActor* source, CGameActor* target) { - this->Slot18(source); +void CSkillAction_DamageWereRaptorForm::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { + this->PlayFormAttackEffect(source); } // OFFSET: 0x005A5EB0 // FUNCTION: fn_03173 -void CSkillAction_DamageWereWolfForm::Slot16(int level, CGameActor* source, CGameActor* target) { - this->Slot18(source); +void CSkillAction_DamageWereWolfForm::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { + this->PlayFormAttackEffect(source); } // OFFSET: 0x005A5EC0 // FUNCTION: fn_03174 -void CSkillAction_Earthing::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_Earthing::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -598,21 +598,21 @@ void CSkillAction_Earthing::Slot16(int level, CGameActor* source, CGameActor* ta // OFFSET: 0x005A5F30 // FUNCTION: fn_03175 -void CSkillAction_Icing::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_Icing::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { this->SpawnIcing(source); } // OFFSET: 0x005A5F40 // FUNCTION: fn_03176 -void CSkillAction_Thundering::Slot16(int level, CGameActor* source, CGameActor* target) { - this->Slot17(source); +void CSkillAction_Thundering::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { + this->PlayThunderEffect(source); } // OFFSET: 0x005A5F50 // FUNCTION: fn_03177 -void CEfstAction_BasicAction::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_BasicAction::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { - const int id = this->Slot05(efstId, argument4); + const int id = this->GetEffectId(efstId, argument4); if (id >= 0) { g_effectMgr->Spawn(actor->render.accountId, id, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -621,7 +621,7 @@ void CEfstAction_BasicAction::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x005A5FB0 // FUNCTION: fn_03178 -void CSkillAction_Earthing::Slot08(int level, CGameActor* source) { +void CSkillAction_Earthing::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(57, level / 16); } @@ -629,23 +629,23 @@ void CSkillAction_Earthing::Slot08(int level, CGameActor* source) { // OFFSET: 0x005A5FE0 // FUNCTION: fn_03179 -void CSkillAction_Icing::Slot08(int level, CGameActor* source) { +void CSkillAction_Icing::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ice_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ice_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x005A6260 // FUNCTION: fn_03180 -void CSkillAction_Thundering::Slot08(int level, CGameActor* source) { +void CSkillAction_Thundering::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -653,22 +653,22 @@ void CSkillAction_Thundering::Slot08(int level, CGameActor* source) { thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x005A6470 // FUNCTION: fn_03181 -void CEfstAction_AnimalForm::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_AnimalForm::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { this->ResetAnimalForm(actor); } // OFFSET: 0x005A6480 // FUNCTION: fn_03182 -void CEfstAction_BasicAction::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_BasicAction::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { - const int id = this->Slot05(efstId, argument4); + const int id = this->GetEffectId(efstId, argument4); if (id >= 0) { g_effectMgr->Retire(actor->render.accountId, id); } @@ -677,15 +677,15 @@ void CEfstAction_BasicAction::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x005A64C0 // FUNCTION: fn_03183 -void CEfstAction_AnimalForm::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_AnimalForm::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x005A64E0 // FUNCTION: fn_03184 -void CEfstAction_BasicAction::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_BasicAction::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { - this->Slot00(efstId, value, argument3, argument4, actor, false); + this->OnEfstBegin(efstId, value, argument3, argument4, actor, false); } } @@ -701,14 +701,14 @@ void CEfstAction_AnimalForm::ResetAnimalForm(CRenderObject* actor) { g_session.SetUnknown8134(0); } gameActor->SetUnknown0404(0); - gameActor->Slot21(gameActor->GetUnknown0404Job()); + gameActor->SetSprJob(gameActor->GetUnknown0404Job()); EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\xC5', '\x62', '\x23', '\xB8', '\x59', '\x89', '\x2B'}; thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); - gameActor->Slot32(); + gameActor->SetBodyPaletteName(); } // OFFSET: 0x005A6740 @@ -721,19 +721,19 @@ void CEfstAction_AnimalForm::ApplyAnimalForm(CRenderObject* actor, int form) { } gameActor->SetUnknown0404(form); - gameActor->Slot21(gameActor->GetUnknown0404Job()); + gameActor->SetSprJob(gameActor->GetUnknown0404Job()); } } // OFFSET: 0x005A6790 // FUNCTION: fn_03187 -int CSkillAction_AT_ALPHA_CLAW::Slot02() { +int CSkillAction_AT_ALPHA_CLAW::GetSkillAttackMotion() { return 76; } // OFFSET: 0x005A67A0 // FUNCTION: fn_03188 -void CSkillAction_AT_ALPHA_CLAW::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ALPHA_CLAW::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source) || !target) { return; } @@ -747,19 +747,19 @@ void CSkillAction_AT_ALPHA_CLAW::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x005A69B0 // FUNCTION: fn_03189 -int CSkillAction_AT_PULSE_OF_MADNESS::Slot01() { +int CSkillAction_AT_PULSE_OF_MADNESS::GetSkillCastMotion() { return 66; } // OFFSET: 0x005A69C0 // FUNCTION: fn_03190 -int CSkillAction_AT_PULSE_OF_MADNESS::Slot02() { +int CSkillAction_AT_PULSE_OF_MADNESS::GetSkillAttackMotion() { return 68; } // OFFSET: 0x005A69D0 // FUNCTION: fn_03191 -void CSkillAction_AT_PULSE_OF_MADNESS::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_PULSE_OF_MADNESS::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(54, level / 16); } @@ -767,9 +767,9 @@ void CSkillAction_AT_PULSE_OF_MADNESS::Slot08(int level, CGameActor* source) { // OFFSET: 0x005A6A00 // FUNCTION: fn_03192 -void CSkillAction_AT_PULSE_OF_MADNESS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_PULSE_OF_MADNESS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && source->GetUnknown0404() != 0) { - this->Slot17(source); + this->IsInForm(source); } g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -781,25 +781,25 @@ void CSkillAction_AT_PULSE_OF_MADNESS::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x005A6C00 // FUNCTION: fn_03193 -EfstActionMessage CEfstAction_PULSE_OF_MADNESS::Slot03() { +EfstActionMessage CEfstAction_PULSE_OF_MADNESS::GetEfstBeginMessage() { return {LookupMessage(4668), 0xFFFF00}; } // OFFSET: 0x005A6C30 // FUNCTION: fn_03194 -EfstActionMessage CEfstAction_PULSE_OF_MADNESS::Slot04() { +EfstActionMessage CEfstAction_PULSE_OF_MADNESS::GetEfstEndMessage() { return {LookupMessage(4669), 0xFF}; } // OFFSET: 0x005A6C60 // FUNCTION: fn_03195 -int CSkillAction_AT_FRENZY_FANG::Slot02() { +int CSkillAction_AT_FRENZY_FANG::GetSkillAttackMotion() { return 70; } // OFFSET: 0x005A6C70 // FUNCTION: fn_03196 -void CSkillAction_AT_FRENZY_FANG::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_FRENZY_FANG::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -816,25 +816,25 @@ void CSkillAction_AT_FRENZY_FANG::Slot11(int level, CGameActor* source, CGameAct const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot26(angle < 90.0f || angle > 270.0f); + effect->SetFlipX(angle < 90.0f || angle > 270.0f); } } // OFFSET: 0x005A6EE0 // FUNCTION: fn_03197 -int CSkillAction_AT_PINION_SHOT::Slot01() { +int CSkillAction_AT_PINION_SHOT::GetSkillCastMotion() { return 60; } // OFFSET: 0x005A6EF0 // FUNCTION: fn_03198 -int CSkillAction_AT_PINION_SHOT::Slot02() { +int CSkillAction_AT_PINION_SHOT::GetSkillAttackMotion() { return 78; } // OFFSET: 0x005A6F00 // FUNCTION: fn_03199 -void CSkillAction_AT_PINION_SHOT::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_PINION_SHOT::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -842,7 +842,7 @@ void CSkillAction_AT_PINION_SHOT::Slot08(int level, CGameActor* source) { // OFFSET: 0x005A6F30 // FUNCTION: fn_03200 -void CSkillAction_AT_PINION_SHOT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_PINION_SHOT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -859,31 +859,31 @@ void CSkillAction_AT_PINION_SHOT::Slot11(int level, CGameActor* source, CGameAct const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x005A7180 // FUNCTION: fn_03201 -void CSkillAction_AT_PINION_SHOT::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_PINION_SHOT::OnSkillHit(int level, CGameActor* source, CGameActor* target) { this->SpawnAttack01Effect(level, source); } // OFFSET: 0x005A71A0 // FUNCTION: fn_03202 -int CSkillAction_AT_QUILL_SPEAR::Slot01() { +int CSkillAction_AT_QUILL_SPEAR::GetSkillCastMotion() { return 60; } // OFFSET: 0x005A71B0 // FUNCTION: fn_03203 -int CSkillAction_AT_QUILL_SPEAR::Slot02() { +int CSkillAction_AT_QUILL_SPEAR::GetSkillAttackMotion() { return 79; } // OFFSET: 0x005A71C0 // FUNCTION: fn_03204 -void CSkillAction_AT_QUILL_SPEAR::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_QUILL_SPEAR::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -891,7 +891,7 @@ void CSkillAction_AT_QUILL_SPEAR::Slot08(int level, CGameActor* source) { // OFFSET: 0x005A71F0 // FUNCTION: fn_03205 -void CSkillAction_AT_QUILL_SPEAR::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_QUILL_SPEAR::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !this->CanUse(source)) { return; } @@ -905,7 +905,7 @@ void CSkillAction_AT_QUILL_SPEAR::Slot11(int level, CGameActor* source, CGameAct const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot17(angle); + effect->SetAngle(angle); if (CRagEffect* ragEffect = source->LaunchEffect(2442, vector3d{0.0f, 0.0f, 0.0f}, 0.0f)) { ragEffect->SendMsg(nullptr, 14, 0, reinterpret_cast(&target->render.position), 0, 0, 0, 0); } @@ -914,7 +914,7 @@ void CSkillAction_AT_QUILL_SPEAR::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x005A74A0 // FUNCTION: fn_03206 -void CSkillAction_AT_QUILL_SPEAR_S::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_QUILL_SPEAR_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !this->CanUse(source)) { return; } @@ -928,7 +928,7 @@ void CSkillAction_AT_QUILL_SPEAR_S::Slot11(int level, CGameActor* source, CGameA const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot17(angle); + effect->SetAngle(angle); if (CRagEffect* ragEffect = source->LaunchEffect(2442, vector3d{0.0f, 0.0f, 0.0f}, 0.0f)) { ragEffect->SendMsg(nullptr, 14, 0, reinterpret_cast(&target->render.position), 0, 0, 0, 0); } @@ -937,19 +937,19 @@ void CSkillAction_AT_QUILL_SPEAR_S::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x005A7750 // FUNCTION: fn_03207 -int CSkillAction_AT_NATURE_HARMONY::Slot01() { +int CSkillAction_AT_NATURE_HARMONY::GetSkillCastMotion() { return 61; } // OFFSET: 0x005A7760 // FUNCTION: fn_03208 -int CSkillAction_AT_NATURE_HARMONY::Slot02() { +int CSkillAction_AT_NATURE_HARMONY::GetSkillAttackMotion() { return 64; } // OFFSET: 0x005A7770 // FUNCTION: fn_03209 -void CSkillAction_AT_NATURE_HARMONY::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_NATURE_HARMONY::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(12, level / 16); } @@ -957,7 +957,7 @@ void CSkillAction_AT_NATURE_HARMONY::Slot08(int level, CGameActor* source) { // OFFSET: 0x005A77A0 // FUNCTION: fn_03210 -void CSkillAction_AT_NATURE_HARMONY::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_NATURE_HARMONY::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -970,31 +970,31 @@ void CSkillAction_AT_NATURE_HARMONY::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x005A79B0 // FUNCTION: fn_03211 -EfstActionMessage CEfstAction_NATURE_HARMONY::Slot03() { +EfstActionMessage CEfstAction_NATURE_HARMONY::GetEfstBeginMessage() { return {LookupMessage(4684), 0xFFFF00}; } // OFFSET: 0x005A79E0 // FUNCTION: fn_03212 -EfstActionMessage CEfstAction_NATURE_HARMONY::Slot04() { +EfstActionMessage CEfstAction_NATURE_HARMONY::GetEfstEndMessage() { return {LookupMessage(4685), 0xFF}; } // OFFSET: 0x005A7A10 // FUNCTION: fn_03213 -int CSkillAction_AT_GRAVITY_HOLE::Slot01() { +int CSkillAction_AT_GRAVITY_HOLE::GetSkillCastMotion() { return 61; } // OFFSET: 0x005A7A20 // FUNCTION: fn_03214 -int CSkillAction_AT_GRAVITY_HOLE::Slot02() { +int CSkillAction_AT_GRAVITY_HOLE::GetSkillAttackMotion() { return 64; } // OFFSET: 0x005A7A30 // FUNCTION: fn_03215 -void CSkillAction_AT_GRAVITY_HOLE::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_GRAVITY_HOLE::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(12, level / 16); } @@ -1002,7 +1002,7 @@ void CSkillAction_AT_GRAVITY_HOLE::Slot08(int level, CGameActor* source) { // OFFSET: 0x005A7A60 // FUNCTION: fn_03216 -void CSkillAction_AT_GRAVITY_HOLE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_GRAVITY_HOLE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { if (CRagEffect* effect = source->LaunchEffect(0, vector3d{0.0f, 0.0f, 0.0f}, 0.0f)) { effect->SendMsg(nullptr, 14, 0, reinterpret_cast(&source->render.position), 0, 0, 0, 0); @@ -1012,7 +1012,7 @@ void CSkillAction_AT_GRAVITY_HOLE::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x005A7AD0 // FUNCTION: fn_03217 -void CSkillAction_AT_GRAVITY_HOLE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_GRAVITY_HOLE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1031,13 +1031,13 @@ void CSkillAction_AT_GRAVITY_HOLE::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005A7E70 // FUNCTION: fn_03218 -int CSkillAction_AT_CHILLING_BLAST::Slot02() { +int CSkillAction_AT_CHILLING_BLAST::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005A7E80 // FUNCTION: fn_03219 -void CSkillAction_AT_CHILLING_BLAST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_CHILLING_BLAST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1057,19 +1057,19 @@ void CSkillAction_AT_CHILLING_BLAST::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x005A8230 // FUNCTION: fn_03220 -int CSkillAction_AT_GLACIER_MONOLITH::Slot14() { +int CSkillAction_AT_GLACIER_MONOLITH::GetSkillScopeType() { return 9; } // OFFSET: 0x005A8240 // FUNCTION: fn_03221 -int CSkillAction_AT_GLACIER_MONOLITH::Slot02() { +int CSkillAction_AT_GLACIER_MONOLITH::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005A8250 // FUNCTION: fn_03222 -void CSkillObjectAction_AT_GLACIER_MONOLITH::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_AT_GLACIER_MONOLITH::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (!object) { return; } @@ -1096,7 +1096,7 @@ void CSkillObjectAction_AT_GLACIER_MONOLITH::Slot00(int argument, CRenderObject* thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(990); + effect->SetDelay(990); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1105,13 +1105,13 @@ void CSkillObjectAction_AT_GLACIER_MONOLITH::Slot00(int argument, CRenderObject* thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(990); + effect->SetDelay(990); } } // OFFSET: 0x005A8960 // FUNCTION: fn_03223 -void CSkillObjectAction_AT_GLACIER_MONOLITH::Slot01(CRenderObject* object) { +void CSkillObjectAction_AT_GLACIER_MONOLITH::OnSkillObjectRemove(CRenderObject* object) { if (!object) { return; } @@ -1148,13 +1148,13 @@ void CSkillObjectAction_AT_GLACIER_MONOLITH::Slot01(CRenderObject* object) { // OFFSET: 0x005A8FC0 // FUNCTION: fn_03224 -int CSkillAction_AT_GLACIER_NOVA::Slot02() { +int CSkillAction_AT_GLACIER_NOVA::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005A8FD0 // FUNCTION: fn_03225 -void CSkillAction_AT_GLACIER_NOVA::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_AT_GLACIER_NOVA::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\x54', '\x4B', '\x52', '\x6C', '\xD4', '\x28', '\x4B', '\x72', '\x5D', '\x48', '\x45', '\x6E', '\xBD'}; @@ -1165,7 +1165,7 @@ void CSkillAction_AT_GLACIER_NOVA::Slot12(vector3d position, int argument2, int // OFFSET: 0x005A91A0 // FUNCTION: fn_03226 -void CSkillAction_AT_GLACIER_SHARD::Slot10(int level, CGameActor* source, int argument3, int argument4, int argument5) { +void CSkillAction_AT_GLACIER_SHARD::OnGroundSkillCast(int level, CGameActor* source, int argument3, int argument4, int argument5) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1174,14 +1174,14 @@ void CSkillAction_AT_GLACIER_SHARD::Slot10(int level, CGameActor* source, int ar thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x005A93B0 // FUNCTION: fn_03227 -void CSkillAction_AT_GLACIER_SHARD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_GLACIER_SHARD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1194,13 +1194,13 @@ void CSkillAction_AT_GLACIER_SHARD::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x005A95C0 // FUNCTION: fn_03228 -int CSkillAction_AT_GLACIER_STOMP::Slot02() { +int CSkillAction_AT_GLACIER_STOMP::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005A95D0 // FUNCTION: fn_03229 -void CSkillAction_AT_GLACIER_STOMP::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_GLACIER_STOMP::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1213,13 +1213,13 @@ void CSkillAction_AT_GLACIER_STOMP::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x005A97E0 // FUNCTION: fn_03230 -int CSkillAction_AT_ROARING_CHARGE::Slot02() { +int CSkillAction_AT_ROARING_CHARGE::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005A97F0 // FUNCTION: fn_03231 -void CSkillAction_AT_ROARING_CHARGE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ROARING_CHARGE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1239,13 +1239,13 @@ void CSkillAction_AT_ROARING_CHARGE::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x005A9BA0 // FUNCTION: fn_03232 -int CSkillAction_AT_ROARING_CHARGE_S::Slot02() { +int CSkillAction_AT_ROARING_CHARGE_S::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005A9BB0 // FUNCTION: fn_03233 -void CSkillAction_AT_ROARING_CHARGE_S::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ROARING_CHARGE_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1265,7 +1265,7 @@ void CSkillAction_AT_ROARING_CHARGE_S::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x005A9F50 // FUNCTION: fn_03234 -void CSkillAction_AT_ROARING_PIERCER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ROARING_PIERCER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1283,13 +1283,13 @@ void CSkillAction_AT_ROARING_PIERCER::Slot11(int level, CGameActor* source, CGam const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x005AA180 // FUNCTION: fn_03235 -void CSkillAction_AT_ROARING_PIERCEER_S::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ROARING_PIERCEER_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1307,19 +1307,19 @@ void CSkillAction_AT_ROARING_PIERCEER_S::Slot11(int level, CGameActor* source, C const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x005AA3B0 // FUNCTION: fn_03236 -int CSkillAction_AT_FURIOS_STORM::Slot02() { +int CSkillAction_AT_FURIOS_STORM::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005AA3C0 // FUNCTION: fn_03237 -void CSkillAction_AT_FURIOS_STORM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_FURIOS_STORM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1330,7 +1330,7 @@ void CSkillAction_AT_FURIOS_STORM::Slot11(int level, CGameActor* source, CGameAc thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(1000); + effect->SetLifeTime(1000); } const int stormA = CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1359,22 +1359,22 @@ void CSkillAction_AT_FURIOS_STORM::Slot11(int level, CGameActor* source, CGameAc for (int delay = 0; delay < 1000; delay += 250) { const int variant = std::max(std::rand() % 2, 0); if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, variant ? stormA : stormB, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(delay); + effect->SetDelay(delay); } if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, variant ? stormABottom : stormBBottom, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(delay); + effect->SetDelay(delay); } } } // OFFSET: 0x005AABF0 // FUNCTION: fn_03238 -void CSkillAction_AT_FURIOS_STORM::Slot17(CGameActor* source) { +void CSkillAction_AT_FURIOS_STORM::PlayThunderEffect(CGameActor* source) { } // OFFSET: 0x005AAC00 // FUNCTION: fn_03239 -void CEfstAction_FURIOS_STORM::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_FURIOS_STORM::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const std::uint8_t bytes[] = {0x6D, 0x05, 0xBA, 0x91, 0x39, 0x64, 0xB3, 0x16, 0x77, 0x0A, 0x90, 0x9C, 0x3C, 0x72, 0xB5, 0x7F}; @@ -1410,19 +1410,19 @@ void CEfstAction_FURIOS_STORM::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x005AB5F0 // FUNCTION: fn_03240 -int CSkillAction_AT_ALPHA_PHASE::Slot01() { +int CSkillAction_AT_ALPHA_PHASE::GetSkillCastMotion() { return 66; } // OFFSET: 0x005AB600 // FUNCTION: fn_03241 -int CSkillAction_AT_ALPHA_PHASE::Slot02() { +int CSkillAction_AT_ALPHA_PHASE::GetSkillAttackMotion() { return 68; } // OFFSET: 0x005AB610 // FUNCTION: fn_03242 -void CSkillAction_AT_ALPHA_PHASE::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_ALPHA_PHASE::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(54, level / 16); } @@ -1430,7 +1430,7 @@ void CSkillAction_AT_ALPHA_PHASE::Slot08(int level, CGameActor* source) { // OFFSET: 0x005AB640 // FUNCTION: fn_03243 -void CSkillAction_AT_ALPHA_PHASE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ALPHA_PHASE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1443,25 +1443,25 @@ void CSkillAction_AT_ALPHA_PHASE::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x005AB840 // FUNCTION: fn_03244 -EfstActionMessage CEfstAction_ALPHA_PHASE::Slot03() { +EfstActionMessage CEfstAction_ALPHA_PHASE::GetEfstBeginMessage() { return {LookupMessage(4670), 0xFFFF00}; } // OFFSET: 0x005AB870 // FUNCTION: fn_03245 -EfstActionMessage CEfstAction_ALPHA_PHASE::Slot04() { +EfstActionMessage CEfstAction_ALPHA_PHASE::GetEfstEndMessage() { return {LookupMessage(4671), 0xFF}; } // OFFSET: 0x005AB8A0 // FUNCTION: fn_03246 -int CSkillAction_AT_APEX_PHASE::Slot02() { +int CSkillAction_AT_APEX_PHASE::GetSkillAttackMotion() { return 80; } // OFFSET: 0x005AB8B0 // FUNCTION: fn_03247 -void CSkillAction_AT_APEX_PHASE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_APEX_PHASE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1474,25 +1474,25 @@ void CSkillAction_AT_APEX_PHASE::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x005ABAB0 // FUNCTION: fn_03248 -EfstActionMessage CEfstAction_AT_APEX_PHASE::Slot03() { +EfstActionMessage CEfstAction_AT_APEX_PHASE::GetEfstBeginMessage() { return {LookupMessage(4682), 0xFFFF00}; } // OFFSET: 0x005ABAE0 // FUNCTION: fn_03249 -EfstActionMessage CEfstAction_AT_APEX_PHASE::Slot04() { +EfstActionMessage CEfstAction_AT_APEX_PHASE::GetEfstEndMessage() { return {LookupMessage(4683), 0xFF}; } // OFFSET: 0x005ABB10 // FUNCTION: fn_03250 -int CSkillAction_AT_FLIP_FLAP::Slot02() { +int CSkillAction_AT_FLIP_FLAP::GetSkillAttackMotion() { return 80; } // OFFSET: 0x005ABB20 // FUNCTION: fn_03251 -void CSkillAction_AT_FLIP_FLAP::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_FLIP_FLAP::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1505,31 +1505,31 @@ void CSkillAction_AT_FLIP_FLAP::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x005ABD20 // FUNCTION: fn_03252 -EfstActionMessage CEfstAction_FLIP_FLAP::Slot03() { +EfstActionMessage CEfstAction_FLIP_FLAP::GetEfstBeginMessage() { return {LookupMessage(4678), 0xFFFF00}; } // OFFSET: 0x005ABD50 // FUNCTION: fn_03253 -EfstActionMessage CEfstAction_FLIP_FLAP::Slot04() { +EfstActionMessage CEfstAction_FLIP_FLAP::GetEfstEndMessage() { return {LookupMessage(4679), 0xFF}; } // OFFSET: 0x005ABD80 // FUNCTION: fn_03254 -bool CSkillAction_AT_AERO_SYNC::Slot00() { +bool CSkillAction_AT_AERO_SYNC::IsSupport() { return true; } // OFFSET: 0x005ABD90 // FUNCTION: fn_03255 -int CSkillAction_AT_AERO_SYNC::Slot02() { +int CSkillAction_AT_AERO_SYNC::GetSkillAttackMotion() { return 70; } // OFFSET: 0x005ABDA0 // FUNCTION: fn_03256 -void CSkillAction_AT_AERO_SYNC::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_AERO_SYNC::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1555,19 +1555,19 @@ void CSkillAction_AT_AERO_SYNC::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x005AC300 // FUNCTION: fn_03257 -EfstActionMessage CEfstAction_FLIP_FLAP_TARGET::Slot03() { +EfstActionMessage CEfstAction_FLIP_FLAP_TARGET::GetEfstBeginMessage() { return {LookupMessage(4680), 0xFFFF00}; } // OFFSET: 0x005AC330 // FUNCTION: fn_03258 -EfstActionMessage CEfstAction_FLIP_FLAP_TARGET::Slot04() { +EfstActionMessage CEfstAction_FLIP_FLAP_TARGET::GetEfstEndMessage() { return {LookupMessage(4681), 0xFF}; } // OFFSET: 0x005AC360 // FUNCTION: fn_03259 -void CEfstAction_FLIP_FLAP_TARGET::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_FLIP_FLAP_TARGET::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1580,25 +1580,25 @@ void CEfstAction_FLIP_FLAP_TARGET::Slot00(int efstId, int value, int argument3, // OFFSET: 0x005AC570 // FUNCTION: fn_03260 -int CSkillAction_AT_SAVAGE_LUNGE::Slot02() { +int CSkillAction_AT_SAVAGE_LUNGE::GetSkillAttackMotion() { return 73; } // OFFSET: 0x005AC970 // FUNCTION: fn_03262 -int CSkillAction_AT_TEMPEST_FLAP::Slot01() { +int CSkillAction_AT_TEMPEST_FLAP::GetSkillCastMotion() { return 66; } // OFFSET: 0x005AC980 // FUNCTION: fn_03263 -int CSkillAction_AT_TEMPEST_FLAP::Slot02() { +int CSkillAction_AT_TEMPEST_FLAP::GetSkillAttackMotion() { return 67; } // OFFSET: 0x005ACBA0 // FUNCTION: fn_03265 -void CSkillAction_AT_TEMPEST_FLAP::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_TEMPEST_FLAP::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1618,13 +1618,13 @@ void CSkillAction_AT_TEMPEST_FLAP::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005ACF40 // FUNCTION: fn_03266 -int CSkillAction_AT_TERRA_HARVEST::Slot02() { +int CSkillAction_AT_TERRA_HARVEST::GetSkillAttackMotion() { return 62; } // OFFSET: 0x005ACF50 // FUNCTION: fn_03267 -void CSkillAction_AT_TERRA_HARVEST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_TERRA_HARVEST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -1658,7 +1658,7 @@ void CSkillAction_AT_TERRA_HARVEST::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x005AD630 // FUNCTION: fn_03268 -void CSkillAction_AT_TERRA_WAVE::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_AT_TERRA_WAVE::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\x7F', '\xD0', '\xFB', '\x67', '\x68', '\xE8', '\xEE', '\xA2', '\x7D', '\xD0', '\x89'}; @@ -1676,13 +1676,13 @@ void CSkillAction_AT_TERRA_WAVE::Slot12(vector3d position, int argument2, int ar // OFFSET: 0x005AD970 // FUNCTION: fn_03269 -int CSkillAction_AT_SOLID_STOMP::Slot02() { +int CSkillAction_AT_SOLID_STOMP::GetSkillAttackMotion() { return 63; } // OFFSET: 0x005AD980 // FUNCTION: fn_03270 -void CSkillAction_AT_SOLID_STOMP::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_SOLID_STOMP::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\xAA', '\x56', '\x7F', '\x10', '\xAF', '\xDC', '\x0E', '\x8B', '\xB6', '\x54', '\x63', '\x79'}; @@ -1700,27 +1700,27 @@ void CSkillAction_AT_SOLID_STOMP::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x005ADD10 // FUNCTION: fn_03271 -EfstActionMessage CEfstAction_SOLID_STOMP::Slot03() { +EfstActionMessage CEfstAction_SOLID_STOMP::GetEfstBeginMessage() { return {LookupMessage(4686), 0xFFFF00}; } // OFFSET: 0x005ADD40 // FUNCTION: fn_03272 -EfstActionMessage CEfstAction_SOLID_STOMP::Slot04() { +EfstActionMessage CEfstAction_SOLID_STOMP::GetEfstEndMessage() { return {LookupMessage(4687), 0xFF}; } // OFFSET: 0x005ADD70 // FUNCTION: fn_03273 -int CSkillAction_AT_ZEPHYR_LINK::Slot02() { +int CSkillAction_AT_ZEPHYR_LINK::GetSkillAttackMotion() { return 0; } // OFFSET: 0x005ADD80 // FUNCTION: fn_03274 -void CEfstAction_ZEPHYR_LINK::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_ZEPHYR_LINK::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { - this->Slot01(efstId, value, argument3, argument4, actor); + this->OnEfstEnd(efstId, value, argument3, argument4, actor); EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\xEB', '\xA6', '\xCD', '\x09', '\x1C', '\xE3', '\x62', '\x55', '\xF8', '\xAD', '\xD6', '\x61'}; @@ -1739,7 +1739,7 @@ void CEfstAction_ZEPHYR_LINK::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x005AE130 // FUNCTION: fn_03275 -void CEfstAction_ZEPHYR_LINK::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_ZEPHYR_LINK::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -1759,17 +1759,17 @@ void CEfstAction_ZEPHYR_LINK::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x005AE460 // FUNCTION: fn_03276 -void CEfstAction_ZEPHYR_LINK::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_ZEPHYR_LINK::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { - this->Slot00(efstId, value, 0, 0, actor, false); + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } } // OFFSET: 0x005AE480 // FUNCTION: fn_03277 -void CEfstAction_INSANE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_INSANE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { - this->Slot01(efstId, value, argument3, argument4, actor); + this->OnEfstEnd(efstId, value, argument3, argument4, actor); EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\xCA', '\xC7', '\xB6', '\x43', '\x48', '\x00', '\xD9', '\x02', '\xCE', '\xCF', '\xA0', '\x68', '\x27', '\x58', '\xB7'}; @@ -1789,7 +1789,7 @@ void CEfstAction_INSANE::Slot00(int efstId, int value, int argument3, int argume // OFFSET: 0x005AE840 // FUNCTION: fn_03278 -void CEfstAction_INSANE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_INSANE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { static_cast(actor)->unknown_04F4 = 0; } @@ -1797,17 +1797,17 @@ void CEfstAction_INSANE::Slot01(int efstId, int argument2, int argument3, int ar // OFFSET: 0x005AE860 // FUNCTION: fn_03279 -void CEfstAction_INSANE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_INSANE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { - this->Slot00(efstId, value, 0, 0, actor, false); + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } } // OFFSET: 0x005AE880 // FUNCTION: fn_03280 -void CEfstAction_INSANE2::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_INSANE2::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { - this->Slot01(efstId, value, argument3, argument4, actor); + this->OnEfstEnd(efstId, value, argument3, argument4, actor); EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\x32', '\x97', '\xC6', '\xBF', '\x5C', '\x98', '\x8D', '\x36', '\x36', '\x9F', '\xD0', '\x94', '\x33', '\xC3', '\xE3'}; @@ -1827,9 +1827,9 @@ void CEfstAction_INSANE2::Slot00(int efstId, int value, int argument3, int argum // OFFSET: 0x005AEC40 // FUNCTION: fn_03281 -void CEfstAction_INSANE3::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_INSANE3::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { - this->Slot01(efstId, value, argument3, argument4, actor); + this->OnEfstEnd(efstId, value, argument3, argument4, actor); EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\xBA', '\x21', '\xDE', '\x13', '\x40', '\x10', '\x5D', '\x5E', '\xBE', '\x29', '\xC8', '\x38', '\x2F', '\x4A', '\x33'}; @@ -1856,12 +1856,12 @@ bool __stdcall KeepSkillAttackMotion(int) { // OFFSET: 0x005A5E50 // FUNCTION: fn_03170 bool CSkillAction_AnimalForm::CanUse(CGameActor* actor) { - return actor && actor->HasShapeShift() && this->Slot17(actor); + return actor && actor->HasShapeShift() && this->IsInForm(actor); } // OFFSET: 0x005AC580 // FUNCTION: fn_03261 -void CSkillAction_AT_SAVAGE_LUNGE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_SAVAGE_LUNGE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !this->CanUse(source)) { return; } @@ -1886,7 +1886,7 @@ void CSkillAction_AT_SAVAGE_LUNGE::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005AC990 // FUNCTION: fn_03264 -void CSkillAction_AT_TEMPEST_FLAP::Slot08(int level, CGameActor* source) { +void CSkillAction_AT_TEMPEST_FLAP::OnSkillCast(int level, CGameActor* source) { if (this->CanUse(source)) { if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { const char bytes[] = {'\xCB', '\xD8', '\xB2', '\x4F', '\x28', '\x5E', '\xF7', '\x6C', '\xD9', '\xD1', '\xBE', '\x4F', '\x12', '\x4E', '\xE2', '\x40', @@ -1894,7 +1894,7 @@ void CSkillAction_AT_TEMPEST_FLAP::Slot08(int level, CGameActor* source) { thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } @@ -2030,13 +2030,13 @@ void __stdcall OnSkillObjectRemove(int a) { // OFFSET: 0x005AF4E0 // FUNCTION: fn_03326 -int CSkillAction_AT_PRIMAL_CLAW::Slot02() { +int CSkillAction_AT_PRIMAL_CLAW::GetSkillAttackMotion() { return 72; } // OFFSET: 0x005AF4F0 // FUNCTION: fn_03327 -void CSkillAction_AT_PRIMAL_CLAW::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_PRIMAL_CLAW::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source) || !target) { return; } @@ -2050,13 +2050,13 @@ void CSkillAction_AT_PRIMAL_CLAW::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x005AF700 // FUNCTION: fn_03328 -int CSkillAction_AT_FERAL_CLAW::Slot02() { +int CSkillAction_AT_FERAL_CLAW::GetSkillAttackMotion() { return 71; } // OFFSET: 0x005AF710 // FUNCTION: fn_03329 -void CSkillAction_AT_FERAL_CLAW::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_FERAL_CLAW::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source) || !target) { return; } @@ -2156,9 +2156,9 @@ void CSkillAction_DamageWereRaptorForm::SpawnAttack02Effect(int sourceActor, CGa const int fade = std::max(std::rand() % 101, 0) + alpha; const int scale = std::max(std::rand() % 11, 7); if (CEffect* effect = g_effectMgr->Spawn(0, effectId, x, y, z, 0, -1, 0, 0)) { - effect->Slot26(flipped); - effect->Slot16(fade); - effect->Slot22(static_cast(scale) * 0.1f); + effect->SetFlipX(flipped); + effect->SetDelay(fade); + effect->SetScale(static_cast(scale) * 0.1f); } } diff --git a/Source/Contents/Skills/SkillActionDruid.cpp b/Source/Contents/Skills/SkillActionDruid.cpp index 70905611e..603062794 100644 --- a/Source/Contents/Skills/SkillActionDruid.cpp +++ b/Source/Contents/Skills/SkillActionDruid.cpp @@ -58,8 +58,8 @@ private: class CSkillAction_AnimalForm : public CSkillAction { public: bool CanUse(CGameActor* actor); - virtual bool Slot17(CGameActor* actor) = 0; - virtual void Slot18(CGameActor* actor) = 0; + virtual bool IsInForm(CGameActor* actor) = 0; + virtual void PlayFormAttackEffect(CGameActor* actor) = 0; }; class CSkillAction_Direction { @@ -71,305 +71,305 @@ public: class CSkillAction_DamageWereRaptorForm : public CSkillAction_AnimalForm, public CSkillAction_Direction { public: void SpawnAttack00Effect(int sourceActor, CGameActor* target); - void Slot16(int level, CGameActor* source, CGameActor* target) override; - bool Slot17(CGameActor* actor) override; - void Slot18(CGameActor* actor) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + bool IsInForm(CGameActor* actor) override; + void PlayFormAttackEffect(CGameActor* actor) override; }; class CSkillAction_DamageWereWolfForm : public CSkillAction_AnimalForm { public: - void Slot16(int level, CGameActor* source, CGameActor* target) override; - bool Slot17(CGameActor* actor) override; - void Slot18(CGameActor* actor) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + bool IsInForm(CGameActor* actor) override; + void PlayFormAttackEffect(CGameActor* actor) override; }; class CEfstAction_BasicAction : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - virtual int Slot05(int efstId, int argument4) = 0; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + virtual int GetEffectId(int efstId, int argument4) = 0; }; class CSkillAction_DR_WERERAPTOR : public CSkillAction_DamageWereRaptorForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_AnimalForm : public CEfstAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; void ResetAnimalForm(CRenderObject* actor); void ApplyAnimalForm(CRenderObject* actor, int form); - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_WERERAPTOR : public CEfstAction_AnimalForm { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_ENRAGE_WOLF : public CSkillAction_DamageWereWolfForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_ENRAGE_WOLF : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_BLOOD_HOWLING : public CSkillAction_DamageWereWolfForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_BLOOD_HOWLING : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_NOMERCY_CLAW : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_HUNGER : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int caster, CGameActor* target, CGameActor* argument3) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) override; }; class CSkillAction_DR_CRUEL_BITE : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_ENRAGE_RAPTOR : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_ENRAGE_RAPTOR : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_PREENING : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_PREENING : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_SHOOTING_FEATHER : public CSkillAction_DamageWereRaptorForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_FLICKING_TONADO : public CSkillAction_DamageWereRaptorForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_LOW_FLIGHT : public CSkillAction_DamageWereRaptorForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_NATURE_SHIELD : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_NATURE_SHIELD : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CEfstAction_GROUND_GROW : public CEfstAction_BasicAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - int Slot05(int efstId, int argument4) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + int GetEffectId(int efstId, int argument4) override; }; class CSkillAction_Earthing : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_Icing : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_NATURE_PROTECTION : public CEfstAction_BasicAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; - int Slot05(int efstId, int argument4) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; + int GetEffectId(int efstId, int argument4) override; }; class CEfstAction_THUNDERING_ROD : public CEfstAction_BasicAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - int Slot05(int efstId, int argument4) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + int GetEffectId(int efstId, int argument4) override; }; class CEfstAction_THUNDERING_ROD_MAX : public CEfstAction_BasicAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; - int Slot05(int efstId, int argument4) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; + int GetEffectId(int efstId, int argument4) override; }; class CSkillAction_DR_TRUTH_OF_EARTH : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_TRUTH_OF_EARTH : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_TRUTH_OF_ICE : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_TRUTH_OF_ICE : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_TRUTH_OF_WIND : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_TRUTH_OF_WIND : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DR_CUTTING_WIND : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_WIND_BOMB : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_AROUND_FLOWER : public CSkillAction_Earthing { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_EARTH_FLOWER : public CSkillAction_Earthing { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_ICE_CLOUD : public CSkillAction_Icing { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_ICE_TOTEM : public CSkillAction_Icing { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DR_WEREWOLF : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_WEREWOLF : public CEfstAction_AnimalForm { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; // OFFSET: 0x0061FF70 // FUNCTION: fn_04458 -int CSkillAction_DR_WERERAPTOR::Slot02() { +int CSkillAction_DR_WERERAPTOR::GetSkillAttackMotion() { return 64; } // OFFSET: 0x0061FF80 // FUNCTION: fn_04459 -void CSkillAction_DR_WERERAPTOR::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_WERERAPTOR::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } - if (this->Slot17(source) == true) { + if (this->IsInForm(source) == true) { return; } @@ -380,31 +380,31 @@ void CSkillAction_DR_WERERAPTOR::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x00620190 // FUNCTION: fn_04460 -EfstActionMessage CEfstAction_WERERAPTOR::Slot03() { +EfstActionMessage CEfstAction_WERERAPTOR::GetEfstBeginMessage() { return {LookupMessage(4648), 0xFFFF00}; } // OFFSET: 0x006201C0 // FUNCTION: fn_04461 -EfstActionMessage CEfstAction_WERERAPTOR::Slot04() { +EfstActionMessage CEfstAction_WERERAPTOR::GetEfstEndMessage() { return {LookupMessage(4649), 0xFF}; } // OFFSET: 0x00620220 // FUNCTION: fn_04463 -int CSkillAction_DR_ENRAGE_WOLF::Slot01() { +int CSkillAction_DR_ENRAGE_WOLF::GetSkillCastMotion() { return 66; } // OFFSET: 0x00620230 // FUNCTION: fn_04464 -int CSkillAction_DR_ENRAGE_WOLF::Slot02() { +int CSkillAction_DR_ENRAGE_WOLF::GetSkillAttackMotion() { return 68; } // OFFSET: 0x00620240 // FUNCTION: fn_04465 -void CSkillAction_DR_ENRAGE_WOLF::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_ENRAGE_WOLF::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(54, level / 16); } @@ -412,31 +412,31 @@ void CSkillAction_DR_ENRAGE_WOLF::Slot08(int level, CGameActor* source) { // OFFSET: 0x00620480 // FUNCTION: fn_04467 -EfstActionMessage CEfstAction_ENRAGE_WOLF::Slot03() { +EfstActionMessage CEfstAction_ENRAGE_WOLF::GetEfstBeginMessage() { return {LookupMessage(4644), 0xFFFF00}; } // OFFSET: 0x006204B0 // FUNCTION: fn_04468 -EfstActionMessage CEfstAction_ENRAGE_WOLF::Slot04() { +EfstActionMessage CEfstAction_ENRAGE_WOLF::GetEfstEndMessage() { return {LookupMessage(4645), 0xFF}; } // OFFSET: 0x006204E0 // FUNCTION: fn_04469 -int CSkillAction_DR_BLOOD_HOWLING::Slot01() { +int CSkillAction_DR_BLOOD_HOWLING::GetSkillCastMotion() { return 66; } // OFFSET: 0x006204F0 // FUNCTION: fn_04470 -int CSkillAction_DR_BLOOD_HOWLING::Slot02() { +int CSkillAction_DR_BLOOD_HOWLING::GetSkillAttackMotion() { return 68; } // OFFSET: 0x00620500 // FUNCTION: fn_04471 -void CSkillAction_DR_BLOOD_HOWLING::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_BLOOD_HOWLING::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(54, level / 16); } @@ -444,31 +444,31 @@ void CSkillAction_DR_BLOOD_HOWLING::Slot08(int level, CGameActor* source) { // OFFSET: 0x00620740 // FUNCTION: fn_04473 -EfstActionMessage CEfstAction_BLOOD_HOWLING::Slot03() { +EfstActionMessage CEfstAction_BLOOD_HOWLING::GetEfstBeginMessage() { return {LookupMessage(4646), 0xFFFF00}; } // OFFSET: 0x00620770 // FUNCTION: fn_04474 -EfstActionMessage CEfstAction_BLOOD_HOWLING::Slot04() { +EfstActionMessage CEfstAction_BLOOD_HOWLING::GetEfstEndMessage() { return {LookupMessage(4647), 0xFF}; } // OFFSET: 0x006207A0 // FUNCTION: fn_04475 -int CSkillAction_DR_NOMERCY_CLAW::Slot02() { +int CSkillAction_DR_NOMERCY_CLAW::GetSkillAttackMotion() { return 69; } // OFFSET: 0x006209C0 // FUNCTION: fn_04477 -int CSkillAction_DR_HUNGER::Slot02() { +int CSkillAction_DR_HUNGER::GetSkillAttackMotion() { return 70; } // OFFSET: 0x006209D0 // FUNCTION: fn_04478 -void CSkillAction_DR_HUNGER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_HUNGER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -481,7 +481,7 @@ void CSkillAction_DR_HUNGER::Slot11(int level, CGameActor* source, CGameActor* t // OFFSET: 0x00620BE0 // FUNCTION: fn_04479 -void CSkillAction_DR_HUNGER::Slot15(int caster, CGameActor* target, CGameActor* argument3) { +void CSkillAction_DR_HUNGER::OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) { CGameActor* source = reinterpret_cast(caster); if (!source) { return; @@ -494,25 +494,25 @@ void CSkillAction_DR_HUNGER::Slot15(int caster, CGameActor* target, CGameActor* // OFFSET: 0x00620DE0 // FUNCTION: fn_04480 -int CSkillAction_DR_CRUEL_BITE::Slot02() { +int CSkillAction_DR_CRUEL_BITE::GetSkillAttackMotion() { return 73; } // OFFSET: 0x00621060 // FUNCTION: fn_04482 -int CSkillAction_DR_ENRAGE_RAPTOR::Slot01() { +int CSkillAction_DR_ENRAGE_RAPTOR::GetSkillCastMotion() { return 66; } // OFFSET: 0x00621070 // FUNCTION: fn_04483 -int CSkillAction_DR_ENRAGE_RAPTOR::Slot02() { +int CSkillAction_DR_ENRAGE_RAPTOR::GetSkillAttackMotion() { return 68; } // OFFSET: 0x00621080 // FUNCTION: fn_04484 -void CSkillAction_DR_ENRAGE_RAPTOR::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_ENRAGE_RAPTOR::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -520,31 +520,31 @@ void CSkillAction_DR_ENRAGE_RAPTOR::Slot08(int level, CGameActor* source) { // OFFSET: 0x006212C0 // FUNCTION: fn_04486 -EfstActionMessage CEfstAction_ENRAGE_RAPTOR::Slot03() { +EfstActionMessage CEfstAction_ENRAGE_RAPTOR::GetEfstBeginMessage() { return {LookupMessage(4650), 0xFFFF00}; } // OFFSET: 0x006212F0 // FUNCTION: fn_04487 -EfstActionMessage CEfstAction_ENRAGE_RAPTOR::Slot04() { +EfstActionMessage CEfstAction_ENRAGE_RAPTOR::GetEfstEndMessage() { return {LookupMessage(4651), 0xFF}; } // OFFSET: 0x00621320 // FUNCTION: fn_04488 -int CSkillAction_DR_PREENING::Slot01() { +int CSkillAction_DR_PREENING::GetSkillCastMotion() { return 66; } // OFFSET: 0x00621330 // FUNCTION: fn_04489 -int CSkillAction_DR_PREENING::Slot02() { +int CSkillAction_DR_PREENING::GetSkillAttackMotion() { return 68; } // OFFSET: 0x00621340 // FUNCTION: fn_04490 -void CSkillAction_DR_PREENING::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_PREENING::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -552,31 +552,31 @@ void CSkillAction_DR_PREENING::Slot08(int level, CGameActor* source) { // OFFSET: 0x00621570 // FUNCTION: fn_04492 -EfstActionMessage CEfstAction_PREENING::Slot03() { +EfstActionMessage CEfstAction_PREENING::GetEfstBeginMessage() { return {LookupMessage(4652), 0xFFFF00}; } // OFFSET: 0x006215A0 // FUNCTION: fn_04493 -EfstActionMessage CEfstAction_PREENING::Slot04() { +EfstActionMessage CEfstAction_PREENING::GetEfstEndMessage() { return {LookupMessage(4653), 0xFF}; } // OFFSET: 0x006215D0 // FUNCTION: fn_04494 -int CSkillAction_DR_SHOOTING_FEATHER::Slot02() { +int CSkillAction_DR_SHOOTING_FEATHER::GetSkillAttackMotion() { return 72; } // OFFSET: 0x00621850 // FUNCTION: fn_04497 -int CSkillAction_DR_FLICKING_TONADO::Slot02() { +int CSkillAction_DR_FLICKING_TONADO::GetSkillAttackMotion() { return 67; } // OFFSET: 0x00621860 // FUNCTION: fn_04498 -void CSkillAction_DR_FLICKING_TONADO::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_FLICKING_TONADO::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -593,13 +593,13 @@ void CSkillAction_DR_FLICKING_TONADO::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x00621C00 // FUNCTION: fn_04499 -int CSkillAction_DR_LOW_FLIGHT::Slot02() { +int CSkillAction_DR_LOW_FLIGHT::GetSkillAttackMotion() { return 70; } // OFFSET: 0x00621C10 // FUNCTION: fn_04500 -void CSkillAction_DR_LOW_FLIGHT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_LOW_FLIGHT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !this->CanUse(source)) { return; } @@ -629,22 +629,22 @@ void CSkillAction_DR_LOW_FLIGHT::Slot11(int level, CGameActor* source, CGameActo EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); float angleOffset = 0.0f; if ((direction & 1) != 0) { - effect->Slot26(flag); + effect->SetFlipX(flag); if (!flag) { angleOffset = -180.0f; } } else { - effect->Slot27(flag); + effect->SetFlipY(flag); if (flag) { angleOffset = -90.0f; } else { angleOffset = -270.0f; } } - effect->Slot17(static_cast((static_cast(angle + angleOffset) + 360) % 360)); + effect->SetAngle(static_cast((static_cast(angle + angleOffset) + 360) % 360)); } effects = g_effectMgr; @@ -653,25 +653,25 @@ void CSkillAction_DR_LOW_FLIGHT::Slot11(int level, CGameActor* source, CGameActo thread_local EncryptedName bottomName(bottomSource); return bottomName.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } } // OFFSET: 0x006221F0 // FUNCTION: fn_04501 -int CSkillAction_DR_NATURE_SHIELD::Slot01() { +int CSkillAction_DR_NATURE_SHIELD::GetSkillCastMotion() { return 61; } // OFFSET: 0x00622200 // FUNCTION: fn_04502 -int CSkillAction_DR_NATURE_SHIELD::Slot02() { +int CSkillAction_DR_NATURE_SHIELD::GetSkillAttackMotion() { return 65; } // OFFSET: 0x00622210 // FUNCTION: fn_04503 -void CSkillAction_DR_NATURE_SHIELD::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_NATURE_SHIELD::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(12, level / 16); } @@ -679,7 +679,7 @@ void CSkillAction_DR_NATURE_SHIELD::Slot08(int level, CGameActor* source) { // OFFSET: 0x00622240 // FUNCTION: fn_04504 -void CSkillAction_DR_NATURE_SHIELD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_NATURE_SHIELD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { const char effectSource[] = {'\xA9', '\xAC', '\x91', '\x48', '\x6D', '\x18', '\x3A', '\x86', '\xAF', '\xA4', '\x80', '\x51', '\x7B', '\x7D'}; thread_local EncryptedName effectName(effectSource); g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -687,27 +687,27 @@ void CSkillAction_DR_NATURE_SHIELD::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x00622440 // FUNCTION: fn_04505 -EfstActionMessage CEfstAction_NATURE_SHIELD::Slot03() { +EfstActionMessage CEfstAction_NATURE_SHIELD::GetEfstBeginMessage() { return {LookupMessage(4660), 0xFFFF00}; } // OFFSET: 0x00622470 // FUNCTION: fn_04506 -EfstActionMessage CEfstAction_NATURE_SHIELD::Slot04() { +EfstActionMessage CEfstAction_NATURE_SHIELD::GetEfstEndMessage() { return {LookupMessage(4661), 0xFF}; } // OFFSET: 0x006224A0 // FUNCTION: fn_04507 -void CEfstAction_GROUND_GROW::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_GROUND_GROW::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { for (int index = 0; index < 12; ++index) { - g_effectMgr->Retire(actor->render.accountId, this->Slot05(efstId, index + 1)); + g_effectMgr->Retire(actor->render.accountId, this->GetEffectId(efstId, index + 1)); } } // OFFSET: 0x006224E0 // FUNCTION: fn_04508 -int CEfstAction_GROUND_GROW::Slot05(int efstId, int argument4) { +int CEfstAction_GROUND_GROW::GetEffectId(int efstId, int argument4) { const int step = argument4 - 1; if (step < 0 || step > 11) { return -1; @@ -727,19 +727,19 @@ int CEfstAction_GROUND_GROW::Slot05(int efstId, int argument4) { // OFFSET: 0x00622920 // FUNCTION: fn_04509 -EfstActionMessage CEfstAction_NATURE_PROTECTION::Slot03() { +EfstActionMessage CEfstAction_NATURE_PROTECTION::GetEfstBeginMessage() { return {LookupMessage(4666), 0xFFFF00}; } // OFFSET: 0x00622950 // FUNCTION: fn_04510 -EfstActionMessage CEfstAction_NATURE_PROTECTION::Slot04() { +EfstActionMessage CEfstAction_NATURE_PROTECTION::GetEfstEndMessage() { return {LookupMessage(4667), 0xFF}; } // OFFSET: 0x00622980 // FUNCTION: fn_04511 -int CEfstAction_NATURE_PROTECTION::Slot05(int efstId, int argument4) { +int CEfstAction_NATURE_PROTECTION::GetEffectId(int efstId, int argument4) { const char effectSource[] = {'\xAD', '\xA2', '\xA1', '\xFE', '\x29', '\x8E', '\x60', '\xFB', '\xB1', '\xAC', '\xA1', '\xEE', '\x38', '\x9F', '\x56', '\xE4', '\xAD', '\xC3'}; thread_local EncryptedName effectName(effectSource); return CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()); @@ -747,33 +747,33 @@ int CEfstAction_NATURE_PROTECTION::Slot05(int efstId, int argument4) { // OFFSET: 0x00622B20 // FUNCTION: fn_04512 -void CEfstAction_NATURE_PROTECTION::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_NATURE_PROTECTION::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { static_cast(actor)->ApplyNatureProtection(); } - CEfstAction_BasicAction::Slot00(efstId, value, argument3, argument4, actor, argument6); + CEfstAction_BasicAction::OnEfstBegin(efstId, value, argument3, argument4, actor, argument6); } // OFFSET: 0x00622B60 // FUNCTION: fn_04513 -void CEfstAction_NATURE_PROTECTION::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_NATURE_PROTECTION::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { static_cast(actor)->ApplyPendingUnknown0408(); } - CEfstAction_BasicAction::Slot01(efstId, argument2, argument3, argument4, actor); + CEfstAction_BasicAction::OnEfstEnd(efstId, argument2, argument3, argument4, actor); } // OFFSET: 0x00622B90 // FUNCTION: fn_04514 -void CEfstAction_THUNDERING_ROD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_THUNDERING_ROD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { for (int index = 0; index < 6; ++index) { - g_effectMgr->Retire(actor->render.accountId, this->Slot05(efstId, index + 1)); + g_effectMgr->Retire(actor->render.accountId, this->GetEffectId(efstId, index + 1)); } } // OFFSET: 0x00622BD0 // FUNCTION: fn_04515 -int CEfstAction_THUNDERING_ROD::Slot05(int efstId, int argument4) { +int CEfstAction_THUNDERING_ROD::GetEffectId(int efstId, int argument4) { const int step = argument4 - 1; if (static_cast(step) > 5) { return -1; @@ -787,19 +787,19 @@ int CEfstAction_THUNDERING_ROD::Slot05(int efstId, int argument4) { // OFFSET: 0x00622DD0 // FUNCTION: fn_04516 -EfstActionMessage CEfstAction_THUNDERING_ROD_MAX::Slot03() { +EfstActionMessage CEfstAction_THUNDERING_ROD_MAX::GetEfstBeginMessage() { return {LookupMessage(4688), 0xFFFF00}; } // OFFSET: 0x00622E00 // FUNCTION: fn_04517 -EfstActionMessage CEfstAction_THUNDERING_ROD_MAX::Slot04() { +EfstActionMessage CEfstAction_THUNDERING_ROD_MAX::GetEfstEndMessage() { return {LookupMessage(4689), 0xFF}; } // OFFSET: 0x00622E30 // FUNCTION: fn_04518 -int CEfstAction_THUNDERING_ROD_MAX::Slot05(int efstId, int argument4) { +int CEfstAction_THUNDERING_ROD_MAX::GetEffectId(int efstId, int argument4) { const char effectSource[] = {'\x5B', '\xF7', '\xC6', '\xB5', '\x8B', '\xAC', '\x65', '\xF2', '\x41', '\xF8', '\xEC', '\xA9', '\x80', '\xAD', '\x48', '\xFD', '\x5A', '\xF3', '\xDF', '\xDB'}; thread_local EncryptedName effectName(effectSource); return CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()); @@ -807,19 +807,19 @@ int CEfstAction_THUNDERING_ROD_MAX::Slot05(int efstId, int argument4) { // OFFSET: 0x00622FD0 // FUNCTION: fn_04519 -int CSkillAction_DR_TRUTH_OF_EARTH::Slot01() { +int CSkillAction_DR_TRUTH_OF_EARTH::GetSkillCastMotion() { return 61; } // OFFSET: 0x00622FE0 // FUNCTION: fn_04520 -int CSkillAction_DR_TRUTH_OF_EARTH::Slot02() { +int CSkillAction_DR_TRUTH_OF_EARTH::GetSkillAttackMotion() { return 63; } // OFFSET: 0x00622FF0 // FUNCTION: fn_04521 -void CSkillAction_DR_TRUTH_OF_EARTH::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_TRUTH_OF_EARTH::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(57, level / 16); } @@ -827,7 +827,7 @@ void CSkillAction_DR_TRUTH_OF_EARTH::Slot08(int level, CGameActor* source) { // OFFSET: 0x00623020 // FUNCTION: fn_04522 -void CSkillAction_DR_TRUTH_OF_EARTH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_TRUTH_OF_EARTH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -843,31 +843,31 @@ void CSkillAction_DR_TRUTH_OF_EARTH::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x006233D0 // FUNCTION: fn_04523 -EfstActionMessage CEfstAction_TRUTH_OF_EARTH::Slot03() { +EfstActionMessage CEfstAction_TRUTH_OF_EARTH::GetEfstBeginMessage() { return {LookupMessage(4654), 0xFFFF00}; } // OFFSET: 0x00623400 // FUNCTION: fn_04524 -EfstActionMessage CEfstAction_TRUTH_OF_EARTH::Slot04() { +EfstActionMessage CEfstAction_TRUTH_OF_EARTH::GetEfstEndMessage() { return {LookupMessage(4655), 0xFF}; } // OFFSET: 0x00623430 // FUNCTION: fn_04525 -int CSkillAction_DR_TRUTH_OF_ICE::Slot01() { +int CSkillAction_DR_TRUTH_OF_ICE::GetSkillCastMotion() { return 61; } // OFFSET: 0x00623440 // FUNCTION: fn_04526 -int CSkillAction_DR_TRUTH_OF_ICE::Slot02() { +int CSkillAction_DR_TRUTH_OF_ICE::GetSkillAttackMotion() { return 65; } // OFFSET: 0x00623450 // FUNCTION: fn_04527 -void CSkillAction_DR_TRUTH_OF_ICE::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_TRUTH_OF_ICE::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(54, level / 16); } @@ -875,7 +875,7 @@ void CSkillAction_DR_TRUTH_OF_ICE::Slot08(int level, CGameActor* source) { // OFFSET: 0x00623480 // FUNCTION: fn_04528 -void CSkillAction_DR_TRUTH_OF_ICE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_TRUTH_OF_ICE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -893,31 +893,31 @@ void CSkillAction_DR_TRUTH_OF_ICE::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x00623820 // FUNCTION: fn_04529 -EfstActionMessage CEfstAction_TRUTH_OF_ICE::Slot03() { +EfstActionMessage CEfstAction_TRUTH_OF_ICE::GetEfstBeginMessage() { return {LookupMessage(4658), 0xFFFF00}; } // OFFSET: 0x00623850 // FUNCTION: fn_04530 -EfstActionMessage CEfstAction_TRUTH_OF_ICE::Slot04() { +EfstActionMessage CEfstAction_TRUTH_OF_ICE::GetEfstEndMessage() { return {LookupMessage(4659), 0xFF}; } // OFFSET: 0x00623880 // FUNCTION: fn_04531 -int CSkillAction_DR_TRUTH_OF_WIND::Slot01() { +int CSkillAction_DR_TRUTH_OF_WIND::GetSkillCastMotion() { return 61; } // OFFSET: 0x00623890 // FUNCTION: fn_04532 -int CSkillAction_DR_TRUTH_OF_WIND::Slot02() { +int CSkillAction_DR_TRUTH_OF_WIND::GetSkillAttackMotion() { return 65; } // OFFSET: 0x006238A0 // FUNCTION: fn_04533 -void CSkillAction_DR_TRUTH_OF_WIND::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_TRUTH_OF_WIND::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -925,7 +925,7 @@ void CSkillAction_DR_TRUTH_OF_WIND::Slot08(int level, CGameActor* source) { // OFFSET: 0x006238D0 // FUNCTION: fn_04534 -void CSkillAction_DR_TRUTH_OF_WIND::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_TRUTH_OF_WIND::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -943,31 +943,31 @@ void CSkillAction_DR_TRUTH_OF_WIND::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x00623C70 // FUNCTION: fn_04535 -EfstActionMessage CEfstAction_TRUTH_OF_WIND::Slot03() { +EfstActionMessage CEfstAction_TRUTH_OF_WIND::GetEfstBeginMessage() { return {LookupMessage(4656), 0xFFFF00}; } // OFFSET: 0x00623CA0 // FUNCTION: fn_04536 -EfstActionMessage CEfstAction_TRUTH_OF_WIND::Slot04() { +EfstActionMessage CEfstAction_TRUTH_OF_WIND::GetEfstEndMessage() { return {LookupMessage(4657), 0xFF}; } // OFFSET: 0x00623CD0 // FUNCTION: fn_04537 -int CSkillAction_DR_CUTTING_WIND::Slot01() { +int CSkillAction_DR_CUTTING_WIND::GetSkillCastMotion() { return 61; } // OFFSET: 0x00623CE0 // FUNCTION: fn_04538 -int CSkillAction_DR_CUTTING_WIND::Slot02() { +int CSkillAction_DR_CUTTING_WIND::GetSkillAttackMotion() { return 64; } // OFFSET: 0x00623CF0 // FUNCTION: fn_04539 -void CSkillAction_DR_CUTTING_WIND::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_CUTTING_WIND::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -975,7 +975,7 @@ void CSkillAction_DR_CUTTING_WIND::Slot08(int level, CGameActor* source) { // OFFSET: 0x00623D20 // FUNCTION: fn_04540 -void CSkillAction_DR_CUTTING_WIND::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_CUTTING_WIND::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !source) { return; } @@ -983,13 +983,13 @@ void CSkillAction_DR_CUTTING_WIND::Slot11(int level, CGameActor* source, CGameAc const char effectSource[] = {'\x70', '\xB2', '\x77', '\x61', '\x92', '\xFF', '\x70', '\x10', '\x64', '\xAE', '\x6D', '\x71', '\xFB'}; thread_local EncryptedName effectName(effectSource); if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(ScreenAngle(&target->render.position.x, &source->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values)); + effect->SetAngle(ScreenAngle(&target->render.position.x, &source->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values)); } } // OFFSET: 0x00623F70 // FUNCTION: fn_04541 -void CSkillAction_DR_CUTTING_WIND::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_CUTTING_WIND::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1002,19 +1002,19 @@ void CSkillAction_DR_CUTTING_WIND::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x00624170 // FUNCTION: fn_04542 -int CSkillAction_DR_WIND_BOMB::Slot01() { +int CSkillAction_DR_WIND_BOMB::GetSkillCastMotion() { return 61; } // OFFSET: 0x00624180 // FUNCTION: fn_04543 -int CSkillAction_DR_WIND_BOMB::Slot02() { +int CSkillAction_DR_WIND_BOMB::GetSkillAttackMotion() { return 64; } // OFFSET: 0x00624190 // FUNCTION: fn_04544 -void CSkillAction_DR_WIND_BOMB::Slot08(int level, CGameActor* source) { +void CSkillAction_DR_WIND_BOMB::OnSkillCast(int level, CGameActor* source) { if (source) { source->LaunchEffect(56, level / 16); } @@ -1022,7 +1022,7 @@ void CSkillAction_DR_WIND_BOMB::Slot08(int level, CGameActor* source) { // OFFSET: 0x006241C0 // FUNCTION: fn_04545 -void CSkillAction_DR_WIND_BOMB::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_WIND_BOMB::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -1034,13 +1034,13 @@ void CSkillAction_DR_WIND_BOMB::Slot11(int level, CGameActor* source, CGameActor const char effectSource[] = {'\x76', '\x3E', '\xF9', '\xBB', '\x4C', '\xE7', '\x3C', '\xBC', '\x63', '\x08', '\xFA', '\xBE', '\x7A', '\xEB', '\x53'}; thread_local EncryptedName effectName(effectSource); if (CEffect* effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(300); + effect->SetDelay(300); } } // OFFSET: 0x00624430 // FUNCTION: fn_04546 -void CSkillAction_DR_WIND_BOMB::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_WIND_BOMB::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1053,7 +1053,7 @@ void CSkillAction_DR_WIND_BOMB::Slot16(int level, CGameActor* source, CGameActor // OFFSET: 0x00624640 // FUNCTION: fn_04547 -void CSkillAction_DR_AROUND_FLOWER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_AROUND_FLOWER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1071,7 +1071,7 @@ void CSkillAction_DR_AROUND_FLOWER::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x006249E0 // FUNCTION: fn_04548 -void CSkillAction_DR_EARTH_FLOWER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_EARTH_FLOWER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -1089,7 +1089,7 @@ void CSkillAction_DR_EARTH_FLOWER::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x00624D80 // FUNCTION: fn_04549 -void CSkillAction_DR_ICE_CLOUD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_ICE_CLOUD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -1101,7 +1101,7 @@ void CSkillAction_DR_ICE_CLOUD::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00624F80 // FUNCTION: fn_04550 -void CSkillAction_DR_ICE_TOTEM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_ICE_TOTEM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -1113,17 +1113,17 @@ void CSkillAction_DR_ICE_TOTEM::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00625180 // FUNCTION: fn_04551 -int CSkillAction_DR_WEREWOLF::Slot02() { +int CSkillAction_DR_WEREWOLF::GetSkillAttackMotion() { return 64; } // OFFSET: 0x00625190 // FUNCTION: fn_04552 -void CSkillAction_DR_WEREWOLF::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_WEREWOLF::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } - if (this->Slot17(source) == true) { + if (this->IsInForm(source) == true) { return; } @@ -1134,19 +1134,19 @@ void CSkillAction_DR_WEREWOLF::Slot11(int level, CGameActor* source, CGameActor* // OFFSET: 0x006253A0 // FUNCTION: fn_04553 -EfstActionMessage CEfstAction_WEREWOLF::Slot03() { +EfstActionMessage CEfstAction_WEREWOLF::GetEfstBeginMessage() { return {LookupMessage(4642), 0xFFFF00}; } // OFFSET: 0x006253D0 // FUNCTION: fn_04554 -EfstActionMessage CEfstAction_WEREWOLF::Slot04() { +EfstActionMessage CEfstAction_WEREWOLF::GetEfstEndMessage() { return {LookupMessage(4643), 0xFF}; } // OFFSET: 0x00620270 // FUNCTION: fn_04466 -void CSkillAction_DR_ENRAGE_WOLF::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_ENRAGE_WOLF::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1159,7 +1159,7 @@ void CSkillAction_DR_ENRAGE_WOLF::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x00620530 // FUNCTION: fn_04472 -void CSkillAction_DR_BLOOD_HOWLING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_BLOOD_HOWLING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1171,7 +1171,7 @@ void CSkillAction_DR_BLOOD_HOWLING::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x006207B0 // FUNCTION: fn_04476 -void CSkillAction_DR_NOMERCY_CLAW::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_NOMERCY_CLAW::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1183,7 +1183,7 @@ void CSkillAction_DR_NOMERCY_CLAW::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x006210B0 // FUNCTION: fn_04485 -void CSkillAction_DR_ENRAGE_RAPTOR::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_ENRAGE_RAPTOR::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1195,7 +1195,7 @@ void CSkillAction_DR_ENRAGE_RAPTOR::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x00621370 // FUNCTION: fn_04491 -void CSkillAction_DR_PREENING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_PREENING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1207,7 +1207,7 @@ void CSkillAction_DR_PREENING::Slot11(int level, CGameActor* source, CGameActor* // OFFSET: 0x00620DF0 // FUNCTION: fn_04481 -void CSkillAction_DR_CRUEL_BITE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_CRUEL_BITE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !this->CanUse(source)) { return; } @@ -1224,7 +1224,7 @@ void CSkillAction_DR_CRUEL_BITE::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x006215E0 // FUNCTION: fn_04495 -void CSkillAction_DR_SHOOTING_FEATHER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_SHOOTING_FEATHER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !this->CanUse(source)) { return; } @@ -1233,30 +1233,30 @@ void CSkillAction_DR_SHOOTING_FEATHER::Slot11(int level, CGameActor* source, CGa thread_local EncryptedName effectName(effectSource); EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values)); + effect->SetAngle(ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values)); } } // OFFSET: 0x00621830 // FUNCTION: fn_04496 -void CSkillAction_DR_SHOOTING_FEATHER::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DR_SHOOTING_FEATHER::OnSkillHit(int level, CGameActor* source, CGameActor* target) { this->SpawnAttack00Effect(level, source); } // OFFSET: 0x0061FF40 // FUNCTION: fn_04457 -void CEfstAction_WEREWOLF::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_WEREWOLF::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { this->ApplyAnimalForm(actor, 1); - static_cast(actor)->Slot32(); + static_cast(actor)->SetBodyPaletteName(); } } // OFFSET: 0x006201F0 // FUNCTION: fn_04462 -void CEfstAction_WERERAPTOR::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_WERERAPTOR::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { this->ApplyAnimalForm(actor, 2); - static_cast(actor)->Slot32(); + static_cast(actor)->SetBodyPaletteName(); } } diff --git a/Source/Contents/Skills/SkillActionImperialGuard.cpp b/Source/Contents/Skills/SkillActionImperialGuard.cpp index 8c8d80c7c..9c25369ec 100644 --- a/Source/Contents/Skills/SkillActionImperialGuard.cpp +++ b/Source/Contents/Skills/SkillActionImperialGuard.cpp @@ -21,136 +21,136 @@ class CSkillAction_IG_GUARDIAN_SHIELD : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IG_GUARDIAN_SHIELD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_IG_HOLY_SHIELD : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IG_HOLY_SHIELD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_IG_JUDGEMENT_CROSS : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_OVERSLASH : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_REBOUND_SHIELD : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_REBOUND_S : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_IG_ULTIMATE_SACRIFICE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IG_ULTIMATE_SACRIFICE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_IG_IMPERIAL_CROSS : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_RADIANT_SPEAR : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_IMPERIAL_PRESSURE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_SHIELD_SHOOTING : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_ATTACK_STANCE : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IG_ATTACK_STANCE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_IG_GUARD_STANCE : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IG_GUARD_STANCE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; // OFFSET: 0x00787A30 // FUNCTION: fn_08590 -void CSkillAction_IG_GUARDIAN_SHIELD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_GUARDIAN_SHIELD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guardianshield"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -161,7 +161,7 @@ void CSkillAction_IG_GUARDIAN_SHIELD::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x00787CC0 // FUNCTION: fn_08591 -void CEfstAction_IG_GUARDIAN_SHIELD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_IG_GUARDIAN_SHIELD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guardianshield_buff_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -172,7 +172,7 @@ void CEfstAction_IG_GUARDIAN_SHIELD::Slot00(int efstId, int value, int argument3 // OFFSET: 0x00787F60 // FUNCTION: fn_08592 -void CEfstAction_IG_GUARDIAN_SHIELD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_IG_GUARDIAN_SHIELD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guardianshield_buff_loop")); @@ -181,43 +181,43 @@ void CEfstAction_IG_GUARDIAN_SHIELD::Slot01(int efstId, int argument2, int argum // OFFSET: 0x007880A0 // FUNCTION: fn_08593 -void CEfstAction_IG_GUARDIAN_SHIELD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_IG_GUARDIAN_SHIELD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007880C0 // FUNCTION: fn_08594 -EfstActionMessage CEfstAction_IG_GUARDIAN_SHIELD::Slot03() { +EfstActionMessage CEfstAction_IG_GUARDIAN_SHIELD::GetEfstBeginMessage() { return {LookupMessage(3752), 0xFFFF00}; } // OFFSET: 0x007880F0 // FUNCTION: fn_08595 -EfstActionMessage CEfstAction_IG_GUARDIAN_SHIELD::Slot04() { +EfstActionMessage CEfstAction_IG_GUARDIAN_SHIELD::GetEfstEndMessage() { return {LookupMessage(3753), 0xFF}; } // OFFSET: 0x00788120 // FUNCTION: fn_08596 -void CSkillAction_IG_HOLY_SHIELD::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_HOLY_SHIELD::OnSkillCast(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_holy_shield_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_holy_shield_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x007883D0 // FUNCTION: fn_08597 -void CSkillAction_IG_HOLY_SHIELD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_HOLY_SHIELD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_holy_shield"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -228,7 +228,7 @@ void CSkillAction_IG_HOLY_SHIELD::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x00788650 // FUNCTION: fn_08598 -void CEfstAction_IG_HOLY_SHIELD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_IG_HOLY_SHIELD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_holy_shield_loop"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -239,7 +239,7 @@ void CEfstAction_IG_HOLY_SHIELD::Slot00(int efstId, int value, int argument3, in // OFFSET: 0x007888E0 // FUNCTION: fn_08599 -void CEfstAction_IG_HOLY_SHIELD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_IG_HOLY_SHIELD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_holy_shield_loop")); @@ -250,25 +250,25 @@ void CEfstAction_IG_HOLY_SHIELD::Slot01(int efstId, int argument2, int argument3 // OFFSET: 0x00788B00 // FUNCTION: fn_08600 -void CEfstAction_IG_HOLY_SHIELD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_IG_HOLY_SHIELD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00788B20 // FUNCTION: fn_08601 -EfstActionMessage CEfstAction_IG_HOLY_SHIELD::Slot03() { +EfstActionMessage CEfstAction_IG_HOLY_SHIELD::GetEfstBeginMessage() { return {LookupMessage(3756), 0xFFFF00}; } // OFFSET: 0x00788B50 // FUNCTION: fn_08602 -EfstActionMessage CEfstAction_IG_HOLY_SHIELD::Slot04() { +EfstActionMessage CEfstAction_IG_HOLY_SHIELD::GetEfstEndMessage() { return {LookupMessage(3757), 0xFF}; } // OFFSET: 0x00788B90 // FUNCTION: fn_08604 -void CSkillAction_IG_JUDGEMENT_CROSS::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_JUDGEMENT_CROSS::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -277,20 +277,20 @@ void CSkillAction_IG_JUDGEMENT_CROSS::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_judgement_cross_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_judgement_cross_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x00788E50 // FUNCTION: fn_08605 -void CSkillAction_IG_JUDGEMENT_CROSS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_JUDGEMENT_CROSS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && target) { const vector3d position = source->render.position; EffectLists* effects = g_effectMgr; @@ -301,7 +301,7 @@ void CSkillAction_IG_JUDGEMENT_CROSS::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x00788FE0 // FUNCTION: fn_08606 -void CSkillAction_IG_JUDGEMENT_CROSS::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_JUDGEMENT_CROSS::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("new_judgement_cross_bottom"), source->render.position.x, @@ -314,7 +314,7 @@ void CSkillAction_IG_JUDGEMENT_CROSS::Slot15(int level, CGameActor* source, CGam // OFFSET: 0x00789260 // FUNCTION: fn_08607 -void CSkillAction_IG_JUDGEMENT_CROSS::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_JUDGEMENT_CROSS::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_judgement_cross_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -322,7 +322,7 @@ void CSkillAction_IG_JUDGEMENT_CROSS::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x00789400 // FUNCTION: fn_08609 -void CSkillAction_IG_OVERSLASH::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_OVERSLASH::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -331,13 +331,13 @@ void CSkillAction_IG_OVERSLASH::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_overslash_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x00789590 // FUNCTION: fn_08610 -void CSkillAction_IG_OVERSLASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_OVERSLASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_overslash"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -348,7 +348,7 @@ void CSkillAction_IG_OVERSLASH::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00789800 // FUNCTION: fn_08611 -void CSkillAction_IG_OVERSLASH::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_OVERSLASH::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_overslash_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -357,7 +357,7 @@ void CSkillAction_IG_OVERSLASH::Slot16(int level, CGameActor* source, CGameActor // OFFSET: 0x00789980 // FUNCTION: fn_08612 -void CSkillAction_IG_REBOUND_SHIELD::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_REBOUND_SHIELD::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -366,20 +366,20 @@ void CSkillAction_IG_REBOUND_SHIELD::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_rebound_shield_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_rebound_shield_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x00789C50 // FUNCTION: fn_08613 -void CSkillAction_IG_REBOUND_SHIELD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_REBOUND_SHIELD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_rebound_shield"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -390,19 +390,19 @@ void CSkillAction_IG_REBOUND_SHIELD::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x00789EE0 // FUNCTION: fn_08614 -EfstActionMessage CEfstAction_REBOUND_S::Slot03() { +EfstActionMessage CEfstAction_REBOUND_S::GetEfstBeginMessage() { return {LookupMessage(3754), 0xFFFF00}; } // OFFSET: 0x00789F10 // FUNCTION: fn_08615 -EfstActionMessage CEfstAction_REBOUND_S::Slot04() { +EfstActionMessage CEfstAction_REBOUND_S::GetEfstEndMessage() { return {LookupMessage(3755), 0xFF}; } // OFFSET: 0x00789F40 // FUNCTION: fn_08616 -void CSkillAction_IG_ULTIMATE_SACRIFICE::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_ULTIMATE_SACRIFICE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); g_soundMgr->PlayWave("effect\\EF_BeginSpell.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); @@ -411,7 +411,7 @@ void CSkillAction_IG_ULTIMATE_SACRIFICE::Slot08(int level, CGameActor* source) { // OFFSET: 0x00789FA0 // FUNCTION: fn_08617 -void CSkillAction_IG_ULTIMATE_SACRIFICE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_ULTIMATE_SACRIFICE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ultimatesacrifice_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -422,7 +422,7 @@ void CSkillAction_IG_ULTIMATE_SACRIFICE::Slot11(int level, CGameActor* source, C // OFFSET: 0x0078A220 // FUNCTION: fn_08618 -void CEfstAction_IG_ULTIMATE_SACRIFICE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_IG_ULTIMATE_SACRIFICE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ultimate_sacrifice_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -430,7 +430,7 @@ void CEfstAction_IG_ULTIMATE_SACRIFICE::Slot00(int efstId, int value, int argume // OFFSET: 0x0078A3B0 // FUNCTION: fn_08619 -void CEfstAction_IG_ULTIMATE_SACRIFICE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_IG_ULTIMATE_SACRIFICE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ultimate_sacrifice_buff")); @@ -439,13 +439,13 @@ void CEfstAction_IG_ULTIMATE_SACRIFICE::Slot01(int efstId, int argument2, int ar // OFFSET: 0x0078A500 // FUNCTION: fn_08620 -void CEfstAction_IG_ULTIMATE_SACRIFICE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_IG_ULTIMATE_SACRIFICE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0078A530 // FUNCTION: fn_08622 -void CSkillAction_IG_IMPERIAL_CROSS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_IMPERIAL_CROSS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("imperial_cross"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -454,7 +454,7 @@ void CSkillAction_IG_IMPERIAL_CROSS::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x0078A6A0 // FUNCTION: fn_08623 -void CSkillAction_IG_IMPERIAL_CROSS::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_IMPERIAL_CROSS::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("imperial_cross_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -463,7 +463,7 @@ void CSkillAction_IG_IMPERIAL_CROSS::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x0078A830 // FUNCTION: fn_08625 -void CSkillAction_IG_RADIANT_SPEAR::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_RADIANT_SPEAR::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -472,13 +472,13 @@ void CSkillAction_IG_RADIANT_SPEAR::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("radiant_spear_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x0078A9C0 // FUNCTION: fn_08626 -void CSkillAction_IG_RADIANT_SPEAR::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_RADIANT_SPEAR::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -500,7 +500,7 @@ void CSkillAction_IG_RADIANT_SPEAR::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x0078AC80 // FUNCTION: fn_08627 -void CSkillAction_IG_RADIANT_SPEAR::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_RADIANT_SPEAR::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("radiant_spear_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -509,7 +509,7 @@ void CSkillAction_IG_RADIANT_SPEAR::Slot16(int level, CGameActor* source, CGameA // OFFSET: 0x0078AE00 // FUNCTION: fn_08628 -void CSkillAction_IG_IMPERIAL_PRESSURE::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_IMPERIAL_PRESSURE::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -518,13 +518,13 @@ void CSkillAction_IG_IMPERIAL_PRESSURE::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("imperal_pressure_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x0078AF90 // FUNCTION: fn_08629 -void CSkillAction_IG_IMPERIAL_PRESSURE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_IMPERIAL_PRESSURE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("imperial_pressure"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -535,7 +535,7 @@ void CSkillAction_IG_IMPERIAL_PRESSURE::Slot11(int level, CGameActor* source, CG // OFFSET: 0x0078B210 // FUNCTION: fn_08630 -void CSkillAction_IG_IMPERIAL_PRESSURE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_IMPERIAL_PRESSURE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("imperial_pressure_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -544,18 +544,18 @@ void CSkillAction_IG_IMPERIAL_PRESSURE::Slot16(int level, CGameActor* source, CG // OFFSET: 0x0078B3A0 // FUNCTION: fn_08632 -void CSkillAction_IG_SHIELD_SHOOTING::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_SHIELD_SHOOTING::OnSkillCast(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shield_shooting_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x0078B520 // FUNCTION: fn_08633 -void CSkillAction_IG_SHIELD_SHOOTING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_SHIELD_SHOOTING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -570,7 +570,7 @@ void CSkillAction_IG_SHIELD_SHOOTING::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x0078B5E0 // FUNCTION: fn_08634 -void CSkillAction_IG_SHIELD_SHOOTING::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_SHIELD_SHOOTING::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shield_shooting_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -579,13 +579,13 @@ void CSkillAction_IG_SHIELD_SHOOTING::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x0078B760 // FUNCTION: fn_08635 -int CSkillAction_IG_ATTACK_STANCE::Slot02() { +int CSkillAction_IG_ATTACK_STANCE::GetSkillAttackMotion() { return 7; } // OFFSET: 0x0078B770 // FUNCTION: fn_08636 -void CSkillAction_IG_ATTACK_STANCE::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_ATTACK_STANCE::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -597,20 +597,20 @@ void CSkillAction_IG_ATTACK_STANCE::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_attack_stance_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level - 100); + effect->SetLifeTime(level - 100); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_attack_stance_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level - 100); + effect->SetLifeTime(level - 100); } } // OFFSET: 0x0078BB40 // FUNCTION: fn_08637 -void CSkillAction_IG_ATTACK_STANCE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_ATTACK_STANCE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_attack_stance"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -619,7 +619,7 @@ void CSkillAction_IG_ATTACK_STANCE::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x0078BCC0 // FUNCTION: fn_08638 -void CEfstAction_IG_ATTACK_STANCE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_IG_ATTACK_STANCE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_attack_stance_loop_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -628,7 +628,7 @@ void CEfstAction_IG_ATTACK_STANCE::Slot00(int efstId, int value, int argument3, // OFFSET: 0x0078BE50 // FUNCTION: fn_08639 -void CEfstAction_IG_ATTACK_STANCE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_IG_ATTACK_STANCE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_attack_stance_loop_bottom")); @@ -637,31 +637,31 @@ void CEfstAction_IG_ATTACK_STANCE::Slot01(int efstId, int argument2, int argumen // OFFSET: 0x0078BFA0 // FUNCTION: fn_08640 -void CEfstAction_IG_ATTACK_STANCE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_IG_ATTACK_STANCE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0078BFC0 // FUNCTION: fn_08641 -EfstActionMessage CEfstAction_IG_ATTACK_STANCE::Slot03() { +EfstActionMessage CEfstAction_IG_ATTACK_STANCE::GetEfstBeginMessage() { return {LookupMessage(3748), 0xFFFF00}; } // OFFSET: 0x0078BFF0 // FUNCTION: fn_08642 -EfstActionMessage CEfstAction_IG_ATTACK_STANCE::Slot04() { +EfstActionMessage CEfstAction_IG_ATTACK_STANCE::GetEfstEndMessage() { return {LookupMessage(3749), 0xFF}; } // OFFSET: 0x0078C020 // FUNCTION: fn_08643 -int CSkillAction_IG_GUARD_STANCE::Slot02() { +int CSkillAction_IG_GUARD_STANCE::GetSkillAttackMotion() { return 7; } // OFFSET: 0x0078C030 // FUNCTION: fn_08644 -void CSkillAction_IG_GUARD_STANCE::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_GUARD_STANCE::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -673,20 +673,20 @@ void CSkillAction_IG_GUARD_STANCE::Slot08(int level, CGameActor* source) { CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guard_stance_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level - 100); + effect->SetLifeTime(level - 100); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guard_stance_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level - 100); + effect->SetLifeTime(level - 100); } } // OFFSET: 0x0078C400 // FUNCTION: fn_08645 -void CSkillAction_IG_GUARD_STANCE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_GUARD_STANCE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guard_stance"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -695,7 +695,7 @@ void CSkillAction_IG_GUARD_STANCE::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x0078C570 // FUNCTION: fn_08646 -void CEfstAction_IG_GUARD_STANCE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_IG_GUARD_STANCE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guard_stance_loop_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -704,31 +704,31 @@ void CEfstAction_IG_GUARD_STANCE::Slot00(int efstId, int value, int argument3, i class CSkillAction_IG_CROSS_RAIN : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - int Slot14() override; + void OnSkillCast(int level, CGameActor* source) override; + int GetSkillScopeType() override; }; class CSkillObjectAction_IG_CROSS_RAIN : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_IG_GRAND_JUDGEMENT : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IG_GRAND_JUDGEMENT : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; // OFFSET: 0x00786AA0 // FUNCTION: fn_08579 -void CSkillAction_IG_CROSS_RAIN::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_CROSS_RAIN::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -736,24 +736,24 @@ void CSkillAction_IG_CROSS_RAIN::Slot08(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_cross_rain_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_cross_rain_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x00786D50 // FUNCTION: fn_08580 -int CSkillAction_IG_CROSS_RAIN::Slot14() { +int CSkillAction_IG_CROSS_RAIN::GetSkillScopeType() { return 9; } // OFFSET: 0x00786D60 // FUNCTION: fn_08581 -void CSkillObjectAction_IG_CROSS_RAIN::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_IG_CROSS_RAIN::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object && source) { g_effectMgr->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_cross_rain_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(object->render.accountId, 2462, object->render.position.x, object->render.position.y, object->render.position.z, 0, argument, 0, 0); @@ -762,7 +762,7 @@ void CSkillObjectAction_IG_CROSS_RAIN::Slot00(int argument, CRenderObject* objec // OFFSET: 0x00786F30 // FUNCTION: fn_08583 -void CSkillAction_IG_GRAND_JUDGEMENT::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_GRAND_JUDGEMENT::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -770,18 +770,18 @@ void CSkillAction_IG_GRAND_JUDGEMENT::Slot08(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_grand_judgement_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_grand_judgement_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x007871F0 // FUNCTION: fn_08584 -void CSkillAction_IG_GRAND_JUDGEMENT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IG_GRAND_JUDGEMENT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -813,14 +813,14 @@ void CSkillAction_IG_GRAND_JUDGEMENT::Slot11(int level, CGameActor* source, CGam } CEffect* effect = g_effectMgr->Spawn(0, subEffectId, x, y, z, 0, -1, 0, 0); if (effect) { - effect->Slot16(140 * (index + 1)); + effect->SetDelay(140 * (index + 1)); } } } // OFFSET: 0x007876E0 // FUNCTION: fn_08585 -void CEfstAction_IG_GRAND_JUDGEMENT::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_IG_GRAND_JUDGEMENT::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_grand_judgement_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -829,7 +829,7 @@ void CEfstAction_IG_GRAND_JUDGEMENT::Slot00(int efstId, int value, int argument3 // OFFSET: 0x00787860 // FUNCTION: fn_08586 -void CEfstAction_IG_GRAND_JUDGEMENT::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_IG_GRAND_JUDGEMENT::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_grand_judgement_buff")); @@ -838,13 +838,13 @@ void CEfstAction_IG_GRAND_JUDGEMENT::Slot01(int efstId, int argument2, int argum // OFFSET: 0x007879A0 // FUNCTION: fn_08587 -void CEfstAction_IG_GRAND_JUDGEMENT::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_IG_GRAND_JUDGEMENT::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007879D0 // FUNCTION: fn_08589 -void CSkillAction_IG_GUARDIAN_SHIELD::Slot08(int level, CGameActor* source) { +void CSkillAction_IG_GUARDIAN_SHIELD::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); g_soundMgr->PlayWave("effect\\EF_BeginSpell.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); @@ -853,7 +853,7 @@ void CSkillAction_IG_GUARDIAN_SHIELD::Slot08(int level, CGameActor* source) { // OFFSET: 0x0078C6F0 // FUNCTION: fn_08647 -void CEfstAction_IG_GUARD_STANCE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_IG_GUARD_STANCE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_guard_stance_loop_bottom")); @@ -862,18 +862,18 @@ void CEfstAction_IG_GUARD_STANCE::Slot01(int efstId, int argument2, int argument // OFFSET: 0x0078C830 // FUNCTION: fn_08648 -void CEfstAction_IG_GUARD_STANCE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_IG_GUARD_STANCE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0078C850 // FUNCTION: fn_08649 -EfstActionMessage CEfstAction_IG_GUARD_STANCE::Slot03() { +EfstActionMessage CEfstAction_IG_GUARD_STANCE::GetEfstBeginMessage() { return {LookupMessage(3750), 0xFFFF00}; } // OFFSET: 0x0078C880 // FUNCTION: fn_08650 -EfstActionMessage CEfstAction_IG_GUARD_STANCE::Slot04() { +EfstActionMessage CEfstAction_IG_GUARD_STANCE::GetEfstEndMessage() { return {LookupMessage(3751), 0xFF}; } diff --git a/Source/Contents/Skills/SkillActionKarnos.cpp b/Source/Contents/Skills/SkillActionKarnos.cpp index c6ca2e58c..b9b2b10a0 100644 --- a/Source/Contents/Skills/SkillActionKarnos.cpp +++ b/Source/Contents/Skills/SkillActionKarnos.cpp @@ -92,175 +92,175 @@ class CSkillAction_Icing : public CSkillAction { class CSkillAction_KR_DOUBLE_SLASH : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_NASTY_SLASH : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_CLAW_WAVE : public CSkillAction_DamageWereWolfForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_KR_EARTH_DRILL : public CSkillAction_Earthing { public: - int Slot02() override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_EARTH_STAMP : public CSkillAction_Earthing { public: - int Slot02() override; - void Slot12(vector3d position, int argument2, int argument3) override; + int GetSkillAttackMotion() override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_KR_GROUND_BLOOM : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_THUNDERING_CALL : public CSkillAction_ThunderingBasic { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_THUNDERING_CALL_S : public CSkillAction_ThunderingExpand { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_THUNDERING_FOCUS : public CSkillAction_ThunderingBasic { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_THUNDERING_FOCUS_S : public CSkillAction_ThunderingExpand { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_THUNDERING_ORB : public CSkillAction_ThunderingBasic { public: - void Slot12(vector3d position, int argument2, int argument3) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_KR_THUNDERING_ORB_S : public CSkillAction_ThunderingExpand { public: - void Slot12(vector3d position, int argument2, int argument3) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_KR_ICE_SPLASH : public CSkillAction_Icing { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_ICE_PILLAR : public CSkillAction_Icing { public: - int Slot02() override; - int Slot14() override; + int GetSkillAttackMotion() override; + int GetSkillScopeType() override; }; class CSkillObjectAction_KR_ICE_PILLAR : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; class CSkillAction_KR_FEATHER_SPRINKLE : public CSkillAction_DamageWereRaptorForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_SHARPEN_GUST : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_SHARPEN_HAIL : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_KR_IRON_HOWLING : public CSkillAction_DamageWereWolfForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_IRON_HOWLING : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_KR_TYPHOON_WING : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int level, int argument5) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int level, int argument5) override; }; class CSkillAction_KR_WIND_VEIL : public CSkillAction_DamageWereRaptorForm { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; }; class CEfstAction_WIND_VEIL : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_SKID_KR_CHOP_CHOP : public CSkillAction_DamageWereWolfForm { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_CHOP_CHOP : public CEfstAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; }; // OFFSET: 0x005B0800 // FUNCTION: fn_03340 -int CSkillAction_KR_DOUBLE_SLASH::Slot02() { +int CSkillAction_KR_DOUBLE_SLASH::GetSkillAttackMotion() { return 72; } // OFFSET: 0x005B0810 // FUNCTION: fn_03341 -void CSkillAction_KR_DOUBLE_SLASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_DOUBLE_SLASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -273,25 +273,25 @@ void CSkillAction_KR_DOUBLE_SLASH::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005B0A10 // FUNCTION: fn_03342 -int CSkillAction_KR_NASTY_SLASH::Slot02() { +int CSkillAction_KR_NASTY_SLASH::GetSkillAttackMotion() { return 77; } // OFFSET: 0x005B0C80 // FUNCTION: fn_03344 -int CSkillAction_KR_CLAW_WAVE::Slot01() { +int CSkillAction_KR_CLAW_WAVE::GetSkillCastMotion() { return 60; } // OFFSET: 0x005B0C90 // FUNCTION: fn_03345 -int CSkillAction_KR_CLAW_WAVE::Slot02() { +int CSkillAction_KR_CLAW_WAVE::GetSkillAttackMotion() { return 71; } // OFFSET: 0x005B0CA0 // FUNCTION: fn_03346 -void CSkillAction_KR_CLAW_WAVE::Slot08(int level, CGameActor* source) { +void CSkillAction_KR_CLAW_WAVE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(54, level / 16); } @@ -299,7 +299,7 @@ void CSkillAction_KR_CLAW_WAVE::Slot08(int level, CGameActor* source) { // OFFSET: 0x005B0CD0 // FUNCTION: fn_03347 -void CSkillAction_KR_CLAW_WAVE::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_KR_CLAW_WAVE::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { const std::uint8_t effectSource[] = {0xD0, 0x0B, 0xA2, 0x24, 0xA6, 0xEC, 0x54, 0x61, 0xD6, 0x67}; thread_local EncryptedName effectName(effectSource); g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), position.x, position.y, position.z, 0, -1, 0, 0); @@ -307,13 +307,13 @@ void CSkillAction_KR_CLAW_WAVE::Slot12(vector3d position, int argument2, int arg // OFFSET: 0x005B0EA0 // FUNCTION: fn_03348 -int CSkillAction_KR_EARTH_DRILL::Slot02() { +int CSkillAction_KR_EARTH_DRILL::GetSkillAttackMotion() { return 62; } // OFFSET: 0x005B0EB0 // FUNCTION: fn_03349 -void CSkillAction_KR_EARTH_DRILL::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_EARTH_DRILL::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -329,13 +329,13 @@ void CSkillAction_KR_EARTH_DRILL::Slot15(int level, CGameActor* source, CGameAct // OFFSET: 0x005B1240 // FUNCTION: fn_03350 -int CSkillAction_KR_EARTH_STAMP::Slot02() { +int CSkillAction_KR_EARTH_STAMP::GetSkillAttackMotion() { return 63; } // OFFSET: 0x005B1250 // FUNCTION: fn_03351 -void CSkillAction_KR_EARTH_STAMP::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_KR_EARTH_STAMP::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { const char effectSource[] = {'\xB2', '\x2E', '\x71', '\xE1', '\xB1', '\xDA', '\xDC', '\x4B', '\xB6', '\x22', '\x73', '\x95'}; thread_local EncryptedName effectName(effectSource); g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), position.x, position.y, position.z, 0, -1, 0, 0); @@ -347,13 +347,13 @@ void CSkillAction_KR_EARTH_STAMP::Slot12(vector3d position, int argument2, int a // OFFSET: 0x005B1590 // FUNCTION: fn_03352 -int CSkillAction_KR_GROUND_BLOOM::Slot02() { +int CSkillAction_KR_GROUND_BLOOM::GetSkillAttackMotion() { return 0; } // OFFSET: 0x005B15A0 // FUNCTION: fn_03353 -void CSkillAction_KR_GROUND_BLOOM::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_GROUND_BLOOM::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -365,7 +365,7 @@ void CSkillAction_KR_GROUND_BLOOM::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x005B1610 // FUNCTION: fn_03354 -void CSkillAction_KR_GROUND_BLOOM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_GROUND_BLOOM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -384,7 +384,7 @@ void CSkillAction_KR_GROUND_BLOOM::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005B19B0 // FUNCTION: fn_03355 -void CSkillAction_KR_THUNDERING_CALL::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_THUNDERING_CALL::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -419,7 +419,7 @@ void CSkillAction_KR_THUNDERING_CALL::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x005B2010 // FUNCTION: fn_03356 -void CSkillAction_KR_THUNDERING_CALL_S::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_THUNDERING_CALL_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -454,13 +454,13 @@ void CSkillAction_KR_THUNDERING_CALL_S::Slot11(int level, CGameActor* source, CG // OFFSET: 0x005B2670 // FUNCTION: fn_03357 -int CSkillAction_KR_THUNDERING_FOCUS::Slot02() { +int CSkillAction_KR_THUNDERING_FOCUS::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005B2680 // FUNCTION: fn_03358 -void CSkillAction_KR_THUNDERING_FOCUS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_THUNDERING_FOCUS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -472,13 +472,13 @@ void CSkillAction_KR_THUNDERING_FOCUS::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x005B2880 // FUNCTION: fn_03359 -int CSkillAction_KR_THUNDERING_FOCUS_S::Slot02() { +int CSkillAction_KR_THUNDERING_FOCUS_S::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005B2890 // FUNCTION: fn_03360 -void CSkillAction_KR_THUNDERING_FOCUS_S::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_THUNDERING_FOCUS_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -490,7 +490,7 @@ void CSkillAction_KR_THUNDERING_FOCUS_S::Slot11(int level, CGameActor* source, C // OFFSET: 0x005B2A90 // FUNCTION: fn_03361 -void CSkillAction_KR_THUNDERING_ORB::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_KR_THUNDERING_ORB::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { CGameActor* const target = reinterpret_cast(argument3); if (!target) { return; @@ -503,20 +503,20 @@ void CSkillAction_KR_THUNDERING_ORB::Slot12(vector3d position, int argument2, in const char effectSource[] = {'\x47', '\x4F', '\x46', '\x61', '\xD9', '\x28', '\x4B', '\x44', '\x5D', '\x40', '\x6C', '\x60', '\xCF', '\x2F', '\x66', '\x4A', '\x33'}; thread_local EncryptedName effectName(effectSource); if (CEffect* effect = g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot16(300); + effect->SetDelay(300); } const char bottomSource[] = {'\x33', '\x49', '\xCE', '\x85', '\x8F', '\x12', '\x6D', '\x7C', '\x29', '\x46', '\xE4', '\x84', '\x99', '\x15', '\x40', '\x72', '\x18', '\x43', '\xD4', '\x9F', '\x9F', '\x18', '\x72', '\x15'}; thread_local EncryptedName bottomName(bottomSource); if (CEffect* effect = g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(bottomName.Text()), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot16(300); + effect->SetDelay(300); } } // OFFSET: 0x005B2E80 // FUNCTION: fn_03362 -void CSkillAction_KR_THUNDERING_ORB_S::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_KR_THUNDERING_ORB_S::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { CGameActor* const target = reinterpret_cast(argument3); if (!target) { return; @@ -529,20 +529,20 @@ void CSkillAction_KR_THUNDERING_ORB_S::Slot12(vector3d position, int argument2, const char effectSource[] = {'\xB5', '\xA7', '\xA6', '\x5D', '\xF3', '\x78', '\x8F', '\x00', '\xAF', '\xA8', '\x8C', '\x5C', '\xE5', '\x7F', '\xA2', '\x10', '\xC1'}; thread_local EncryptedName effectName(effectSource); if (CEffect* effect = g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot16(300); + effect->SetDelay(300); } const char bottomSource[] = {'\xB3', '\xA5', '\x90', '\x53', '\x7B', '\x18', '\x17', '\x9C', '\xA9', '\xAA', '\xBA', '\x52', '\x6D', '\x1F', '\x3A', '\x8C', '\x98', '\xAF', '\x8A', '\x49', '\x6B', '\x12', '\x08', '\xF5'}; thread_local EncryptedName bottomName(bottomSource); if (CEffect* effect = g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(bottomName.Text()), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot16(300); + effect->SetDelay(300); } } // OFFSET: 0x005B3270 // FUNCTION: fn_03363 -void CSkillAction_KR_ICE_SPLASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_ICE_SPLASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -554,19 +554,19 @@ void CSkillAction_KR_ICE_SPLASH::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x005B3470 // FUNCTION: fn_03364 -int CSkillAction_KR_ICE_PILLAR::Slot14() { +int CSkillAction_KR_ICE_PILLAR::GetSkillScopeType() { return 7; } // OFFSET: 0x005B3480 // FUNCTION: fn_03365 -int CSkillAction_KR_ICE_PILLAR::Slot02() { +int CSkillAction_KR_ICE_PILLAR::GetSkillAttackMotion() { return 65; } // OFFSET: 0x005B3490 // FUNCTION: fn_03366 -void CSkillObjectAction_KR_ICE_PILLAR::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_KR_ICE_PILLAR::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (!object) { return; } @@ -595,7 +595,7 @@ void CSkillObjectAction_KR_ICE_PILLAR::Slot00(int argument, CRenderObject* objec thread_local EncryptedName name(bytes); return name.Text(); }()); - effect->Slot16(990); + effect->SetDelay(990); } if (CEffect* effect = g_effectMgr->Spawn(object->render.accountId, 2473, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { static_cast(effect)->SetNames([] { @@ -609,13 +609,13 @@ void CSkillObjectAction_KR_ICE_PILLAR::Slot00(int argument, CRenderObject* objec thread_local EncryptedName name(bytes); return name.Text(); }()); - effect->Slot16(990); + effect->SetDelay(990); } } // OFFSET: 0x005B3E30 // FUNCTION: fn_03367 -void CSkillObjectAction_KR_ICE_PILLAR::Slot01(CRenderObject* object) { +void CSkillObjectAction_KR_ICE_PILLAR::OnSkillObjectRemove(CRenderObject* object) { if (!object) { return; } @@ -630,31 +630,31 @@ void CSkillObjectAction_KR_ICE_PILLAR::Slot01(CRenderObject* object) { // OFFSET: 0x005B3E90 // FUNCTION: fn_03368 -int CSkillAction_KR_FEATHER_SPRINKLE::Slot02() { +int CSkillAction_KR_FEATHER_SPRINKLE::GetSkillAttackMotion() { return 68; } // OFFSET: 0x005B4240 // FUNCTION: fn_03370 -void CSkillAction_KR_FEATHER_SPRINKLE::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_FEATHER_SPRINKLE::OnSkillHit(int level, CGameActor* source, CGameActor* target) { this->SpawnAttack01Effect(level, source); } // OFFSET: 0x005B4260 // FUNCTION: fn_03371 -int CSkillAction_KR_SHARPEN_GUST::Slot01() { +int CSkillAction_KR_SHARPEN_GUST::GetSkillCastMotion() { return 60; } // OFFSET: 0x005B4270 // FUNCTION: fn_03372 -int CSkillAction_KR_SHARPEN_GUST::Slot02() { +int CSkillAction_KR_SHARPEN_GUST::GetSkillAttackMotion() { return 78; } // OFFSET: 0x005B4280 // FUNCTION: fn_03373 -void CSkillAction_KR_SHARPEN_GUST::Slot08(int level, CGameActor* source) { +void CSkillAction_KR_SHARPEN_GUST::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(56, level / 16); } @@ -662,26 +662,26 @@ void CSkillAction_KR_SHARPEN_GUST::Slot08(int level, CGameActor* source) { // OFFSET: 0x005B46D0 // FUNCTION: fn_03375 -void CSkillAction_KR_SHARPEN_GUST::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_SHARPEN_GUST::OnSkillHit(int level, CGameActor* source, CGameActor* target) { this->SpawnAttack01Effect(level, source); this->SpawnAttack02Effect(level, source); } // OFFSET: 0x005B4700 // FUNCTION: fn_03376 -int CSkillAction_KR_SHARPEN_HAIL::Slot01() { +int CSkillAction_KR_SHARPEN_HAIL::GetSkillCastMotion() { return 60; } // OFFSET: 0x005B4710 // FUNCTION: fn_03377 -int CSkillAction_KR_SHARPEN_HAIL::Slot02() { +int CSkillAction_KR_SHARPEN_HAIL::GetSkillAttackMotion() { return 79; } // OFFSET: 0x005B4720 // FUNCTION: fn_03378 -void CSkillAction_KR_SHARPEN_HAIL::Slot08(int level, CGameActor* source) { +void CSkillAction_KR_SHARPEN_HAIL::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -694,7 +694,7 @@ void CSkillAction_KR_SHARPEN_HAIL::Slot08(int level, CGameActor* source) { thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId([] { @@ -703,13 +703,13 @@ void CSkillAction_KR_SHARPEN_HAIL::Slot08(int level, CGameActor* source) { thread_local EncryptedName name(bytes); return name.Text(); }()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x005B4AF0 // FUNCTION: fn_03379 -void CSkillAction_KR_SHARPEN_HAIL::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_SHARPEN_HAIL::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -762,12 +762,12 @@ void CSkillAction_KR_SHARPEN_HAIL::Slot11(int level, CGameActor* source, CGameAc CEffect* shot = g_effectMgr->Spawn(0, shotEffect, position.x, position.y, position.z, 0, -1, 0, 0); if (shot) { - shot->Slot16(startTime); + shot->SetDelay(startTime); } CEffect* bottom = g_effectMgr->Spawn(0, bottomEffect, position.x, position.y, position.z, 0, -1, 0, 0); if (bottom) { - bottom->Slot16(startTime); + bottom->SetDelay(startTime); } } } @@ -775,25 +775,25 @@ void CSkillAction_KR_SHARPEN_HAIL::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005B4F70 // FUNCTION: fn_03380 -void CSkillAction_KR_SHARPEN_HAIL::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_SHARPEN_HAIL::OnSkillHit(int level, CGameActor* source, CGameActor* target) { this->SpawnAttack01Effect(level, source); } // OFFSET: 0x005B4F90 // FUNCTION: fn_03381 -int CSkillAction_KR_IRON_HOWLING::Slot01() { +int CSkillAction_KR_IRON_HOWLING::GetSkillCastMotion() { return 66; } // OFFSET: 0x005B4FA0 // FUNCTION: fn_03382 -int CSkillAction_KR_IRON_HOWLING::Slot02() { +int CSkillAction_KR_IRON_HOWLING::GetSkillAttackMotion() { return 68; } // OFFSET: 0x005B4FB0 // FUNCTION: fn_03383 -void CSkillAction_KR_IRON_HOWLING::Slot08(int level, CGameActor* source) { +void CSkillAction_KR_IRON_HOWLING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(54, level / 16); } @@ -801,31 +801,31 @@ void CSkillAction_KR_IRON_HOWLING::Slot08(int level, CGameActor* source) { // OFFSET: 0x005B51F0 // FUNCTION: fn_03385 -EfstActionMessage CEfstAction_IRON_HOWLING::Slot03() { +EfstActionMessage CEfstAction_IRON_HOWLING::GetEfstBeginMessage() { return {LookupMessage(4662), 0xFFFF00}; } // OFFSET: 0x005B5220 // FUNCTION: fn_03386 -EfstActionMessage CEfstAction_IRON_HOWLING::Slot04() { +EfstActionMessage CEfstAction_IRON_HOWLING::GetEfstEndMessage() { return {LookupMessage(4663), 0xFF}; } // OFFSET: 0x005B5250 // FUNCTION: fn_03387 -int CSkillAction_KR_TYPHOON_WING::Slot01() { +int CSkillAction_KR_TYPHOON_WING::GetSkillCastMotion() { return 66; } // OFFSET: 0x005B5260 // FUNCTION: fn_03388 -int CSkillAction_KR_TYPHOON_WING::Slot02() { +int CSkillAction_KR_TYPHOON_WING::GetSkillAttackMotion() { return 67; } // OFFSET: 0x005B5270 // FUNCTION: fn_03389 -void CSkillAction_KR_TYPHOON_WING::Slot08(int level, CGameActor* source) { +void CSkillAction_KR_TYPHOON_WING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(56, level / 16); } @@ -833,7 +833,7 @@ void CSkillAction_KR_TYPHOON_WING::Slot08(int level, CGameActor* source) { // OFFSET: 0x005B52A0 // FUNCTION: fn_03390 -void CSkillAction_KR_TYPHOON_WING::Slot12(vector3d position, int level, int argument5) { +void CSkillAction_KR_TYPHOON_WING::OnGroundSkillEffect(vector3d position, int level, int argument5) { const int effectId = CEZ2STREffectMgr::GetInstance()->EffectId( level < 6 ? std::string([] { const char source[] = {'\x67', '\xBE', '\x73', '\x7D', '\x94', '\xFE', '\x79', '\x10', '\x64', '\xAE', '\x6D', '\x72', '\xA4', '\xA4', '\x6F', '\x7A', '\x13'}; @@ -867,19 +867,19 @@ void CSkillAction_KR_TYPHOON_WING::Slot12(vector3d position, int level, int argu // OFFSET: 0x005B58A0 // FUNCTION: fn_03391 -int CSkillAction_KR_WIND_VEIL::Slot01() { +int CSkillAction_KR_WIND_VEIL::GetSkillCastMotion() { return 66; } // OFFSET: 0x005B58B0 // FUNCTION: fn_03392 -int CSkillAction_KR_WIND_VEIL::Slot02() { +int CSkillAction_KR_WIND_VEIL::GetSkillAttackMotion() { return 68; } // OFFSET: 0x005B58C0 // FUNCTION: fn_03393 -void CSkillAction_KR_WIND_VEIL::Slot08(int level, CGameActor* source) { +void CSkillAction_KR_WIND_VEIL::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(56, level / 16); } @@ -887,19 +887,19 @@ void CSkillAction_KR_WIND_VEIL::Slot08(int level, CGameActor* source) { // OFFSET: 0x005B58F0 // FUNCTION: fn_03394 -EfstActionMessage CEfstAction_WIND_VEIL::Slot03() { +EfstActionMessage CEfstAction_WIND_VEIL::GetEfstBeginMessage() { return {LookupMessage(4664), 0xFFFF00}; } // OFFSET: 0x005B5920 // FUNCTION: fn_03395 -EfstActionMessage CEfstAction_WIND_VEIL::Slot04() { +EfstActionMessage CEfstAction_WIND_VEIL::GetEfstEndMessage() { return {LookupMessage(4665), 0xFF}; } // OFFSET: 0x005B5950 // FUNCTION: fn_03396 -void CEfstAction_WIND_VEIL::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_WIND_VEIL::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (!actor) { return; } @@ -920,7 +920,7 @@ void CEfstAction_WIND_VEIL::Slot00(int efstId, int value, int argument3, int arg // OFFSET: 0x005B5CE0 // FUNCTION: fn_03397 -void CEfstAction_WIND_VEIL::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_WIND_VEIL::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -941,21 +941,21 @@ void CEfstAction_WIND_VEIL::Slot01(int efstId, int argument2, int argument3, int // OFFSET: 0x005B6010 // FUNCTION: fn_03398 -void CEfstAction_WIND_VEIL::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_WIND_VEIL::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { - this->Slot00(efstId, value, 0, 0, actor, false); + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } } // OFFSET: 0x005B6030 // FUNCTION: fn_03399 -int CSkillAction_SKID_KR_CHOP_CHOP::Slot02() { +int CSkillAction_SKID_KR_CHOP_CHOP::GetSkillAttackMotion() { return 75; } // OFFSET: 0x005B6330 // FUNCTION: fn_03401 -void CEfstAction_CHOP_CHOP::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_CHOP_CHOP::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -1025,7 +1025,7 @@ __declspec(noinline) void CWhirlwindEffect::SetDuration(int duration) { // OFFSET: 0x005B0A20 // FUNCTION: fn_03343 -void CSkillAction_KR_NASTY_SLASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_NASTY_SLASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source) || !target) { return; } @@ -1034,14 +1034,14 @@ void CSkillAction_KR_NASTY_SLASH::Slot11(int level, CGameActor* source, CGameAct const std::uint8_t effectSource[] = {0x49, 0x60, 0x74, 0x19, 0x7A, 0x9A, 0x80, 0x43, 0x46, 0x72, 0x6F, 0x6D}; thread_local EncryptedName effectName(effectSource); if (CEffect* effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(angle); - effect->Slot18(25.0f); + effect->SetAngle(angle); + effect->SetPitch(25.0f); } } // OFFSET: 0x005B3EA0 // FUNCTION: fn_03369 -void CSkillAction_KR_FEATHER_SPRINKLE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_FEATHER_SPRINKLE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1057,7 +1057,7 @@ void CSkillAction_KR_FEATHER_SPRINKLE::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x005B42B0 // FUNCTION: fn_03374 -void CSkillAction_KR_SHARPEN_GUST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_SHARPEN_GUST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source) || !target) { return; } @@ -1066,21 +1066,21 @@ void CSkillAction_KR_SHARPEN_GUST::Slot11(int level, CGameActor* source, CGameAc const char effectSource[] = {'\x1E', '\x37', '\x98', '\x41', '\x93', '\x1E', '\x3B', '\x60', '\x0A', '\x2A', '\x8A', '\x47', '\xE3'}; thread_local EncryptedName effectName(effectSource); if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(angle); - effect->Slot18(30.0f); + effect->SetAngle(angle); + effect->SetPitch(30.0f); } const char bottomSource[] = {'\x4A', '\x89', '\xC8', '\x9D', '\x91', '\xC2', '\x3D', '\x58', '\x5E', '\x94', '\xDA', '\x9B', '\xBE', '\xC5', '\x3C', '\x73', '\x4D', '\x8E', '\xC4', '\xEF'}; thread_local EncryptedName bottomName(bottomSource); if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(bottomName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(angle); - effect->Slot18(30.0f); + effect->SetAngle(angle); + effect->SetPitch(30.0f); } } // OFFSET: 0x005B4FE0 // FUNCTION: fn_03384 -void CSkillAction_KR_IRON_HOWLING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_KR_IRON_HOWLING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1092,7 +1092,7 @@ void CSkillAction_KR_IRON_HOWLING::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x005B6040 // FUNCTION: fn_03400 -void CSkillAction_SKID_KR_CHOP_CHOP::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKID_KR_CHOP_CHOP::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!this->CanUse(source)) { return; } @@ -1105,7 +1105,7 @@ void CSkillAction_SKID_KR_CHOP_CHOP::Slot11(int level, CGameActor* source, CGame thread_local EncryptedName effectName(effectSource); EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(effectName.Text()), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(static_cast(std::max(0, rand() % 360))); + effect->SetAngle(static_cast(std::max(0, rand() % 360))); } if (CRagEffect* effect = source->LaunchEffect(2444, vector3d{0.0f, 0.0f, 0.0f}, 0.0f)) { diff --git a/Source/Contents/Skills/SkillActionMeister.cpp b/Source/Contents/Skills/SkillActionMeister.cpp index c83d84679..a48cfa9d6 100644 --- a/Source/Contents/Skills/SkillActionMeister.cpp +++ b/Source/Contents/Skills/SkillActionMeister.cpp @@ -15,53 +15,53 @@ class CSkillAction_MT_SPARK_BLASTER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_MT_TRIPLE_LASER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_MT_MIGHTY_SMASH : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - bool Slot05() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + bool KeepSkillAttackSpeed() override; }; class CSkillAction_MT_ENERGY_CANNONADE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_MT_RUSH_STRIKE : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_MT_POWERFUL_SWING : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_GRADUAL_GRAVITY : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; // OFFSET: 0x0078CC50 // FUNCTION: fn_08652 -void CSkillAction_MT_SPARK_BLASTER::Slot08(int level, CGameActor* source) { +void CSkillAction_MT_SPARK_BLASTER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(1938, level / 16); } @@ -69,7 +69,7 @@ void CSkillAction_MT_SPARK_BLASTER::Slot08(int level, CGameActor* source) { // OFFSET: 0x0078CC80 // FUNCTION: fn_08653 -void CSkillAction_MT_SPARK_BLASTER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_SPARK_BLASTER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("spark_blaster"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -80,7 +80,7 @@ void CSkillAction_MT_SPARK_BLASTER::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x0078CF00 // FUNCTION: fn_08655 -void CSkillAction_MT_TRIPLE_LASER::Slot08(int level, CGameActor* source) { +void CSkillAction_MT_TRIPLE_LASER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(1938, level / 16); } @@ -88,12 +88,12 @@ void CSkillAction_MT_TRIPLE_LASER::Slot08(int level, CGameActor* source) { // OFFSET: 0x0078CF30 // FUNCTION: fn_08656 -void CSkillAction_MT_TRIPLE_LASER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_TRIPLE_LASER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { } // OFFSET: 0x0078CF40 // FUNCTION: fn_08657 -void CSkillAction_MT_TRIPLE_LASER::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_TRIPLE_LASER::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("triple_laser"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -102,7 +102,7 @@ void CSkillAction_MT_TRIPLE_LASER::Slot15(int level, CGameActor* source, CGameAc // OFFSET: 0x0078D0B0 // FUNCTION: fn_08659 -void CSkillAction_MT_MIGHTY_SMASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_MIGHTY_SMASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mighty_smash"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -111,13 +111,13 @@ void CSkillAction_MT_MIGHTY_SMASH::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x0078D210 // FUNCTION: fn_08660 -bool CSkillAction_MT_MIGHTY_SMASH::Slot05() { +bool CSkillAction_MT_MIGHTY_SMASH::KeepSkillAttackSpeed() { return true; } // OFFSET: 0x0078D230 // FUNCTION: fn_08662 -void CSkillAction_MT_ENERGY_CANNONADE::Slot08(int level, CGameActor* source) { +void CSkillAction_MT_ENERGY_CANNONADE::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -125,18 +125,18 @@ void CSkillAction_MT_ENERGY_CANNONADE::Slot08(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("energy_cannonade_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("energy_cannonade_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x0078D4E0 // FUNCTION: fn_08663 -void CSkillAction_MT_ENERGY_CANNONADE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_ENERGY_CANNONADE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -146,13 +146,13 @@ void CSkillAction_MT_ENERGY_CANNONADE::Slot11(int level, CGameActor* source, CGa EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("energy_cannonade"), position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot17(angle + 180.0f); + effect->SetAngle(angle + 180.0f); } } // OFFSET: 0x0078D690 // FUNCTION: fn_08664 -void CSkillAction_MT_ENERGY_CANNONADE::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_ENERGY_CANNONADE::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("energy_cannonade_hit_big"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -161,7 +161,7 @@ void CSkillAction_MT_ENERGY_CANNONADE::Slot15(int level, CGameActor* source, CGa // OFFSET: 0x0078D810 // FUNCTION: fn_08665 -void CSkillAction_MT_ENERGY_CANNONADE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_ENERGY_CANNONADE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("energy_cannonade_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -170,7 +170,7 @@ void CSkillAction_MT_ENERGY_CANNONADE::Slot16(int level, CGameActor* source, CGa // OFFSET: 0x0078D9A0 // FUNCTION: fn_08667 -void CSkillAction_MT_RUSH_STRIKE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_RUSH_STRIKE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -183,13 +183,13 @@ void CSkillAction_MT_RUSH_STRIKE::Slot11(int level, CGameActor* source, CGameAct effects = g_effectMgr; CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rush_strike"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot26(source->render.previousAnimation % 8 >= 4); + effect->SetFlipX(source->render.previousAnimation % 8 >= 4); } } // OFFSET: 0x0078DCA0 // FUNCTION: fn_08668 -void CSkillAction_MT_RUSH_STRIKE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_RUSH_STRIKE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rush_strike_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -198,7 +198,7 @@ void CSkillAction_MT_RUSH_STRIKE::Slot16(int level, CGameActor* source, CGameAct // OFFSET: 0x0078DE20 // FUNCTION: fn_08670 -void CSkillAction_MT_POWERFUL_SWING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_POWERFUL_SWING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -206,18 +206,18 @@ void CSkillAction_MT_POWERFUL_SWING::Slot11(int level, CGameActor* source, CGame if (!g_serviceOptions.Get(229)) { CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("powerful_swing_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot17(ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values) + 180.0f); + effect->SetAngle(ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values) + 180.0f); } } CEffect* effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("powerful_swing"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot26(source->render.previousAnimation % 8 >= 4); + effect->SetFlipX(source->render.previousAnimation % 8 >= 4); } } // OFFSET: 0x0078E130 // FUNCTION: fn_08671 -void CSkillAction_MT_POWERFUL_SWING::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_MT_POWERFUL_SWING::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("powerful_swing_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -226,7 +226,7 @@ void CSkillAction_MT_POWERFUL_SWING::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x0078E370 // FUNCTION: fn_08672 -void CEfstAction_GRADUAL_GRAVITY::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_GRADUAL_GRAVITY::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { static_cast(actor)->LaunchEffect(779, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -234,7 +234,7 @@ void CEfstAction_GRADUAL_GRAVITY::Slot00(int efstId, int value, int argument3, i // OFFSET: 0x0078E3C0 // FUNCTION: fn_08673 -void CEfstAction_GRADUAL_GRAVITY::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_GRADUAL_GRAVITY::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { while (static_cast(actor)->HasId(779)) { actor->SendMsg(nullptr, 109, 0, 779, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -244,6 +244,6 @@ void CEfstAction_GRADUAL_GRAVITY::Slot01(int efstId, int argument2, int argument // OFFSET: 0x0078E420 // FUNCTION: fn_08674 -void CEfstAction_GRADUAL_GRAVITY::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_GRADUAL_GRAVITY::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } diff --git a/Source/Contents/Skills/SkillActionNightWatch.cpp b/Source/Contents/Skills/SkillActionNightWatch.cpp index c576c0e40..a9e0f3160 100644 --- a/Source/Contents/Skills/SkillActionNightWatch.cpp +++ b/Source/Contents/Skills/SkillActionNightWatch.cpp @@ -21,141 +21,141 @@ class CSkillAction_NW_INTENSIVE_AIM : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_INTENSIVE_AIM_COUNT : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_INTENSIVE_AIM : public CEfstAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_NW_GRENADE_FRAGMENT : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_THE_VIGILANTE_AT_NIGHT : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; + void OnSkillCast(int level, CGameActor* source) override; }; class CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_ONLY_ONE_BULLET : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot09(int argument1, int argument2, int argument3) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnTargetSkillCast(int argument1, int argument2, int argument3) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_SPIRAL_SHOOTING : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_MAGAZINE_FOR_ONE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_WILD_FIRE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_NW_BASIC_GRENADE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; - int Slot14() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; + int GetSkillScopeType() override; }; class CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_NW_GRENADES_DROPPING : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - int Slot14() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + int GetSkillScopeType() override; }; class CSkillObjectAction_NW_GRENADES_DROPPING : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_NW_AUTO_FIRING_LAUNCHER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_HIDDEN_CARD : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_HIDDEN_CARD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_NW_MISSION_BOMBARD : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - int Slot14() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + int GetSkillScopeType() override; }; class CSkillObjectAction_NW_MISSION_BOMBARD : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_NW_WILD_SHOT : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_MIDNIGHT_FALLEN : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; - int Slot14() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + int GetSkillScopeType() override; }; // OFFSET: 0x0078E470 // FUNCTION: fn_08676 -void CSkillAction_NW_INTENSIVE_AIM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_INTENSIVE_AIM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("intensiveaim_helix"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -164,7 +164,7 @@ void CSkillAction_NW_INTENSIVE_AIM::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x0078E5F0 // FUNCTION: fn_08677 -void CEfstAction_INTENSIVE_AIM_COUNT::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_INTENSIVE_AIM_COUNT::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { for (int index = 0; index <= 10; ++index) { EffectLists* effects = g_effectMgr; @@ -183,13 +183,13 @@ void CEfstAction_INTENSIVE_AIM_COUNT::Slot00(int efstId, int value, int argument // OFFSET: 0x0078E9A0 // FUNCTION: fn_08678 -void CEfstAction_INTENSIVE_AIM_COUNT::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_INTENSIVE_AIM_COUNT::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0078E9C0 // FUNCTION: fn_08679 -void CEfstAction_INTENSIVE_AIM::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_INTENSIVE_AIM::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { for (int index = 0; index <= 10; ++index) { EffectLists* effects = g_effectMgr; @@ -202,7 +202,7 @@ void CEfstAction_INTENSIVE_AIM::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0078EBC0 // FUNCTION: fn_08680 -void CSkillAction_NW_GRENADE_FRAGMENT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_GRENADE_FRAGMENT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -242,7 +242,7 @@ void CSkillAction_NW_GRENADE_FRAGMENT::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x0078F0D0 // FUNCTION: fn_08681 -void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -250,7 +250,7 @@ void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT::Slot08(int level, CGameActor* sourc // OFFSET: 0x0078F110 // FUNCTION: fn_08683 -void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("the_vigilante_at_night_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -271,14 +271,14 @@ void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING::Slot11(int level, CGame effect->position[0] = static_cast(index % 2 * 15 - std::max(second, 0)) + target->render.position.x; effect->position[2] = target->render.position.z + 0.0f; effect->position[1] = static_cast(index % 4 / 2 * 15 - std::max(first, 0)) + target->render.position.y; - effect->Slot16(index * 32); - effect->Slot22(static_cast(std::max(rand() % 51, 0) + 50) * 0.01f); + effect->SetDelay(index * 32); + effect->SetScale(static_cast(std::max(rand() % 51, 0) + 50) * 0.01f); } } // OFFSET: 0x0078F540 // FUNCTION: fn_08685 -void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("the_vigilante_at_night_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -299,14 +299,14 @@ void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN::Slot11(int level, CGame effect->position[0] = static_cast(index % 2 * 10 - std::max(second, 0)) + target->render.position.x; effect->position[2] = target->render.position.z + 0.0f; effect->position[1] = static_cast(index % 4 / 2 * 10 - std::max(first, 0)) + target->render.position.y; - effect->Slot16(index * 32); - effect->Slot22(static_cast(std::max(rand() % 31, 0) + 70) * 0.01f); + effect->SetDelay(index * 32); + effect->SetScale(static_cast(std::max(rand() % 31, 0) + 70) * 0.01f); } } // OFFSET: 0x0078F960 // FUNCTION: fn_08687 -void CSkillAction_NW_ONLY_ONE_BULLET::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_ONLY_ONE_BULLET::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -314,7 +314,7 @@ void CSkillAction_NW_ONLY_ONE_BULLET::Slot08(int level, CGameActor* source) { // OFFSET: 0x0078F990 // FUNCTION: fn_08688 -void CSkillAction_NW_ONLY_ONE_BULLET::Slot09(int argument1, int argument2, int argument3) { +void CSkillAction_NW_ONLY_ONE_BULLET::OnTargetSkillCast(int argument1, int argument2, int argument3) { if (CGameActor* source = reinterpret_cast(argument2)) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("only_one_bullet"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -323,7 +323,7 @@ void CSkillAction_NW_ONLY_ONE_BULLET::Slot09(int argument1, int argument2, int a // OFFSET: 0x0078FB00 // FUNCTION: fn_08689 -void CSkillAction_NW_ONLY_ONE_BULLET::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_ONLY_ONE_BULLET::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { CGameActor* origin = reinterpret_cast(level); if (!origin || !source) { return; @@ -333,13 +333,13 @@ void CSkillAction_NW_ONLY_ONE_BULLET::Slot16(int level, CGameActor* source, CGam EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("only_one_bullet_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x0078FCE0 // FUNCTION: fn_08691 -void CSkillAction_NW_SPIRAL_SHOOTING::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_SPIRAL_SHOOTING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -347,7 +347,7 @@ void CSkillAction_NW_SPIRAL_SHOOTING::Slot08(int level, CGameActor* source) { // OFFSET: 0x0078FD10 // FUNCTION: fn_08692 -void CSkillAction_NW_SPIRAL_SHOOTING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_SPIRAL_SHOOTING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("spiral_shooting"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -356,7 +356,7 @@ void CSkillAction_NW_SPIRAL_SHOOTING::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x0078FE90 // FUNCTION: fn_08694 -void CSkillAction_NW_MAGAZINE_FOR_ONE::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_MAGAZINE_FOR_ONE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -364,7 +364,7 @@ void CSkillAction_NW_MAGAZINE_FOR_ONE::Slot08(int level, CGameActor* source) { // OFFSET: 0x0078FEC0 // FUNCTION: fn_08695 -void CSkillAction_NW_MAGAZINE_FOR_ONE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_MAGAZINE_FOR_ONE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("magazine_for_one"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -373,7 +373,7 @@ void CSkillAction_NW_MAGAZINE_FOR_ONE::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x00790040 // FUNCTION: fn_08697 -void CSkillAction_NW_WILD_FIRE::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_WILD_FIRE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -381,7 +381,7 @@ void CSkillAction_NW_WILD_FIRE::Slot08(int level, CGameActor* source) { // OFFSET: 0x00790070 // FUNCTION: fn_08698 -void CSkillAction_NW_WILD_FIRE::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_NW_WILD_FIRE::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("wild_fire"), position.x, position.y, position.z, 0, -1, 0, 0); effects = g_effectMgr; @@ -390,7 +390,7 @@ void CSkillAction_NW_WILD_FIRE::Slot12(vector3d position, int argument2, int arg // OFFSET: 0x007902A0 // FUNCTION: fn_08701 -void CSkillAction_NW_BASIC_GRENADE::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_BASIC_GRENADE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -398,7 +398,7 @@ void CSkillAction_NW_BASIC_GRENADE::Slot08(int level, CGameActor* source) { // OFFSET: 0x007902D0 // FUNCTION: fn_08702 -void CSkillAction_NW_BASIC_GRENADE::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_NW_BASIC_GRENADE::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("basic_grenade"), position.x, position.y, position.z, 0, -1, 0, 0); effects = g_effectMgr; @@ -407,19 +407,19 @@ void CSkillAction_NW_BASIC_GRENADE::Slot12(vector3d position, int argument2, int // OFFSET: 0x007904F0 // FUNCTION: fn_08703 -int CSkillAction_NW_BASIC_GRENADE::Slot14() { +int CSkillAction_NW_BASIC_GRENADE::GetSkillScopeType() { return 3; } // OFFSET: 0x00790510 // FUNCTION: fn_08705 -bool CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::Slot03(int argument) { +bool CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x00790520 // FUNCTION: fn_08706 -void CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -427,33 +427,33 @@ void CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::Slot08(int level, CGameActor* sourc // OFFSET: 0x00790550 // FUNCTION: fn_08707 -void CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { for (int index = 0; index < 3; ++index) { CEffect* effect = g_effectMgr->Spawn( 0, CEZ2STREffectMgr::GetInstance()->EffectId(FormatOwnedString("hasty_fire_in_the_hole_%d", index).c_str()), position.x, position.y, position.z, 0, -1, 0, 0 ); if (effect) { - effect->Slot16(index * 288); + effect->SetDelay(index * 288); } effect = g_effectMgr->Spawn( 0, CEZ2STREffectMgr::GetInstance()->EffectId(FormatOwnedString("hasty_fire_in_the_hole_bottom_%d", index).c_str()), position.x, position.y, position.z, 0, -1, 0, 0 ); if (effect) { - effect->Slot16(index * 288); + effect->SetDelay(index * 288); } } } // OFFSET: 0x007908E0 // FUNCTION: fn_08710 -bool CSkillAction_NW_GRENADES_DROPPING::Slot03(int argument) { +bool CSkillAction_NW_GRENADES_DROPPING::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x007908F0 // FUNCTION: fn_08711 -void CSkillAction_NW_GRENADES_DROPPING::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_GRENADES_DROPPING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -461,13 +461,13 @@ void CSkillAction_NW_GRENADES_DROPPING::Slot08(int level, CGameActor* source) { // OFFSET: 0x00790920 // FUNCTION: fn_08712 -int CSkillAction_NW_GRENADES_DROPPING::Slot14() { +int CSkillAction_NW_GRENADES_DROPPING::GetSkillScopeType() { return 3; } // OFFSET: 0x00790930 // FUNCTION: fn_08713 -void CSkillObjectAction_NW_GRENADES_DROPPING::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_NW_GRENADES_DROPPING::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { g_effectMgr->Spawn(object->render.accountId, 2351, object->render.position.x, object->render.position.y, object->render.position.z, 0, argument, 0, 0); } @@ -475,7 +475,7 @@ void CSkillObjectAction_NW_GRENADES_DROPPING::Slot00(int argument, CRenderObject // OFFSET: 0x00790990 // FUNCTION: fn_08715 -void CSkillAction_NW_AUTO_FIRING_LAUNCHER::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_AUTO_FIRING_LAUNCHER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -483,7 +483,7 @@ void CSkillAction_NW_AUTO_FIRING_LAUNCHER::Slot08(int level, CGameActor* source) // OFFSET: 0x007909C0 // FUNCTION: fn_08716 -void CSkillAction_NW_AUTO_FIRING_LAUNCHER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_AUTO_FIRING_LAUNCHER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("auto_firing_launcher"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -494,7 +494,7 @@ void CSkillAction_NW_AUTO_FIRING_LAUNCHER::Slot11(int level, CGameActor* source, // OFFSET: 0x00790C60 // FUNCTION: fn_08718 -void CSkillAction_NW_HIDDEN_CARD::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_HIDDEN_CARD::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(840, level / 16); } @@ -502,7 +502,7 @@ void CSkillAction_NW_HIDDEN_CARD::Slot08(int level, CGameActor* source) { // OFFSET: 0x00790C90 // FUNCTION: fn_08719 -void CSkillAction_NW_HIDDEN_CARD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_HIDDEN_CARD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hiddencard"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -511,7 +511,7 @@ void CSkillAction_NW_HIDDEN_CARD::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x00790DF0 // FUNCTION: fn_08720 -void CEfstAction_HIDDEN_CARD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_HIDDEN_CARD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hiddencard_thunder"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -520,7 +520,7 @@ void CEfstAction_HIDDEN_CARD::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x00790F70 // FUNCTION: fn_08721 -void CEfstAction_HIDDEN_CARD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_HIDDEN_CARD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hiddencard_thunder")); @@ -529,19 +529,19 @@ void CEfstAction_HIDDEN_CARD::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x007910A0 // FUNCTION: fn_08722 -void CEfstAction_HIDDEN_CARD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_HIDDEN_CARD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007910D0 // FUNCTION: fn_08724 -bool CSkillAction_NW_MISSION_BOMBARD::Slot03(int argument) { +bool CSkillAction_NW_MISSION_BOMBARD::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x007910E0 // FUNCTION: fn_08725 -void CSkillAction_NW_MISSION_BOMBARD::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_MISSION_BOMBARD::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(840, level / 16); } @@ -549,13 +549,13 @@ void CSkillAction_NW_MISSION_BOMBARD::Slot08(int level, CGameActor* source) { // OFFSET: 0x00791110 // FUNCTION: fn_08726 -int CSkillAction_NW_MISSION_BOMBARD::Slot14() { +int CSkillAction_NW_MISSION_BOMBARD::GetSkillScopeType() { return 9; } // OFFSET: 0x00791120 // FUNCTION: fn_08727 -void CSkillObjectAction_NW_MISSION_BOMBARD::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_NW_MISSION_BOMBARD::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mission_bombard"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -569,7 +569,7 @@ void CSkillObjectAction_NW_MISSION_BOMBARD::Slot00(int argument, CRenderObject* // OFFSET: 0x007914F0 // FUNCTION: fn_08729 -void CSkillAction_NW_WILD_SHOT::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_WILD_SHOT::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -577,13 +577,13 @@ void CSkillAction_NW_WILD_SHOT::Slot08(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("wild_shot_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x00791670 // FUNCTION: fn_08730 -void CSkillAction_NW_WILD_SHOT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_WILD_SHOT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -606,9 +606,9 @@ void CSkillAction_NW_WILD_SHOT::Slot11(int level, CGameActor* source, CGameActor const float z = offsetZ + target->render.position.z; CEffect* effect = g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("wild_shot"), x, y, z, 0, -1, 0, 0); if (effect) { - effect->Slot22(0.8f); - effect->Slot16(delay); - effect->Slot17(static_cast(std::max(rand() % 360, 0))); + effect->SetScale(0.8f); + effect->SetDelay(delay); + effect->SetAngle(static_cast(std::max(rand() % 360, 0))); } delay += 240; } @@ -616,7 +616,7 @@ void CSkillAction_NW_WILD_SHOT::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00791950 // FUNCTION: fn_08731 -void CSkillAction_NW_WILD_SHOT::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_WILD_SHOT::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -626,19 +626,19 @@ void CSkillAction_NW_WILD_SHOT::Slot16(int level, CGameActor* source, CGameActor effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("wild_shot_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot22(0.8f); + effect->SetScale(0.8f); } } // OFFSET: 0x00791BB0 // FUNCTION: fn_08733 -bool CSkillAction_NW_MIDNIGHT_FALLEN::Slot03(int argument) { +bool CSkillAction_NW_MIDNIGHT_FALLEN::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x00791BC0 // FUNCTION: fn_08734 -void CSkillAction_NW_MIDNIGHT_FALLEN::Slot08(int level, CGameActor* source) { +void CSkillAction_NW_MIDNIGHT_FALLEN::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -646,13 +646,13 @@ void CSkillAction_NW_MIDNIGHT_FALLEN::Slot08(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("midnight_fallen_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x00791D60 // FUNCTION: fn_08735 -void CSkillAction_NW_MIDNIGHT_FALLEN::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_NW_MIDNIGHT_FALLEN::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { int delay = 0; for (int angle = 45; angle < 405; angle += 120) { const float radians = static_cast(angle) / 180.0f * 3.141592f; @@ -664,7 +664,7 @@ void CSkillAction_NW_MIDNIGHT_FALLEN::Slot12(vector3d position, int argument2, i EffectLists* effects = g_effectMgr; CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("midnight_fallen_bottom"), x, y, z, 0, -1, 0, 0); if (effect) { - effect->Slot16(delay); + effect->SetDelay(delay); } delay += 96; } @@ -672,7 +672,7 @@ void CSkillAction_NW_MIDNIGHT_FALLEN::Slot12(vector3d position, int argument2, i // OFFSET: 0x00791FD0 // FUNCTION: fn_08736 -void CSkillAction_NW_MIDNIGHT_FALLEN::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NW_MIDNIGHT_FALLEN::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Retire(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("midnight_fallen_hit")); @@ -683,6 +683,6 @@ void CSkillAction_NW_MIDNIGHT_FALLEN::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x00792230 // FUNCTION: fn_08737 -int CSkillAction_NW_MIDNIGHT_FALLEN::Slot14() { +int CSkillAction_NW_MIDNIGHT_FALLEN::GetSkillScopeType() { return 7; } diff --git a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp index b22709613..77e8ee2fc 100644 --- a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp +++ b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp @@ -29,71 +29,71 @@ struct ShuffledSequence { class CSkillAction_SS_REIKETSUHOU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int level, int argument3) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int level, int argument3) override; }; class CSkillAction_SS_RAIDENPOU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_KINRYUUHOU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_ANTENPOU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_KAGEAKUMU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_HITOUAKUMU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_ANKOKURYUUAKUMU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_FOUR_CHARM : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; // OFFSET: 0x007950C0 // FUNCTION: fn_08785 -void CSkillAction_SS_REIKETSUHOU::Slot12(vector3d position, int level, int argument3) { +void CSkillAction_SS_REIKETSUHOU::OnGroundSkillEffect(vector3d position, int level, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("reiketsuhou_bottom"), position.x, position.y, position.z, 0, -1, 0, 0); @@ -105,36 +105,36 @@ void CSkillAction_SS_REIKETSUHOU::Slot12(vector3d position, int level, int argum spot.z += (std::max(0, std::rand() % (count * 50 + 1)) - count * 50 * 0.5f) * 0.1f; effects = g_effectMgr; if (CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("reiketsuhou"), spot.x, spot.y, spot.z, 0, -1, 0, 0)) { - effect->Slot16(index * 80); + effect->SetDelay(index * 80); } } } // OFFSET: 0x00795450 // FUNCTION: fn_08786 -int CSkillAction_SS_RAIDENPOU::Slot01() { +int CSkillAction_SS_RAIDENPOU::GetSkillCastMotion() { return 55; } // OFFSET: 0x00795460 // FUNCTION: fn_08787 -int CSkillAction_SS_RAIDENPOU::Slot02() { +int CSkillAction_SS_RAIDENPOU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x00795470 // FUNCTION: fn_08788 -void CSkillAction_SS_RAIDENPOU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_RAIDENPOU::OnSkillCast(int level, CGameActor* source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_raidenpou_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x007955F0 // FUNCTION: fn_08789 -void CSkillAction_SS_RAIDENPOU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_RAIDENPOU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_raidenpou_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -145,7 +145,7 @@ void CSkillAction_SS_RAIDENPOU::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00795860 // FUNCTION: fn_08790 -void CSkillAction_SS_RAIDENPOU::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_RAIDENPOU::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_raidenpou_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -154,19 +154,19 @@ void CSkillAction_SS_RAIDENPOU::Slot16(int level, CGameActor* source, CGameActor // OFFSET: 0x007959E0 // FUNCTION: fn_08791 -int CSkillAction_SS_KINRYUUHOU::Slot01() { +int CSkillAction_SS_KINRYUUHOU::GetSkillCastMotion() { return 55; } // OFFSET: 0x007959F0 // FUNCTION: fn_08792 -int CSkillAction_SS_KINRYUUHOU::Slot02() { +int CSkillAction_SS_KINRYUUHOU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x00795A00 // FUNCTION: fn_08793 -void CSkillAction_SS_KINRYUUHOU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_KINRYUUHOU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -174,20 +174,20 @@ void CSkillAction_SS_KINRYUUHOU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00795A30 // FUNCTION: fn_08794 -void CSkillAction_SS_KINRYUUHOU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KINRYUUHOU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && target) { const float angle = ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values); const vector3d position = source->render.position; EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("kinryuuhou"), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot17(angle); + effect->SetAngle(angle); } } } // OFFSET: 0x00795BD0 // FUNCTION: fn_08795 -void CSkillAction_SS_KINRYUUHOU::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KINRYUUHOU::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kinryuuhou_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -196,19 +196,19 @@ void CSkillAction_SS_KINRYUUHOU::Slot16(int level, CGameActor* source, CGameActo // OFFSET: 0x00795D40 // FUNCTION: fn_08796 -int CSkillAction_SS_ANTENPOU::Slot01() { +int CSkillAction_SS_ANTENPOU::GetSkillCastMotion() { return 55; } // OFFSET: 0x00795D50 // FUNCTION: fn_08797 -int CSkillAction_SS_ANTENPOU::Slot02() { +int CSkillAction_SS_ANTENPOU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x00795D60 // FUNCTION: fn_08798 -void CSkillAction_SS_ANTENPOU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_ANTENPOU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(59, level / 16); } @@ -216,7 +216,7 @@ void CSkillAction_SS_ANTENPOU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00795D90 // FUNCTION: fn_08799 -void CSkillAction_SS_ANTENPOU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_ANTENPOU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { const vector3d position = source->render.position; EffectLists* effects = g_effectMgr; @@ -226,19 +226,19 @@ void CSkillAction_SS_ANTENPOU::Slot11(int level, CGameActor* source, CGameActor* // OFFSET: 0x00795EE0 // FUNCTION: fn_08800 -int CSkillAction_SS_KAGEAKUMU::Slot01() { +int CSkillAction_SS_KAGEAKUMU::GetSkillCastMotion() { return 55; } // OFFSET: 0x00795EF0 // FUNCTION: fn_08801 -int CSkillAction_SS_KAGEAKUMU::Slot02() { +int CSkillAction_SS_KAGEAKUMU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x00795F00 // FUNCTION: fn_08802 -void CSkillAction_SS_KAGEAKUMU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_KAGEAKUMU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(812, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); static_cast(source)->LaunchEffect(1656, level / 16); @@ -247,7 +247,7 @@ void CSkillAction_SS_KAGEAKUMU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00795F60 // FUNCTION: fn_08803 -void CSkillAction_SS_KAGEAKUMU::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KAGEAKUMU::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kageakumu"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -256,19 +256,19 @@ void CSkillAction_SS_KAGEAKUMU::Slot15(int level, CGameActor* source, CGameActor // OFFSET: 0x007960C0 // FUNCTION: fn_08804 -int CSkillAction_SS_HITOUAKUMU::Slot01() { +int CSkillAction_SS_HITOUAKUMU::GetSkillCastMotion() { return 55; } // OFFSET: 0x007960D0 // FUNCTION: fn_08805 -int CSkillAction_SS_HITOUAKUMU::Slot02() { +int CSkillAction_SS_HITOUAKUMU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x007960E0 // FUNCTION: fn_08806 -void CSkillAction_SS_HITOUAKUMU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_HITOUAKUMU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(812, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); static_cast(source)->LaunchEffect(1656, level / 16); @@ -277,7 +277,7 @@ void CSkillAction_SS_HITOUAKUMU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00796140 // FUNCTION: fn_08807 -void CSkillAction_SS_HITOUAKUMU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_HITOUAKUMU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -295,8 +295,8 @@ void CSkillAction_SS_HITOUAKUMU::Slot11(int level, CGameActor* source, CGameActo source->render.position.y, source->render.position.z, 0, -1, 0, 0); if (effect) { const int spread = static_cast(step); - effect->Slot17(index * step + (spread ? std::max(0, std::rand() % spread) : 0)); - effect->Slot16((order[index] + ring * 10) * 32); + effect->SetAngle(index * step + (spread ? std::max(0, std::rand() % spread) : 0)); + effect->SetDelay((order[index] + ring * 10) * 32); } } } @@ -304,19 +304,19 @@ void CSkillAction_SS_HITOUAKUMU::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x00796490 // FUNCTION: fn_08808 -int CSkillAction_SS_ANKOKURYUUAKUMU::Slot01() { +int CSkillAction_SS_ANKOKURYUUAKUMU::GetSkillCastMotion() { return 55; } // OFFSET: 0x007964A0 // FUNCTION: fn_08809 -int CSkillAction_SS_ANKOKURYUUAKUMU::Slot02() { +int CSkillAction_SS_ANKOKURYUUAKUMU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x007964B0 // FUNCTION: fn_08810 -void CSkillAction_SS_ANKOKURYUUAKUMU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_ANKOKURYUUAKUMU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(812, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); static_cast(source)->LaunchEffect(1656, level / 16); @@ -325,7 +325,7 @@ void CSkillAction_SS_ANKOKURYUUAKUMU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00796510 // FUNCTION: fn_08811 -void CSkillAction_SS_ANKOKURYUUAKUMU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_ANKOKURYUUAKUMU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ankokuryuuakumu_00"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -334,7 +334,7 @@ void CSkillAction_SS_ANKOKURYUUAKUMU::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x00796690 // FUNCTION: fn_08812 -void CSkillAction_SS_ANKOKURYUUAKUMU::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_ANKOKURYUUAKUMU::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ankokuryuuakumu_01"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -343,7 +343,7 @@ void CSkillAction_SS_ANKOKURYUUAKUMU::Slot15(int level, CGameActor* source, CGam // OFFSET: 0x00796810 // FUNCTION: fn_08813 -void CSkillAction_SS_FOUR_CHARM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_FOUR_CHARM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -393,121 +393,121 @@ std::vector ShuffledSequence::operator()(int count) const { class CEfstAction_NIGHTMARE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_SHADOW_CLOCK : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillObjectAction_SS_SBUNSHIN : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; class CSkillObjectAction_SS_KUNAITRAP : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; class CSkillAction_SS_TOKEDASU : public CSkillAction { public: - void Slot12(vector3d position, int argument2, int argument3) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_SS_AKUMUKESU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_SHINKIROU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; }; class CSkillAction_SS_KAGEGARI : public CSkillAction { public: - void Slot12(vector3d position, int argument2, int argument3) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_SS_KAGENOMAI : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_KAGEGISSEN : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_FUUMASHOUAKU : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; }; class CSkillObjectAction_NPC_FUUMA : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_SS_FUUMAKOUCHIKU : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_SS_FUUMASHOUAKU_HIT : public CSkillAction { public: - void Slot15(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_KUNAIWAIKYOKU : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_SS_KUNAIKAITEN : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_KUNAIKUSSETSU : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_SEKIENHOU : public CSkillAction { public: - int Slot01() override; - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; // OFFSET: 0x00792500 // FUNCTION: fn_08738 -void CEfstAction_NIGHTMARE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_NIGHTMARE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("efst_nightmare"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -516,7 +516,7 @@ void CEfstAction_NIGHTMARE::Slot00(int efstId, int value, int argument3, int arg // OFFSET: 0x00792670 // FUNCTION: fn_08739 -void CEfstAction_NIGHTMARE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_NIGHTMARE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("efst_nightmare")); @@ -525,13 +525,13 @@ void CEfstAction_NIGHTMARE::Slot01(int efstId, int argument2, int argument3, int // OFFSET: 0x00792790 // FUNCTION: fn_08740 -void CEfstAction_NIGHTMARE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_NIGHTMARE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007927B0 // FUNCTION: fn_08741 -void CEfstAction_SHADOW_CLOCK::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_SHADOW_CLOCK::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { const vector3d position = actor->render.position; EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("kagekakusi"), position.x, position.y, position.z, 0, -1, 0, 0); @@ -540,7 +540,7 @@ void CEfstAction_SHADOW_CLOCK::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x00792930 // FUNCTION: fn_08742 -void CEfstAction_SHADOW_CLOCK::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SHADOW_CLOCK::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { while (static_cast(actor)->HasId(963)) { actor->SendMsg(nullptr, 109, 0, 963, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -550,7 +550,7 @@ void CEfstAction_SHADOW_CLOCK::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x00792990 // FUNCTION: fn_08743 -void CEfstAction_SHADOW_CLOCK::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SHADOW_CLOCK::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { static_cast(actor)->LaunchEffect(963, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -558,7 +558,7 @@ void CEfstAction_SHADOW_CLOCK::Slot02(int efstId, int value, int argument3, int // OFFSET: 0x007929E0 // FUNCTION: fn_08744 -void CSkillObjectAction_SS_SBUNSHIN::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_SS_SBUNSHIN::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shinkirou_idle_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -569,7 +569,7 @@ void CSkillObjectAction_SS_SBUNSHIN::Slot00(int argument, CRenderObject* object, // OFFSET: 0x00792C60 // FUNCTION: fn_08745 -void CSkillObjectAction_SS_SBUNSHIN::Slot01(CRenderObject* object) { +void CSkillObjectAction_SS_SBUNSHIN::OnSkillObjectRemove(CRenderObject* object) { if (object) { EffectLists* effects = g_effectMgr; effects->Retire(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shinkirou_idle_start")); @@ -583,7 +583,7 @@ void CSkillObjectAction_SS_SBUNSHIN::Slot01(CRenderObject* object) { // OFFSET: 0x00792F90 // FUNCTION: fn_08746 -void CSkillObjectAction_SS_KUNAITRAP::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_SS_KUNAITRAP::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kunaiarea_01_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -594,7 +594,7 @@ void CSkillObjectAction_SS_KUNAITRAP::Slot00(int argument, CRenderObject* object // OFFSET: 0x00793210 // FUNCTION: fn_08747 -void CSkillObjectAction_SS_KUNAITRAP::Slot01(CRenderObject* object) { +void CSkillObjectAction_SS_KUNAITRAP::OnSkillObjectRemove(CRenderObject* object) { if (object) { EffectLists* effects = g_effectMgr; effects->Retire(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kunaiarea_01_loop")); @@ -606,7 +606,7 @@ void CSkillObjectAction_SS_KUNAITRAP::Slot01(CRenderObject* object) { // OFFSET: 0x00793450 // FUNCTION: fn_08748 -void CSkillAction_SS_TOKEDASU::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_SS_TOKEDASU::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { CGameActor* shadow = reinterpret_cast(argument3); EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("tokedasu"), position.x, position.y, position.z, 0, -1, 0, 0); @@ -618,19 +618,19 @@ void CSkillAction_SS_TOKEDASU::Slot12(vector3d position, int argument2, int argu // OFFSET: 0x007936A0 // FUNCTION: fn_08749 -int CSkillAction_SS_AKUMUKESU::Slot01() { +int CSkillAction_SS_AKUMUKESU::GetSkillCastMotion() { return 55; } // OFFSET: 0x007936B0 // FUNCTION: fn_08750 -int CSkillAction_SS_AKUMUKESU::Slot02() { +int CSkillAction_SS_AKUMUKESU::GetSkillAttackMotion() { return 56; } // OFFSET: 0x007936C0 // FUNCTION: fn_08751 -void CSkillAction_SS_AKUMUKESU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_AKUMUKESU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(934, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); static_cast(source)->LaunchEffect(12, level / 16); @@ -639,7 +639,7 @@ void CSkillAction_SS_AKUMUKESU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00793720 // FUNCTION: fn_08752 -void CSkillAction_SS_AKUMUKESU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_AKUMUKESU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("akumukesu"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -648,37 +648,37 @@ void CSkillAction_SS_AKUMUKESU::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00793880 // FUNCTION: fn_08753 -int CSkillAction_SS_SHINKIROU::Slot01() { +int CSkillAction_SS_SHINKIROU::GetSkillCastMotion() { return 55; } // OFFSET: 0x00793890 // FUNCTION: fn_08754 -int CSkillAction_SS_SHINKIROU::Slot02() { +int CSkillAction_SS_SHINKIROU::GetSkillAttackMotion() { return 56; } // OFFSET: 0x007938A0 // FUNCTION: fn_08755 -void CSkillAction_SS_SHINKIROU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_SHINKIROU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2373, level / 16); if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 1774, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x00793920 // FUNCTION: fn_08756 -void CSkillAction_SS_KAGEGARI::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_SS_KAGEGARI::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("kagegari"), position.x, position.y, position.z, 0, -1, 0, 0); } // OFFSET: 0x00793A50 // FUNCTION: fn_08758 -void CSkillAction_SS_KAGENOMAI::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_KAGENOMAI::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(454, level / 16); } @@ -686,7 +686,7 @@ void CSkillAction_SS_KAGENOMAI::Slot08(int level, CGameActor* source) { // OFFSET: 0x00793A80 // FUNCTION: fn_08759 -void CSkillAction_SS_KAGENOMAI::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KAGENOMAI::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kagenomai"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -695,7 +695,7 @@ void CSkillAction_SS_KAGENOMAI::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00793BF0 // FUNCTION: fn_08761 -void CSkillAction_SS_KAGEGISSEN::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_KAGEGISSEN::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(454, level / 16); } @@ -703,7 +703,7 @@ void CSkillAction_SS_KAGEGISSEN::Slot08(int level, CGameActor* source) { // OFFSET: 0x00793C20 // FUNCTION: fn_08762 -void CSkillAction_SS_KAGEGISSEN::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KAGEGISSEN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && target) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("new_kagegissen"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -718,13 +718,13 @@ void CSkillAction_SS_KAGEGISSEN::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x007940C0 // FUNCTION: fn_08763 -int CSkillAction_SS_FUUMASHOUAKU::Slot02() { +int CSkillAction_SS_FUUMASHOUAKU::GetSkillAttackMotion() { return 9; } // OFFSET: 0x007940D0 // FUNCTION: fn_08764 -void CSkillAction_SS_FUUMASHOUAKU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_FUUMASHOUAKU::OnSkillCast(int level, CGameActor* source) { if (source) { g_effectMgr->Spawn(source->render.accountId, 986, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); static_cast(source)->LaunchEffect(454, level / 16); @@ -733,7 +733,7 @@ void CSkillAction_SS_FUUMASHOUAKU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00794140 // FUNCTION: fn_08765 -void CSkillObjectAction_NPC_FUUMA::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_NPC_FUUMA::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object && source) { g_effectMgr->Spawn(object->render.accountId, 2352, source->render.position.x, source->render.position.y, source->render.position.z, object->render.accountId, -1, 0, 0); @@ -742,13 +742,13 @@ void CSkillObjectAction_NPC_FUUMA::Slot00(int argument, CRenderObject* object, C // OFFSET: 0x00794190 // FUNCTION: fn_08766 -int CSkillAction_SS_FUUMAKOUCHIKU::Slot02() { +int CSkillAction_SS_FUUMAKOUCHIKU::GetSkillAttackMotion() { return 9; } // OFFSET: 0x007941A0 // FUNCTION: fn_08767 -void CSkillAction_SS_FUUMAKOUCHIKU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_FUUMAKOUCHIKU::OnSkillCast(int level, CGameActor* source) { if (source) { g_effectMgr->Spawn(source->render.accountId, 986, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); static_cast(source)->LaunchEffect(454, level / 16); @@ -757,14 +757,14 @@ void CSkillAction_SS_FUUMAKOUCHIKU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00794210 // FUNCTION: fn_08768 -void CSkillAction_SS_FUUMAKOUCHIKU::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_SS_FUUMAKOUCHIKU::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("new_fuumakouchiku"), position.x, position.y, position.z, 0, -1, 0, 0); } // OFFSET: 0x00794350 // FUNCTION: fn_08769 -void CSkillAction_SS_FUUMASHOUAKU_HIT::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_FUUMASHOUAKU_HIT::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (target) { const vector3d position = target->render.position; EffectLists* effects = g_effectMgr; @@ -774,13 +774,13 @@ void CSkillAction_SS_FUUMASHOUAKU_HIT::Slot15(int level, CGameActor* source, CGa // OFFSET: 0x007944C0 // FUNCTION: fn_08770 -int CSkillAction_SS_KUNAIWAIKYOKU::Slot02() { +int CSkillAction_SS_KUNAIWAIKYOKU::GetSkillAttackMotion() { return 9; } // OFFSET: 0x007944D0 // FUNCTION: fn_08771 -void CSkillAction_SS_KUNAIWAIKYOKU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_KUNAIWAIKYOKU::OnSkillCast(int level, CGameActor* source) { if (source) { g_effectMgr->Spawn(source->render.accountId, 986, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); static_cast(source)->LaunchEffect(454, level / 16); @@ -789,27 +789,27 @@ void CSkillAction_SS_KUNAIWAIKYOKU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00794540 // FUNCTION: fn_08772 -void CSkillAction_SS_KUNAIWAIKYOKU::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_SS_KUNAIWAIKYOKU::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { CGameActor* shadow = reinterpret_cast(argument3); if (shadow) { const float angle = ScreenAngle(&shadow->render.position.x, &position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values); const vector3d spot = shadow->render.position; EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("kunaiwaikyoku"), spot.x, spot.y, spot.z, 0, -1, 0, 0)) { - effect->Slot17(angle); + effect->SetAngle(angle); } } } // OFFSET: 0x007946E0 // FUNCTION: fn_08773 -int CSkillAction_SS_KUNAIKAITEN::Slot02() { +int CSkillAction_SS_KUNAIKAITEN::GetSkillAttackMotion() { return 9; } // OFFSET: 0x007946F0 // FUNCTION: fn_08774 -void CSkillAction_SS_KUNAIKAITEN::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KUNAIKAITEN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { std::string names[] = {"kunaikaiten_bottom", "kunaikaiten_00", "kunaikaiten_01", "kunaikaiten_02"}; for (int wave = 0; wave < 4; ++wave) { @@ -818,7 +818,7 @@ void CSkillAction_SS_KUNAIKAITEN::Slot11(int level, CGameActor* source, CGameAct CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId(name), source->render.position.x, source->render.position.y, source->render.position.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(wave * 480); + effect->SetDelay(wave * 480); } } } @@ -827,13 +827,13 @@ void CSkillAction_SS_KUNAIKAITEN::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x00794970 // FUNCTION: fn_08775 -int CSkillAction_SS_KUNAIKUSSETSU::Slot02() { +int CSkillAction_SS_KUNAIKUSSETSU::GetSkillAttackMotion() { return 56; } // OFFSET: 0x00794980 // FUNCTION: fn_08776 -void CSkillAction_SS_KUNAIKUSSETSU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_KUNAIKUSSETSU::OnSkillCast(int level, CGameActor* source) { if (source) { g_effectMgr->Spawn(source->render.accountId, 986, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); static_cast(source)->LaunchEffect(454, level / 16); @@ -842,7 +842,7 @@ void CSkillAction_SS_KUNAIKUSSETSU::Slot08(int level, CGameActor* source) { // OFFSET: 0x007949F0 // FUNCTION: fn_08777 -void CSkillAction_SS_KUNAIKUSSETSU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_KUNAIKUSSETSU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kunaikussetsu"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -859,19 +859,19 @@ void CSkillAction_SS_KUNAIKUSSETSU::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x00794E80 // FUNCTION: fn_08778 -int CSkillAction_SS_SEKIENHOU::Slot01() { +int CSkillAction_SS_SEKIENHOU::GetSkillCastMotion() { return 55; } // OFFSET: 0x00794E90 // FUNCTION: fn_08779 -int CSkillAction_SS_SEKIENHOU::Slot02() { +int CSkillAction_SS_SEKIENHOU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x00794EA0 // FUNCTION: fn_08780 -void CSkillAction_SS_SEKIENHOU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_SEKIENHOU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(55, level / 16); } @@ -879,31 +879,31 @@ void CSkillAction_SS_SEKIENHOU::Slot08(int level, CGameActor* source) { // OFFSET: 0x00794ED0 // FUNCTION: fn_08781 -void CSkillAction_SS_SEKIENHOU::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SS_SEKIENHOU::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { g_effectMgr->Spawn(0, 1270, target->render.position.x, target->render.position.y, target->render.position.z, 0, -1, 0, 0); const vector3d position = target->render.position; if (CEffect* effect = g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("new_sekienhou"), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot17(270.0f); + effect->SetAngle(270.0f); } } } // OFFSET: 0x00795070 // FUNCTION: fn_08782 -int CSkillAction_SS_REIKETSUHOU::Slot01() { +int CSkillAction_SS_REIKETSUHOU::GetSkillCastMotion() { return 55; } // OFFSET: 0x00795080 // FUNCTION: fn_08783 -int CSkillAction_SS_REIKETSUHOU::Slot02() { +int CSkillAction_SS_REIKETSUHOU::GetSkillAttackMotion() { return 57; } // OFFSET: 0x00795090 // FUNCTION: fn_08784 -void CSkillAction_SS_REIKETSUHOU::Slot08(int level, CGameActor* source) { +void CSkillAction_SS_REIKETSUHOU::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(54, level / 16); } diff --git a/Source/Contents/Skills/SkillActionSkyEmperor.cpp b/Source/Contents/Skills/SkillActionSkyEmperor.cpp index d1d9f9513..61e34006b 100644 --- a/Source/Contents/Skills/SkillActionSkyEmperor.cpp +++ b/Source/Contents/Skills/SkillActionSkyEmperor.cpp @@ -11,160 +11,160 @@ class CSkillObjectAction_SKE_STAR_CANNON : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_SKE_ALL_IN_THE_SKY : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot09(int argument1, int argument2, int argument3) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnTargetSkillCast(int argument1, int argument2, int argument3) override; }; class CSkillAction_SKE_ENCHANTING_SKY : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; + void OnSkillCast(int level, CGameActor* source) override; }; class CEfstAction_SKY_ENCHANT : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SKE_SKY_SUN : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_SKY_MOON : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_STAR_LIGHT_KICK : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_RISING_SUN : public CSkillAction { public: - int Slot02() override; + int GetSkillAttackMotion() override; }; class CEfstAction_RISING_SUN : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_NOON_SUN : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_SUNSET_SUN : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SKE_NOON_BLAST : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_SUNSET_BLAST : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_RISING_MOON : public CSkillAction { public: - int Slot02() override; + int GetSkillAttackMotion() override; }; class CEfstAction_RISING_MOON : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_MIDNIGHT_MOON : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_DAWN_MOON : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SKE_MIDNIGHT_KICK : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_DAWN_BREAK : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_TWINKLING_GALAXY : public CSkillAction { public: - bool Slot03(int argument) override; - bool Slot05() override; - void Slot08(int level, CGameActor* source) override; + bool KeepSkillAttackMotion(int argument) override; + bool KeepSkillAttackSpeed() override; + void OnSkillCast(int level, CGameActor* source) override; }; class CSkillObjectAction_SKE_TWINKLING_GALAXY : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_SKE_STAR_BURST : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; }; class CEfstAction_STAR_BURST : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SKE_STAR_CANNON : public CSkillAction { public: - bool Slot03(int argument) override; - bool Slot05() override; - void Slot08(int level, CGameActor* source) override; + bool KeepSkillAttackMotion(int argument) override; + bool KeepSkillAttackSpeed() override; + void OnSkillCast(int level, CGameActor* source) override; }; // OFFSET: 0x007975A0 // FUNCTION: fn_08815 -void CSkillObjectAction_SKE_STAR_CANNON::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_SKE_STAR_CANNON::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { g_effectMgr->Spawn(object->render.accountId, 2350, object->render.position.x, object->render.position.y, object->render.position.z, 0, argument, 0, 0); } @@ -172,13 +172,13 @@ void CSkillObjectAction_SKE_STAR_CANNON::Slot00(int argument, CRenderObject* obj // OFFSET: 0x007975F0 // FUNCTION: fn_08816 -int CSkillAction_SKE_ALL_IN_THE_SKY::Slot02() { +int CSkillAction_SKE_ALL_IN_THE_SKY::GetSkillAttackMotion() { return 53; } // OFFSET: 0x00797600 // FUNCTION: fn_08817 -void CSkillAction_SKE_ALL_IN_THE_SKY::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_ALL_IN_THE_SKY::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(845, level / 16); } @@ -186,7 +186,7 @@ void CSkillAction_SKE_ALL_IN_THE_SKY::Slot08(int level, CGameActor* source) { // OFFSET: 0x00797630 // FUNCTION: fn_08818 -void CSkillAction_SKE_ALL_IN_THE_SKY::Slot09(int argument1, int argument2, int argument3) { +void CSkillAction_SKE_ALL_IN_THE_SKY::OnTargetSkillCast(int argument1, int argument2, int argument3) { if (CGameActor* source = reinterpret_cast(argument2)) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_all_in_the_sky"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -195,7 +195,7 @@ void CSkillAction_SKE_ALL_IN_THE_SKY::Slot09(int argument1, int argument2, int a // OFFSET: 0x007977B0 // FUNCTION: fn_08819 -void CSkillAction_SKE_ENCHANTING_SKY::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_ENCHANTING_SKY::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(831, level / 16); } @@ -203,7 +203,7 @@ void CSkillAction_SKE_ENCHANTING_SKY::Slot08(int level, CGameActor* source) { // OFFSET: 0x007977E0 // FUNCTION: fn_08820 -void CEfstAction_SKY_ENCHANT::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_SKY_ENCHANT::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_enchanting_sky_00"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -214,7 +214,7 @@ void CEfstAction_SKY_ENCHANT::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x00797A70 // FUNCTION: fn_08821 -void CEfstAction_SKY_ENCHANT::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SKY_ENCHANT::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_enchanting_sky_01")); @@ -223,7 +223,7 @@ void CEfstAction_SKY_ENCHANT::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x00797BB0 // FUNCTION: fn_08822 -void CEfstAction_SKY_ENCHANT::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SKY_ENCHANT::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_enchanting_sky_01"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -232,7 +232,7 @@ void CEfstAction_SKY_ENCHANT::Slot02(int efstId, int value, int argument3, int a // OFFSET: 0x00797D40 // FUNCTION: fn_08824 -void CSkillAction_SKE_SKY_SUN::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_SKY_SUN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -253,13 +253,13 @@ void CSkillAction_SKE_SKY_SUN::Slot11(int level, CGameActor* source, CGameActor* effect->position[0] = target->render.position.x + offsetX; effect->position[1] = target->render.position.y + 0.0f; effect->position[2] = target->render.position.z + offsetZ; - effect->Slot16(index * 32); + effect->SetDelay(index * 32); } } // OFFSET: 0x007980C0 // FUNCTION: fn_08825 -void CSkillAction_SKE_SKY_SUN::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_SKY_SUN::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sky_sun_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -268,22 +268,22 @@ void CSkillAction_SKE_SKY_SUN::Slot16(int level, CGameActor* source, CGameActor* // OFFSET: 0x00798240 // FUNCTION: fn_08827 -void CSkillAction_SKE_SKY_MOON::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_SKY_MOON::OnSkillCast(int level, CGameActor* source) { if (source) { if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sky_moon_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sky_moon_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007984D0 // FUNCTION: fn_08828 -void CSkillAction_SKE_SKY_MOON::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_SKY_MOON::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -291,18 +291,18 @@ void CSkillAction_SKE_SKY_MOON::Slot11(int level, CGameActor* source, CGameActor const float scale = source->unknown_0378 * source->render.speed * 16.0f; EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sky_moon"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sky_moon_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } } // OFFSET: 0x00798770 // FUNCTION: fn_08829 -void CSkillAction_SKE_SKY_MOON::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_SKY_MOON::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sky_moon_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -311,7 +311,7 @@ void CSkillAction_SKE_SKY_MOON::Slot16(int level, CGameActor* source, CGameActor // OFFSET: 0x007988D0 // FUNCTION: fn_08830 -void CSkillAction_SKE_STAR_LIGHT_KICK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_STAR_LIGHT_KICK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -325,7 +325,7 @@ void CSkillAction_SKE_STAR_LIGHT_KICK::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x00798B90 // FUNCTION: fn_08831 -void CSkillAction_SKE_STAR_LIGHT_KICK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_STAR_LIGHT_KICK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("star_light_kick_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -334,13 +334,13 @@ void CSkillAction_SKE_STAR_LIGHT_KICK::Slot16(int level, CGameActor* source, CGa // OFFSET: 0x00798D10 // FUNCTION: fn_08832 -int CSkillAction_SKE_RISING_SUN::Slot02() { +int CSkillAction_SKE_RISING_SUN::GetSkillAttackMotion() { return 52; } // OFFSET: 0x00798D20 // FUNCTION: fn_08833 -void CEfstAction_RISING_SUN::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_RISING_SUN::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_00"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_01"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -349,7 +349,7 @@ void CEfstAction_RISING_SUN::Slot00(int efstId, int value, int argument3, int ar // OFFSET: 0x00798FA0 // FUNCTION: fn_08834 -void CEfstAction_RISING_SUN::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_RISING_SUN::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_01")); @@ -358,7 +358,7 @@ void CEfstAction_RISING_SUN::Slot01(int efstId, int argument2, int argument3, in // OFFSET: 0x007990D0 // FUNCTION: fn_08835 -void CEfstAction_RISING_SUN::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_RISING_SUN::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_01"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -367,7 +367,7 @@ void CEfstAction_RISING_SUN::Slot02(int efstId, int value, int argument3, int ar // OFFSET: 0x00799250 // FUNCTION: fn_08836 -void CEfstAction_NOON_SUN::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_NOON_SUN::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_02"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_03"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -376,7 +376,7 @@ void CEfstAction_NOON_SUN::Slot00(int efstId, int value, int argument3, int argu // OFFSET: 0x007994D0 // FUNCTION: fn_08837 -void CEfstAction_NOON_SUN::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_NOON_SUN::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_03")); @@ -385,7 +385,7 @@ void CEfstAction_NOON_SUN::Slot01(int efstId, int argument2, int argument3, int // OFFSET: 0x00799600 // FUNCTION: fn_08838 -void CEfstAction_NOON_SUN::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_NOON_SUN::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_03"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -394,7 +394,7 @@ void CEfstAction_NOON_SUN::Slot02(int efstId, int value, int argument3, int argu // OFFSET: 0x00799780 // FUNCTION: fn_08839 -void CEfstAction_SUNSET_SUN::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_SUNSET_SUN::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_04"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_05"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -403,7 +403,7 @@ void CEfstAction_SUNSET_SUN::Slot00(int efstId, int value, int argument3, int ar // OFFSET: 0x00799A00 // FUNCTION: fn_08840 -void CEfstAction_SUNSET_SUN::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SUNSET_SUN::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_05")); @@ -412,7 +412,7 @@ void CEfstAction_SUNSET_SUN::Slot01(int efstId, int argument2, int argument3, in // OFFSET: 0x00799B30 // FUNCTION: fn_08841 -void CEfstAction_SUNSET_SUN::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SUNSET_SUN::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_sun_05"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -421,13 +421,13 @@ void CEfstAction_SUNSET_SUN::Slot02(int efstId, int value, int argument3, int ar // OFFSET: 0x00799CB0 // FUNCTION: fn_08842 -int CSkillAction_SKE_NOON_BLAST::Slot02() { +int CSkillAction_SKE_NOON_BLAST::GetSkillAttackMotion() { return 52; } // OFFSET: 0x00799CC0 // FUNCTION: fn_08843 -void CSkillAction_SKE_NOON_BLAST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_NOON_BLAST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_noon_blast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -436,13 +436,13 @@ void CSkillAction_SKE_NOON_BLAST::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x00799E30 // FUNCTION: fn_08844 -int CSkillAction_SKE_SUNSET_BLAST::Slot02() { +int CSkillAction_SKE_SUNSET_BLAST::GetSkillAttackMotion() { return 52; } // OFFSET: 0x00799E40 // FUNCTION: fn_08845 -void CSkillAction_SKE_SUNSET_BLAST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_SUNSET_BLAST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -463,19 +463,19 @@ void CSkillAction_SKE_SUNSET_BLAST::Slot11(int level, CGameActor* source, CGameA effect->position[0] = target->render.position.x + offsetX; effect->position[1] = target->render.position.y + 0.0f; effect->position[2] = target->render.position.z + offsetZ; - effect->Slot16(index * 32); + effect->SetDelay(index * 32); } } // OFFSET: 0x0079A1C0 // FUNCTION: fn_08846 -int CSkillAction_SKE_RISING_MOON::Slot02() { +int CSkillAction_SKE_RISING_MOON::GetSkillAttackMotion() { return 53; } // OFFSET: 0x0079A1D0 // FUNCTION: fn_08847 -void CEfstAction_RISING_MOON::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_RISING_MOON::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_00"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -486,7 +486,7 @@ void CEfstAction_RISING_MOON::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x0079A450 // FUNCTION: fn_08848 -void CEfstAction_RISING_MOON::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_RISING_MOON::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_01")); @@ -495,7 +495,7 @@ void CEfstAction_RISING_MOON::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x0079A580 // FUNCTION: fn_08849 -void CEfstAction_RISING_MOON::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_RISING_MOON::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_01"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -504,7 +504,7 @@ void CEfstAction_RISING_MOON::Slot02(int efstId, int value, int argument3, int a // OFFSET: 0x0079A700 // FUNCTION: fn_08850 -void CEfstAction_MIDNIGHT_MOON::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_MIDNIGHT_MOON::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_02"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -515,7 +515,7 @@ void CEfstAction_MIDNIGHT_MOON::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x0079A980 // FUNCTION: fn_08851 -void CEfstAction_MIDNIGHT_MOON::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_MIDNIGHT_MOON::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_03")); @@ -524,7 +524,7 @@ void CEfstAction_MIDNIGHT_MOON::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0079AAB0 // FUNCTION: fn_08852 -void CEfstAction_MIDNIGHT_MOON::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_MIDNIGHT_MOON::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_03"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -533,7 +533,7 @@ void CEfstAction_MIDNIGHT_MOON::Slot02(int efstId, int value, int argument3, int // OFFSET: 0x0079AC30 // FUNCTION: fn_08853 -void CEfstAction_DAWN_MOON::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_DAWN_MOON::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_04"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -544,7 +544,7 @@ void CEfstAction_DAWN_MOON::Slot00(int efstId, int value, int argument3, int arg // OFFSET: 0x0079AEB0 // FUNCTION: fn_08854 -void CEfstAction_DAWN_MOON::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_DAWN_MOON::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_05")); @@ -553,7 +553,7 @@ void CEfstAction_DAWN_MOON::Slot01(int efstId, int argument2, int argument3, int // OFFSET: 0x0079AFE0 // FUNCTION: fn_08855 -void CEfstAction_DAWN_MOON::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_DAWN_MOON::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_rising_moon_05"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -562,13 +562,13 @@ void CEfstAction_DAWN_MOON::Slot02(int efstId, int value, int argument3, int arg // OFFSET: 0x0079B160 // FUNCTION: fn_08856 -int CSkillAction_SKE_MIDNIGHT_KICK::Slot02() { +int CSkillAction_SKE_MIDNIGHT_KICK::GetSkillAttackMotion() { return 53; } // OFFSET: 0x0079B170 // FUNCTION: fn_08857 -void CSkillAction_SKE_MIDNIGHT_KICK::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_MIDNIGHT_KICK::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -576,7 +576,7 @@ void CSkillAction_SKE_MIDNIGHT_KICK::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079B1A0 // FUNCTION: fn_08858 -void CSkillAction_SKE_MIDNIGHT_KICK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_MIDNIGHT_KICK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_midnight_kick"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -585,13 +585,13 @@ void CSkillAction_SKE_MIDNIGHT_KICK::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x0079B320 // FUNCTION: fn_08859 -int CSkillAction_SKE_DAWN_BREAK::Slot02() { +int CSkillAction_SKE_DAWN_BREAK::GetSkillAttackMotion() { return 53; } // OFFSET: 0x0079B330 // FUNCTION: fn_08860 -void CSkillAction_SKE_DAWN_BREAK::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_DAWN_BREAK::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -599,7 +599,7 @@ void CSkillAction_SKE_DAWN_BREAK::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079B360 // FUNCTION: fn_08861 -void CSkillAction_SKE_DAWN_BREAK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SKE_DAWN_BREAK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ske_dawn_break"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -608,19 +608,19 @@ void CSkillAction_SKE_DAWN_BREAK::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x0079B4D0 // FUNCTION: fn_08862 -bool CSkillAction_SKE_TWINKLING_GALAXY::Slot03(int argument) { +bool CSkillAction_SKE_TWINKLING_GALAXY::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x0079B4E0 // FUNCTION: fn_08863 -bool CSkillAction_SKE_TWINKLING_GALAXY::Slot05() { +bool CSkillAction_SKE_TWINKLING_GALAXY::KeepSkillAttackSpeed() { return true; } // OFFSET: 0x0079B4F0 // FUNCTION: fn_08864 -void CSkillAction_SKE_TWINKLING_GALAXY::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_TWINKLING_GALAXY::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } @@ -628,7 +628,7 @@ void CSkillAction_SKE_TWINKLING_GALAXY::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079B520 // FUNCTION: fn_08865 -void CSkillObjectAction_SKE_TWINKLING_GALAXY::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_SKE_TWINKLING_GALAXY::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { g_effectMgr->Spawn(object->render.accountId, 2349, object->render.position.x, object->render.position.y, object->render.position.z, 0, argument, 0, 0); } @@ -636,13 +636,13 @@ void CSkillObjectAction_SKE_TWINKLING_GALAXY::Slot00(int argument, CRenderObject // OFFSET: 0x0079B570 // FUNCTION: fn_08866 -bool CSkillAction_SKE_STAR_BURST::Slot03(int argument) { +bool CSkillAction_SKE_STAR_BURST::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x0079B580 // FUNCTION: fn_08867 -void CSkillAction_SKE_STAR_BURST::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_STAR_BURST::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } @@ -650,7 +650,7 @@ void CSkillAction_SKE_STAR_BURST::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079B5B0 // FUNCTION: fn_08868 -void CEfstAction_STAR_BURST::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_STAR_BURST::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, 2348, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -658,7 +658,7 @@ void CEfstAction_STAR_BURST::Slot00(int efstId, int value, int argument3, int ar // OFFSET: 0x0079B600 // FUNCTION: fn_08869 -void CEfstAction_STAR_BURST::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_STAR_BURST::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2348); } @@ -666,25 +666,25 @@ void CEfstAction_STAR_BURST::Slot01(int efstId, int argument2, int argument3, in // OFFSET: 0x0079B630 // FUNCTION: fn_08870 -void CEfstAction_STAR_BURST::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_STAR_BURST::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079B650 // FUNCTION: fn_08871 -bool CSkillAction_SKE_STAR_CANNON::Slot03(int argument) { +bool CSkillAction_SKE_STAR_CANNON::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x0079B660 // FUNCTION: fn_08872 -bool CSkillAction_SKE_STAR_CANNON::Slot05() { +bool CSkillAction_SKE_STAR_CANNON::KeepSkillAttackSpeed() { return true; } // OFFSET: 0x0079B670 // FUNCTION: fn_08873 -void CSkillAction_SKE_STAR_CANNON::Slot08(int level, CGameActor* source) { +void CSkillAction_SKE_STAR_CANNON::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } diff --git a/Source/Contents/Skills/SkillActionSoulAscetic.cpp b/Source/Contents/Skills/SkillActionSoulAscetic.cpp index 7c8e5aba1..684cd8c8d 100644 --- a/Source/Contents/Skills/SkillActionSoulAscetic.cpp +++ b/Source/Contents/Skills/SkillActionSoulAscetic.cpp @@ -9,158 +9,158 @@ class CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS : public CSkillAction { public: - bool Slot00() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int argument1, CGameActor* argument2, CGameActor* argument3) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int argument1, CGameActor* argument2, CGameActor* argument3) override; }; class CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_T_FIRST_GOD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_T_SECOND_GOD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_T_THIRD_GOD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; - int Slot14() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; + int GetSkillScopeType() override; }; class CEfstAction_T_FOURTH_GOD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_T_FIVETH_GOD : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH : public CSkillAction { public: - bool Slot00() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_HEAVEN_AND_EARTH : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SOA_TALISMAN_OF_PROTECTION : public CSkillAction { public: - bool Slot00() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_TALISMAN_OF_WARRIOR : public CSkillAction { public: - bool Slot00() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_TALISMAN_OF_MAGICIAN : public CSkillAction { public: - bool Slot00() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_SOUL_GATHERING : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SOA_TOTEM_OF_TUTELARY : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - int Slot14() override; + void OnSkillCast(int level, CGameActor* source) override; + int GetSkillScopeType() override; }; class CSkillObjectAction_SOA_TOTEM_OF_TUTELARY : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; // OFFSET: 0x0079B9A0 // FUNCTION: fn_08874 -bool CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::Slot00() { +bool CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::IsSupport() { return true; } // OFFSET: 0x0079B9B0 // FUNCTION: fn_08875 -void CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -168,7 +168,7 @@ void CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::Slot08(int level, CGameActor* s // OFFSET: 0x0079B9E0 // FUNCTION: fn_08876 -void CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_the_five_elements"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -177,7 +177,7 @@ void CSkillAction_SOA_TALISMAN_OF_FIVE_ELEMENTS::Slot11(int level, CGameActor* s // OFFSET: 0x0079BB70 // FUNCTION: fn_08877 -void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } @@ -185,7 +185,7 @@ void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::Slot08(int level, CGameActor* s // OFFSET: 0x0079BBA0 // FUNCTION: fn_08878 -void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { target->LaunchEffect(253, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); target->SendMsg(nullptr, 88, 0, level, level >> 31, static_cast(0xFF0000FF), 0, 114, 0, 0, 0, 0, 0, 0, 0); @@ -194,7 +194,7 @@ void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::Slot11(int level, CGameActor* s // OFFSET: 0x0079BC20 // FUNCTION: fn_08879 -void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::Slot15(int argument1, CGameActor* argument2, CGameActor* argument3) { +void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::OnSkillHit(int argument1, CGameActor* argument2, CGameActor* argument3) { CGameActor* source = reinterpret_cast(argument1); CGameActor* target = argument2; if (source) { @@ -207,7 +207,7 @@ void CSkillAction_SOA_TALISMAN_OF_SOUL_STEALING::Slot15(int argument1, CGameActo // OFFSET: 0x0079BEC0 // FUNCTION: fn_08880 -void CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -215,7 +215,7 @@ void CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL::Slot08(int level, CGameActor* // OFFSET: 0x0079BEF0 // FUNCTION: fn_08881 -void CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("exorcism_of_malicuous_soul"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -224,7 +224,7 @@ void CSkillAction_SOA_EXORCISM_OF_MALICIOUS_SOUL::Slot11(int level, CGameActor* // OFFSET: 0x0079C080 // FUNCTION: fn_08882 -void CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(845, level / 16); } @@ -232,7 +232,7 @@ void CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON::Slot08(int level, CGameActor* sou // OFFSET: 0x0079C0B0 // FUNCTION: fn_08883 -void CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_blue_dragon"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -240,7 +240,7 @@ void CSkillAction_SOA_TALISMAN_OF_BLUE_DRAGON::Slot11(int level, CGameActor* sou // OFFSET: 0x0079C240 // FUNCTION: fn_08884 -void CEfstAction_T_FIRST_GOD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_T_FIRST_GOD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2355); g_effectMgr->Spawn(actor->render.accountId, 2355, actor->render.position.x, actor->render.position.y, actor->render.position.z, 0, 1, 0, 0); @@ -249,7 +249,7 @@ void CEfstAction_T_FIRST_GOD::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x0079C2A0 // FUNCTION: fn_08885 -void CEfstAction_T_FIRST_GOD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_T_FIRST_GOD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { if (CEffect* effect = g_effectMgr->Find(actor->render.accountId, 2355)) { static_cast(effect)->PlayEnd(); @@ -259,13 +259,13 @@ void CEfstAction_T_FIRST_GOD::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x0079C2D0 // FUNCTION: fn_08886 -void CEfstAction_T_FIRST_GOD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_T_FIRST_GOD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079C2F0 // FUNCTION: fn_08887 -void CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(843, level / 16); } @@ -273,7 +273,7 @@ void CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER::Slot08(int level, CGameActor* sou // OFFSET: 0x0079C320 // FUNCTION: fn_08888 -void CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_white_tiger"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -281,7 +281,7 @@ void CSkillAction_SOA_TALISMAN_OF_WHITE_TIGER::Slot11(int level, CGameActor* sou // OFFSET: 0x0079C4B0 // FUNCTION: fn_08889 -void CEfstAction_T_SECOND_GOD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_T_SECOND_GOD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2355); g_effectMgr->Spawn(actor->render.accountId, 2355, actor->render.position.x, actor->render.position.y, actor->render.position.z, 0, 2, 0, 0); @@ -290,7 +290,7 @@ void CEfstAction_T_SECOND_GOD::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x0079C510 // FUNCTION: fn_08890 -void CEfstAction_T_SECOND_GOD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_T_SECOND_GOD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { if (CEffect* effect = g_effectMgr->Find(actor->render.accountId, 2355)) { static_cast(effect)->PlayEnd(); @@ -300,13 +300,13 @@ void CEfstAction_T_SECOND_GOD::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0079C540 // FUNCTION: fn_08891 -void CEfstAction_T_SECOND_GOD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_T_SECOND_GOD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079C560 // FUNCTION: fn_08892 -void CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(840, level / 16); } @@ -314,7 +314,7 @@ void CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX::Slot08(int level, CGameActor* sou // OFFSET: 0x0079C590 // FUNCTION: fn_08893 -void CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_red_phoenix_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -325,7 +325,7 @@ void CSkillAction_SOA_TALISMAN_OF_RED_PHOENIX::Slot11(int level, CGameActor* sou // OFFSET: 0x0079C840 // FUNCTION: fn_08894 -void CEfstAction_T_THIRD_GOD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_T_THIRD_GOD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2355); g_effectMgr->Spawn(actor->render.accountId, 2355, actor->render.position.x, actor->render.position.y, actor->render.position.z, 0, 3, 0, 0); @@ -334,7 +334,7 @@ void CEfstAction_T_THIRD_GOD::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x0079C8A0 // FUNCTION: fn_08895 -void CEfstAction_T_THIRD_GOD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_T_THIRD_GOD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { if (CEffect* effect = g_effectMgr->Find(actor->render.accountId, 2355)) { static_cast(effect)->PlayEnd(); @@ -344,13 +344,13 @@ void CEfstAction_T_THIRD_GOD::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x0079C8D0 // FUNCTION: fn_08896 -void CEfstAction_T_THIRD_GOD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_T_THIRD_GOD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079C8F0 // FUNCTION: fn_08897 -void CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2368, level / 16); } @@ -358,7 +358,7 @@ void CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::Slot08(int level, CGameActor* // OFFSET: 0x0079C920 // FUNCTION: fn_08898 -void CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { EffectLists* effects = g_effectMgr; effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_black_tortoise_bottom"), position.x, position.y, position.z, 0, -1, 0, 0); effects = g_effectMgr; @@ -367,13 +367,13 @@ void CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::Slot12(vector3d position, int // OFFSET: 0x0079CB60 // FUNCTION: fn_08899 -int CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::Slot14() { +int CSkillAction_SOA_TALISMAN_OF_BLACK_TORTOISE::GetSkillScopeType() { return 9; } // OFFSET: 0x0079CB70 // FUNCTION: fn_08900 -void CEfstAction_T_FOURTH_GOD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_T_FOURTH_GOD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2355); g_effectMgr->Spawn(actor->render.accountId, 2355, actor->render.position.x, actor->render.position.y, actor->render.position.z, 0, 4, 0, 0); @@ -382,7 +382,7 @@ void CEfstAction_T_FOURTH_GOD::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x0079CBD0 // FUNCTION: fn_08901 -void CEfstAction_T_FOURTH_GOD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_T_FOURTH_GOD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { if (CEffect* effect = g_effectMgr->Find(actor->render.accountId, 2355)) { static_cast(effect)->PlayEnd(); @@ -392,13 +392,13 @@ void CEfstAction_T_FOURTH_GOD::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0079CC00 // FUNCTION: fn_08902 -void CEfstAction_T_FOURTH_GOD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_T_FOURTH_GOD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079CC20 // FUNCTION: fn_08903 -void CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2369, level / 16); } @@ -406,7 +406,7 @@ void CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD::Slot08(int level, CGameActor // OFFSET: 0x0079CC50 // FUNCTION: fn_08904 -void CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_four_bearing_god"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -415,7 +415,7 @@ void CSkillAction_SOA_TALISMAN_OF_FOUR_BEARING_GOD::Slot11(int level, CGameActor // OFFSET: 0x0079CDD0 // FUNCTION: fn_08905 -void CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(1565, level / 16); } @@ -423,7 +423,7 @@ void CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS::Slot08(int level, CGa // OFFSET: 0x0079CE00 // FUNCTION: fn_08906 -void CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("circle_directions_elements"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -432,7 +432,7 @@ void CSkillAction_SOA_CIRCLE_OF_DIRECTIONS_AND_ELEMENTALS::Slot11(int level, CGa // OFFSET: 0x0079CF90 // FUNCTION: fn_08907 -void CEfstAction_T_FIVETH_GOD::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_T_FIVETH_GOD::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("circle_directions_elements_loop"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -441,7 +441,7 @@ void CEfstAction_T_FIVETH_GOD::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x0079D130 // FUNCTION: fn_08908 -void CEfstAction_T_FIVETH_GOD::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_T_FIVETH_GOD::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("circle_directions_elements_loop")); @@ -450,19 +450,19 @@ void CEfstAction_T_FIVETH_GOD::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0079D280 // FUNCTION: fn_08909 -void CEfstAction_T_FIVETH_GOD::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_T_FIVETH_GOD::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079D2A0 // FUNCTION: fn_08910 -bool CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::Slot00() { +bool CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::IsSupport() { return true; } // OFFSET: 0x0079D2B0 // FUNCTION: fn_08911 -void CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(1556, level / 16); } @@ -470,7 +470,7 @@ void CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::Slot08(int level, CGameActor* so // OFFSET: 0x0079D2E0 // FUNCTION: fn_08912 -void CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("soul_of_heaven_and_earth"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -479,7 +479,7 @@ void CSkillAction_SOA_SOUL_OF_HEAVEN_AND_EARTH::Slot11(int level, CGameActor* so // OFFSET: 0x0079D460 // FUNCTION: fn_08913 -void CEfstAction_HEAVEN_AND_EARTH::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_HEAVEN_AND_EARTH::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("soul_of_heaven_and_earth_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -488,7 +488,7 @@ void CEfstAction_HEAVEN_AND_EARTH::Slot00(int efstId, int value, int argument3, // OFFSET: 0x0079D5F0 // FUNCTION: fn_08914 -void CEfstAction_HEAVEN_AND_EARTH::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_HEAVEN_AND_EARTH::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("soul_of_heaven_and_earth_buff")); @@ -497,19 +497,19 @@ void CEfstAction_HEAVEN_AND_EARTH::Slot01(int efstId, int argument2, int argumen // OFFSET: 0x0079D740 // FUNCTION: fn_08915 -void CEfstAction_HEAVEN_AND_EARTH::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_HEAVEN_AND_EARTH::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079D760 // FUNCTION: fn_08916 -bool CSkillAction_SOA_TALISMAN_OF_PROTECTION::Slot00() { +bool CSkillAction_SOA_TALISMAN_OF_PROTECTION::IsSupport() { return true; } // OFFSET: 0x0079D770 // FUNCTION: fn_08917 -void CSkillAction_SOA_TALISMAN_OF_PROTECTION::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_PROTECTION::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -517,7 +517,7 @@ void CSkillAction_SOA_TALISMAN_OF_PROTECTION::Slot08(int level, CGameActor* sour // OFFSET: 0x0079D7A0 // FUNCTION: fn_08918 -void CSkillAction_SOA_TALISMAN_OF_PROTECTION::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_PROTECTION::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_protection"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -526,13 +526,13 @@ void CSkillAction_SOA_TALISMAN_OF_PROTECTION::Slot11(int level, CGameActor* sour // OFFSET: 0x0079D920 // FUNCTION: fn_08919 -bool CSkillAction_SOA_TALISMAN_OF_WARRIOR::Slot00() { +bool CSkillAction_SOA_TALISMAN_OF_WARRIOR::IsSupport() { return true; } // OFFSET: 0x0079D930 // FUNCTION: fn_08920 -void CSkillAction_SOA_TALISMAN_OF_WARRIOR::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_WARRIOR::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -540,7 +540,7 @@ void CSkillAction_SOA_TALISMAN_OF_WARRIOR::Slot08(int level, CGameActor* source) // OFFSET: 0x0079D960 // FUNCTION: fn_08921 -void CSkillAction_SOA_TALISMAN_OF_WARRIOR::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_WARRIOR::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_warrior"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -549,13 +549,13 @@ void CSkillAction_SOA_TALISMAN_OF_WARRIOR::Slot11(int level, CGameActor* source, // OFFSET: 0x0079DAE0 // FUNCTION: fn_08922 -bool CSkillAction_SOA_TALISMAN_OF_MAGICIAN::Slot00() { +bool CSkillAction_SOA_TALISMAN_OF_MAGICIAN::IsSupport() { return true; } // OFFSET: 0x0079DAF0 // FUNCTION: fn_08923 -void CSkillAction_SOA_TALISMAN_OF_MAGICIAN::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TALISMAN_OF_MAGICIAN::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(830, level / 16); } @@ -563,7 +563,7 @@ void CSkillAction_SOA_TALISMAN_OF_MAGICIAN::Slot08(int level, CGameActor* source // OFFSET: 0x0079DB20 // FUNCTION: fn_08924 -void CSkillAction_SOA_TALISMAN_OF_MAGICIAN::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_TALISMAN_OF_MAGICIAN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("talisman_of_magician"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -574,7 +574,7 @@ void CSkillAction_SOA_TALISMAN_OF_MAGICIAN::Slot11(int level, CGameActor* source // OFFSET: 0x0079DDB0 // FUNCTION: fn_08925 -void CSkillAction_SOA_SOUL_GATHERING::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_SOUL_GATHERING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(454, level / 16); } @@ -582,7 +582,7 @@ void CSkillAction_SOA_SOUL_GATHERING::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079DDE0 // FUNCTION: fn_08926 -void CSkillAction_SOA_SOUL_GATHERING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SOA_SOUL_GATHERING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("soul_gathering"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -591,7 +591,7 @@ void CSkillAction_SOA_SOUL_GATHERING::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x0079DF50 // FUNCTION: fn_08927 -void CSkillAction_SOA_TOTEM_OF_TUTELARY::Slot08(int level, CGameActor* source) { +void CSkillAction_SOA_TOTEM_OF_TUTELARY::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(911, level / 16); } @@ -599,13 +599,13 @@ void CSkillAction_SOA_TOTEM_OF_TUTELARY::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079DF80 // FUNCTION: fn_08928 -int CSkillAction_SOA_TOTEM_OF_TUTELARY::Slot14() { +int CSkillAction_SOA_TOTEM_OF_TUTELARY::GetSkillScopeType() { return 7; } // OFFSET: 0x0079DF90 // FUNCTION: fn_08929 -void CSkillObjectAction_SOA_TOTEM_OF_TUTELARY::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_SOA_TOTEM_OF_TUTELARY::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("totem_of_tutelary_bottom_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -620,7 +620,7 @@ void CSkillObjectAction_SOA_TOTEM_OF_TUTELARY::Slot00(int argument, CRenderObjec // OFFSET: 0x0079E460 // FUNCTION: fn_08930 -void CSkillObjectAction_SOA_TOTEM_OF_TUTELARY::Slot01(CRenderObject* object) { +void CSkillObjectAction_SOA_TOTEM_OF_TUTELARY::OnSkillObjectRemove(CRenderObject* object) { if (object) { EffectLists* effects = g_effectMgr; effects->Retire(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("totem_of_tutelary_bottom_loop")); diff --git a/Source/Contents/Skills/SkillActionSpiritHandler.cpp b/Source/Contents/Skills/SkillActionSpiritHandler.cpp index 5238b84e3..be73b8775 100644 --- a/Source/Contents/Skills/SkillActionSpiritHandler.cpp +++ b/Source/Contents/Skills/SkillActionSpiritHandler.cpp @@ -16,133 +16,133 @@ class CSkillAction_SH_CHUL_HO_SONIC_CLAW : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_HOWLING_OF_CHUL_HO : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_HOGOGONG : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SH_HOGOGONG_STRIKE : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_KI_SUL_WATER_SPRAYING : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_MARINE_FESTIVAL : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; }; class CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_SANDY_FESTIVAL : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; }; class CSkillAction_SH_KI_SUL_RAMPAGE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_COLORS_OF_HYUN_ROK : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_HYUN_ROKS_BREEZE : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - int Slot14() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + int GetSkillScopeType() override; }; class CSkillAction_SH_HYUN_ROK_CANNON : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillObjectAction_SH_HYUN_ROKS_BREEZE : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; }; class CSkillAction_SH_TEMPORARY_COMMUNION : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_TEMPORARY_COMMUNION : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES : public CSkillAction { public: - bool Slot00() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool IsSupport() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_CHUL_HO_BATTERING : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SH_HYUN_ROK_SPIRIT_POWER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; // OFFSET: 0x0079EB70 // FUNCTION: fn_08931 -int CSkillAction_SH_CHUL_HO_SONIC_CLAW::Slot02() { +int CSkillAction_SH_CHUL_HO_SONIC_CLAW::GetSkillAttackMotion() { return 54; } // OFFSET: 0x0079EB80 // FUNCTION: fn_08932 -void CSkillAction_SH_CHUL_HO_SONIC_CLAW::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_CHUL_HO_SONIC_CLAW::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -165,13 +165,13 @@ void CSkillAction_SH_CHUL_HO_SONIC_CLAW::Slot11(int level, CGameActor* source, C // OFFSET: 0x0079EE10 // FUNCTION: fn_08933 -int CSkillAction_SH_HOWLING_OF_CHUL_HO::Slot02() { +int CSkillAction_SH_HOWLING_OF_CHUL_HO::GetSkillAttackMotion() { return 54; } // OFFSET: 0x0079EE20 // FUNCTION: fn_08934 -void CSkillAction_SH_HOWLING_OF_CHUL_HO::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_HOWLING_OF_CHUL_HO::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(840, level / 16); } @@ -179,7 +179,7 @@ void CSkillAction_SH_HOWLING_OF_CHUL_HO::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079EE50 // FUNCTION: fn_08935 -void CSkillAction_SH_HOWLING_OF_CHUL_HO::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_HOWLING_OF_CHUL_HO::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("howling_of_chul_ho"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -188,7 +188,7 @@ void CSkillAction_SH_HOWLING_OF_CHUL_HO::Slot11(int level, CGameActor* source, C // OFFSET: 0x0079EFD0 // FUNCTION: fn_08936 -void CEfstAction_HOGOGONG::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_HOGOGONG::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("howling_of_chul_ho_scared"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -197,7 +197,7 @@ void CEfstAction_HOGOGONG::Slot00(int efstId, int value, int argument3, int argu // OFFSET: 0x0079F150 // FUNCTION: fn_08937 -void CEfstAction_HOGOGONG::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_HOGOGONG::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("howling_of_chul_ho_scared")); @@ -206,19 +206,19 @@ void CEfstAction_HOGOGONG::Slot01(int efstId, int argument2, int argument3, int // OFFSET: 0x0079F290 // FUNCTION: fn_08938 -void CEfstAction_HOGOGONG::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_HOGOGONG::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0079F2B0 // FUNCTION: fn_08939 -int CSkillAction_SH_HOGOGONG_STRIKE::Slot02() { +int CSkillAction_SH_HOGOGONG_STRIKE::GetSkillAttackMotion() { return 54; } // OFFSET: 0x0079F2C0 // FUNCTION: fn_08940 -void CSkillAction_SH_HOGOGONG_STRIKE::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_HOGOGONG_STRIKE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(840, level / 16); } @@ -226,7 +226,7 @@ void CSkillAction_SH_HOGOGONG_STRIKE::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079F2F0 // FUNCTION: fn_08941 -void CSkillAction_SH_HOGOGONG_STRIKE::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_HOGOGONG_STRIKE::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hogogong_strike"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -235,7 +235,7 @@ void CSkillAction_SH_HOGOGONG_STRIKE::Slot15(int level, CGameActor* source, CGam // OFFSET: 0x0079F460 // FUNCTION: fn_08942 -void CSkillAction_SH_KI_SUL_WATER_SPRAYING::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_KI_SUL_WATER_SPRAYING::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -243,7 +243,7 @@ void CSkillAction_SH_KI_SUL_WATER_SPRAYING::Slot08(int level, CGameActor* source // OFFSET: 0x0079F490 // FUNCTION: fn_08943 -void CSkillAction_SH_KI_SUL_WATER_SPRAYING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_KI_SUL_WATER_SPRAYING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ki_sul_water_spraying"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -252,7 +252,7 @@ void CSkillAction_SH_KI_SUL_WATER_SPRAYING::Slot11(int level, CGameActor* source // OFFSET: 0x0079F610 // FUNCTION: fn_08944 -void CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(845, level / 16); } @@ -260,7 +260,7 @@ void CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL::Slot08(int level, CGameActor* so // OFFSET: 0x0079F640 // FUNCTION: fn_08945 -void CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("marine_festival_of_ki_sul_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -269,7 +269,7 @@ void CSkillAction_SH_MARINE_FESTIVAL_OF_KI_SUL::Slot11(int level, CGameActor* so // OFFSET: 0x0079F7C0 // FUNCTION: fn_08946 -void CEfstAction_MARINE_FESTIVAL::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_MARINE_FESTIVAL::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("marine_festival_of_ki_sul"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -278,7 +278,7 @@ void CEfstAction_MARINE_FESTIVAL::Slot00(int efstId, int value, int argument3, i // OFFSET: 0x0079F940 // FUNCTION: fn_08947 -void CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(842, level / 16); } @@ -286,7 +286,7 @@ void CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL::Slot08(int level, CGameActor* sou // OFFSET: 0x0079F970 // FUNCTION: fn_08948 -void CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sandy_festival_of_ki_sul_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -295,7 +295,7 @@ void CSkillAction_SH_SANDY_FESTIVAL_OF_KI_SUL::Slot11(int level, CGameActor* sou // OFFSET: 0x0079FB10 // FUNCTION: fn_08949 -void CEfstAction_SANDY_FESTIVAL::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_SANDY_FESTIVAL::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("sandy_festival_of_ki_sul"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -304,7 +304,7 @@ void CEfstAction_SANDY_FESTIVAL::Slot00(int efstId, int value, int argument3, in // OFFSET: 0x0079FC90 // FUNCTION: fn_08950 -void CSkillAction_SH_KI_SUL_RAMPAGE::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_KI_SUL_RAMPAGE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(831, level / 16); } @@ -312,7 +312,7 @@ void CSkillAction_SH_KI_SUL_RAMPAGE::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079FCC0 // FUNCTION: fn_08951 -void CSkillAction_SH_KI_SUL_RAMPAGE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_KI_SUL_RAMPAGE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ki_sul_rampage_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -323,7 +323,7 @@ void CSkillAction_SH_KI_SUL_RAMPAGE::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x0079FF40 // FUNCTION: fn_08952 -void CSkillAction_SH_COLORS_OF_HYUN_ROK::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_COLORS_OF_HYUN_ROK::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -331,7 +331,7 @@ void CSkillAction_SH_COLORS_OF_HYUN_ROK::Slot08(int level, CGameActor* source) { // OFFSET: 0x0079FF70 // FUNCTION: fn_08953 -void CSkillAction_SH_COLORS_OF_HYUN_ROK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_COLORS_OF_HYUN_ROK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -371,13 +371,13 @@ void CSkillAction_SH_COLORS_OF_HYUN_ROK::Slot11(int level, CGameActor* source, C // OFFSET: 0x007A04A0 // FUNCTION: fn_08954 -bool CSkillAction_SH_HYUN_ROKS_BREEZE::Slot03(int argument) { +bool CSkillAction_SH_HYUN_ROKS_BREEZE::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x007A04B0 // FUNCTION: fn_08955 -void CSkillAction_SH_HYUN_ROKS_BREEZE::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_HYUN_ROKS_BREEZE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(841, level / 16); } @@ -385,13 +385,13 @@ void CSkillAction_SH_HYUN_ROKS_BREEZE::Slot08(int level, CGameActor* source) { // OFFSET: 0x007A04E0 // FUNCTION: fn_08956 -int CSkillAction_SH_HYUN_ROKS_BREEZE::Slot14() { +int CSkillAction_SH_HYUN_ROKS_BREEZE::GetSkillScopeType() { return 9; } // OFFSET: 0x007A04F0 // FUNCTION: fn_08957 -void CSkillObjectAction_SH_HYUN_ROKS_BREEZE::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_SH_HYUN_ROKS_BREEZE::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_roks_breeze_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -402,7 +402,7 @@ void CSkillObjectAction_SH_HYUN_ROKS_BREEZE::Slot00(int argument, CRenderObject* // OFFSET: 0x007A0770 // FUNCTION: fn_08958 -void CSkillAction_SH_HYUN_ROK_CANNON::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_HYUN_ROK_CANNON::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(841, level / 16); } @@ -410,7 +410,7 @@ void CSkillAction_SH_HYUN_ROK_CANNON::Slot08(int level, CGameActor* source) { // OFFSET: 0x007A07A0 // FUNCTION: fn_08959 -void CSkillAction_SH_HYUN_ROK_CANNON::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_HYUN_ROK_CANNON::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -422,13 +422,13 @@ void CSkillAction_SH_HYUN_ROK_CANNON::Slot11(int level, CGameActor* source, CGam EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_rok_cannon"), position.x, position.y, position.z, 0, -1, 0, 0)) { - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x007A0950 // FUNCTION: fn_08960 -void CSkillAction_SH_TEMPORARY_COMMUNION::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_TEMPORARY_COMMUNION::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -436,7 +436,7 @@ void CSkillAction_SH_TEMPORARY_COMMUNION::Slot08(int level, CGameActor* source) // OFFSET: 0x007A0980 // FUNCTION: fn_08961 -void CSkillAction_SH_TEMPORARY_COMMUNION::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_TEMPORARY_COMMUNION::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("temporary_communion"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -445,7 +445,7 @@ void CSkillAction_SH_TEMPORARY_COMMUNION::Slot11(int level, CGameActor* source, // OFFSET: 0x007A0B00 // FUNCTION: fn_08962 -void CEfstAction_TEMPORARY_COMMUNION::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_TEMPORARY_COMMUNION::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("temporary_communion_buff_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("temporary_communion_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -454,7 +454,7 @@ void CEfstAction_TEMPORARY_COMMUNION::Slot00(int efstId, int value, int argument // OFFSET: 0x007A0DA0 // FUNCTION: fn_08963 -void CEfstAction_TEMPORARY_COMMUNION::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_TEMPORARY_COMMUNION::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("temporary_communion_buff_bottom")); @@ -465,19 +465,19 @@ void CEfstAction_TEMPORARY_COMMUNION::Slot01(int efstId, int argument2, int argu // OFFSET: 0x007A0FD0 // FUNCTION: fn_08964 -void CEfstAction_TEMPORARY_COMMUNION::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_TEMPORARY_COMMUNION::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007A0FF0 // FUNCTION: fn_08965 -bool CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::Slot00() { +bool CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::IsSupport() { return true; } // OFFSET: 0x007A1000 // FUNCTION: fn_08966 -void CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2367, level / 16); } @@ -485,7 +485,7 @@ void CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::Slot08(int level, CGameActo // OFFSET: 0x007A1030 // FUNCTION: fn_08967 -void CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("blessing_of_mystical_creatures"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -494,26 +494,26 @@ void CSkillAction_SH_BLESSING_OF_MYSTICAL_CREATURES::Slot11(int level, CGameActo // OFFSET: 0x007A11C0 // FUNCTION: fn_08968 -int CSkillAction_SH_CHUL_HO_BATTERING::Slot02() { +int CSkillAction_SH_CHUL_HO_BATTERING::GetSkillAttackMotion() { return 54; } // OFFSET: 0x007A11D0 // FUNCTION: fn_08969 -void CSkillAction_SH_CHUL_HO_BATTERING::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_CHUL_HO_BATTERING::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chul_ho_battering_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A1360 // FUNCTION: fn_08970 -void CSkillAction_SH_CHUL_HO_BATTERING::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_CHUL_HO_BATTERING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target || !source) { return; } @@ -523,50 +523,50 @@ void CSkillAction_SH_CHUL_HO_BATTERING::Slot11(int level, CGameActor* source, CG if (CEffect* effect = effects->Spawn( target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chul_ho_battering"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chul_ho_battering_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } } // OFFSET: 0x007A1630 // FUNCTION: fn_08971 -void CSkillAction_SH_CHUL_HO_BATTERING::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_CHUL_HO_BATTERING::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { if (CEffect* effect = g_effectMgr->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chul_ho_battering_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot26(static_cast(reinterpret_cast(target) & 1)); + effect->SetFlipX(static_cast(reinterpret_cast(target) & 1)); } } } // OFFSET: 0x007A17D0 // FUNCTION: fn_08972 -void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::Slot08(int level, CGameActor* source) { +void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_rok_spirit_power_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_rok_spirit_power_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A1A80 // FUNCTION: fn_08973 -void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_rok_spirit_power"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -577,7 +577,7 @@ void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::Slot11(int level, CGameActor* source // OFFSET: 0x007A1D10 // FUNCTION: fn_08974 -void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_rok_spirit_power_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); diff --git a/Source/Contents/Skills/SkillActionTroubadour.cpp b/Source/Contents/Skills/SkillActionTroubadour.cpp index 540473b90..02d19308a 100644 --- a/Source/Contents/Skills/SkillActionTroubadour.cpp +++ b/Source/Contents/Skills/SkillActionTroubadour.cpp @@ -13,125 +13,125 @@ class CSkillAction_TR_ROSEBLOSSOM : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_TR_ROSEBLOSSOM_ATK : public CSkillAction { public: - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_TR_KVASIR_SONATA : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_KVASIR_SONATA : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_TR_PRON_MARCH : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_PRON_MARCH : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_TR_JAWAII_SERENADE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_JAWAII_SERENADE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_TR_AIN_RHAPSODY : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_AIN_RHAPSODY : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_TR_GEF_NOCTURN : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_GEF_NOCTURN : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_TR_RHYTHMICAL_WAVE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_TR_METALIC_FURY : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_TR_MYSTIC_SYMPHONY : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_MYSTIC_SYMPHONY : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_TR_RHYTHMSHOOTING : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_TR_ROKI_CAPRICCIO : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; // OFFSET: 0x007A20F0 // FUNCTION: fn_08975 -void CSkillAction_TR_ROSEBLOSSOM::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_ROSEBLOSSOM::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (CGameActor* actor = reinterpret_cast(level)) { actor->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); } @@ -139,7 +139,7 @@ void CSkillAction_TR_ROSEBLOSSOM::Slot15(int level, CGameActor* source, CGameAct // OFFSET: 0x007A2120 // FUNCTION: fn_08976 -void CSkillAction_TR_ROSEBLOSSOM::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_ROSEBLOSSOM::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("roseblossom_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -148,7 +148,7 @@ void CSkillAction_TR_ROSEBLOSSOM::Slot16(int level, CGameActor* source, CGameAct // OFFSET: 0x007A2290 // FUNCTION: fn_08977 -void CSkillAction_TR_ROSEBLOSSOM_ATK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_ROSEBLOSSOM_ATK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("roseblossom_rose"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -157,26 +157,26 @@ void CSkillAction_TR_ROSEBLOSSOM_ATK::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x007A2400 // FUNCTION: fn_08978 -void CSkillAction_TR_KVASIR_SONATA::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_KVASIR_SONATA::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kvasirsonata_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("kvasirsonata_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A26A0 // FUNCTION: fn_08979 -void CSkillAction_TR_KVASIR_SONATA::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_KVASIR_SONATA::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); EffectLists* effects = g_effectMgr; @@ -186,36 +186,36 @@ void CSkillAction_TR_KVASIR_SONATA::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x007A2820 // FUNCTION: fn_08980 -EfstActionMessage CEfstAction_KVASIR_SONATA::Slot03() { +EfstActionMessage CEfstAction_KVASIR_SONATA::GetEfstBeginMessage() { return {LookupMessage(3791), 0xFFFF00}; } // OFFSET: 0x007A2850 // FUNCTION: fn_08981 -EfstActionMessage CEfstAction_KVASIR_SONATA::Slot04() { +EfstActionMessage CEfstAction_KVASIR_SONATA::GetEfstEndMessage() { return {LookupMessage(3792), 0xFF}; } // OFFSET: 0x007A2880 // FUNCTION: fn_08982 -void CSkillAction_TR_PRON_MARCH::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_PRON_MARCH::OnSkillCast(int level, CGameActor* source) { if (source) { if (CEffect* effect = g_effectMgr->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("pronmarch_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } if (CEffect* effect = g_effectMgr->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("pronmarch_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A2B20 // FUNCTION: fn_08983 -void CSkillAction_TR_PRON_MARCH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_PRON_MARCH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); EffectLists* effects = g_effectMgr; @@ -225,7 +225,7 @@ void CSkillAction_TR_PRON_MARCH::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x007A2CA0 // FUNCTION: fn_08984 -void CEfstAction_PRON_MARCH::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_PRON_MARCH::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { static_cast(actor)->LaunchEffect(2294, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -233,38 +233,38 @@ void CEfstAction_PRON_MARCH::Slot00(int efstId, int value, int argument3, int ar // OFFSET: 0x007A2CF0 // FUNCTION: fn_08985 -EfstActionMessage CEfstAction_PRON_MARCH::Slot03() { +EfstActionMessage CEfstAction_PRON_MARCH::GetEfstBeginMessage() { return {LookupMessage(3803), 0xFFFF00}; } // OFFSET: 0x007A2D20 // FUNCTION: fn_08986 -EfstActionMessage CEfstAction_PRON_MARCH::Slot04() { +EfstActionMessage CEfstAction_PRON_MARCH::GetEfstEndMessage() { return {LookupMessage(3804), 0xFF}; } // OFFSET: 0x007A2D50 // FUNCTION: fn_08987 -void CSkillAction_TR_JAWAII_SERENADE::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_JAWAII_SERENADE::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("jawaii_serenade_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("jawaii_serenade_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A3000 // FUNCTION: fn_08988 -void CSkillAction_TR_JAWAII_SERENADE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_JAWAII_SERENADE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); EffectLists* effects = g_effectMgr; @@ -274,7 +274,7 @@ void CSkillAction_TR_JAWAII_SERENADE::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x007A3190 // FUNCTION: fn_08989 -void CEfstAction_JAWAII_SERENADE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_JAWAII_SERENADE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { static_cast(actor)->LaunchEffect(2298, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -282,32 +282,32 @@ void CEfstAction_JAWAII_SERENADE::Slot00(int efstId, int value, int argument3, i // OFFSET: 0x007A31E0 // FUNCTION: fn_08990 -EfstActionMessage CEfstAction_JAWAII_SERENADE::Slot03() { +EfstActionMessage CEfstAction_JAWAII_SERENADE::GetEfstBeginMessage() { return {LookupMessage(3801), 0xFFFF00}; } // OFFSET: 0x007A3210 // FUNCTION: fn_08991 -EfstActionMessage CEfstAction_JAWAII_SERENADE::Slot04() { +EfstActionMessage CEfstAction_JAWAII_SERENADE::GetEfstEndMessage() { return {LookupMessage(3802), 0xFF}; } // OFFSET: 0x007A3240 // FUNCTION: fn_08992 -void CSkillAction_TR_AIN_RHAPSODY::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_AIN_RHAPSODY::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ain_rhapsody_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A33D0 // FUNCTION: fn_08993 -void CSkillAction_TR_AIN_RHAPSODY::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_AIN_RHAPSODY::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); EffectLists* effects = g_effectMgr; @@ -317,7 +317,7 @@ void CSkillAction_TR_AIN_RHAPSODY::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x007A3550 // FUNCTION: fn_08994 -void CEfstAction_AIN_RHAPSODY::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_AIN_RHAPSODY::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { static_cast(actor)->LaunchEffect(2297, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -325,38 +325,38 @@ void CEfstAction_AIN_RHAPSODY::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x007A35A0 // FUNCTION: fn_08995 -EfstActionMessage CEfstAction_AIN_RHAPSODY::Slot03() { +EfstActionMessage CEfstAction_AIN_RHAPSODY::GetEfstBeginMessage() { return {LookupMessage(3797), 0xFF}; } // OFFSET: 0x007A35D0 // FUNCTION: fn_08996 -EfstActionMessage CEfstAction_AIN_RHAPSODY::Slot04() { +EfstActionMessage CEfstAction_AIN_RHAPSODY::GetEfstEndMessage() { return {LookupMessage(3798), 0xFFFF00}; } // OFFSET: 0x007A3600 // FUNCTION: fn_08997 -void CSkillAction_TR_GEF_NOCTURN::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_GEF_NOCTURN::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gef_nocturn_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gef_nocturn_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A38A0 // FUNCTION: fn_08998 -void CSkillAction_TR_GEF_NOCTURN::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_GEF_NOCTURN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gef_nocturn"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -365,7 +365,7 @@ void CSkillAction_TR_GEF_NOCTURN::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x007A3A30 // FUNCTION: fn_08999 -void CEfstAction_GEF_NOCTURN::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_GEF_NOCTURN::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { static_cast(actor)->LaunchEffect(2293, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -373,36 +373,36 @@ void CEfstAction_GEF_NOCTURN::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x007A3A80 // FUNCTION: fn_09000 -EfstActionMessage CEfstAction_GEF_NOCTURN::Slot03() { +EfstActionMessage CEfstAction_GEF_NOCTURN::GetEfstBeginMessage() { return {LookupMessage(3795), 0xFF}; } // OFFSET: 0x007A3AB0 // FUNCTION: fn_09001 -EfstActionMessage CEfstAction_GEF_NOCTURN::Slot04() { +EfstActionMessage CEfstAction_GEF_NOCTURN::GetEfstEndMessage() { return {LookupMessage(3796), 0xFFFF00}; } // OFFSET: 0x007A3AE0 // FUNCTION: fn_09002 -void CSkillAction_TR_RHYTHMICAL_WAVE::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_RHYTHMICAL_WAVE::OnSkillCast(int level, CGameActor* source) { if (source) { if (CEffect* effect = g_effectMgr->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmical_wave_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } if (CEffect* effect = g_effectMgr->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmical_wave_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A3D90 // FUNCTION: fn_09003 -void CSkillAction_TR_RHYTHMICAL_WAVE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_RHYTHMICAL_WAVE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmical_wave_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -413,7 +413,7 @@ void CSkillAction_TR_RHYTHMICAL_WAVE::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x007A4010 // FUNCTION: fn_09004 -void CSkillAction_TR_RHYTHMICAL_WAVE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_RHYTHMICAL_WAVE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmical_wave_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -422,7 +422,7 @@ void CSkillAction_TR_RHYTHMICAL_WAVE::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x007A41A0 // FUNCTION: fn_09006 -void CSkillAction_TR_METALIC_FURY::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_METALIC_FURY::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("metalic_fury"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -431,20 +431,20 @@ void CSkillAction_TR_METALIC_FURY::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x007A4300 // FUNCTION: fn_09007 -void CSkillAction_TR_MYSTIC_SYMPHONY::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_MYSTIC_SYMPHONY::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mysticsymphony_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A4490 // FUNCTION: fn_09008 -void CSkillAction_TR_MYSTIC_SYMPHONY::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_MYSTIC_SYMPHONY::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); EffectLists* effects = g_effectMgr; @@ -454,7 +454,7 @@ void CSkillAction_TR_MYSTIC_SYMPHONY::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x007A4620 // FUNCTION: fn_09009 -void CEfstAction_MYSTIC_SYMPHONY::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_MYSTIC_SYMPHONY::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mysticsymphony_note"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -463,7 +463,7 @@ void CEfstAction_MYSTIC_SYMPHONY::Slot00(int efstId, int value, int argument3, i // OFFSET: 0x007A47A0 // FUNCTION: fn_09010 -void CEfstAction_MYSTIC_SYMPHONY::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_MYSTIC_SYMPHONY::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mysticsymphony_note")); @@ -472,50 +472,50 @@ void CEfstAction_MYSTIC_SYMPHONY::Slot01(int efstId, int argument2, int argument // OFFSET: 0x007A48E0 // FUNCTION: fn_09011 -void CEfstAction_MYSTIC_SYMPHONY::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_MYSTIC_SYMPHONY::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007A4900 // FUNCTION: fn_09012 -EfstActionMessage CEfstAction_MYSTIC_SYMPHONY::Slot03() { +EfstActionMessage CEfstAction_MYSTIC_SYMPHONY::GetEfstBeginMessage() { return {LookupMessage(3793), 0xFFFF00}; } // OFFSET: 0x007A4930 // FUNCTION: fn_09013 -EfstActionMessage CEfstAction_MYSTIC_SYMPHONY::Slot04() { +EfstActionMessage CEfstAction_MYSTIC_SYMPHONY::GetEfstEndMessage() { return {LookupMessage(3794), 0xFF}; } // OFFSET: 0x007A4960 // FUNCTION: fn_09014 -int CSkillAction_TR_RHYTHMSHOOTING::Slot02() { +int CSkillAction_TR_RHYTHMSHOOTING::GetSkillAttackMotion() { return 9; } // OFFSET: 0x007A4970 // FUNCTION: fn_09015 -void CSkillAction_TR_RHYTHMSHOOTING::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_RHYTHMSHOOTING::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmshooting_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmshooting_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A4C20 // FUNCTION: fn_09016 -void CSkillAction_TR_RHYTHMSHOOTING::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_RHYTHMSHOOTING::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -524,13 +524,13 @@ void CSkillAction_TR_RHYTHMSHOOTING::Slot15(int level, CGameActor* source, CGame CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmshooting_shot"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { const float angle = ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values); - effect->Slot17(angle + 180.0f); + effect->SetAngle(angle + 180.0f); } } // OFFSET: 0x007A4E00 // FUNCTION: fn_09017 -void CSkillAction_TR_RHYTHMSHOOTING::Slot16(int, CGameActor* source, CGameActor*) { +void CSkillAction_TR_RHYTHMSHOOTING::OnSkillDamage(int, CGameActor* source, CGameActor*) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmshooting_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -539,26 +539,26 @@ void CSkillAction_TR_RHYTHMSHOOTING::Slot16(int, CGameActor* source, CGameActor* // OFFSET: 0x007A4F80 // FUNCTION: fn_09018 -void CSkillAction_TR_ROKI_CAPRICCIO::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_ROKI_CAPRICCIO::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("roki_capriccio_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("roki_capriccio_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A5230 // FUNCTION: fn_09019 -void CSkillAction_TR_ROKI_CAPRICCIO::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_ROKI_CAPRICCIO::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { source->SetFrameSequence(96, 1, 3, 96, 3, 1, 500, 0); EffectLists* effects = g_effectMgr; @@ -568,26 +568,26 @@ void CSkillAction_TR_ROKI_CAPRICCIO::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x007A53C0 // FUNCTION: fn_09020 -void CSkillAction_TR_ROSEBLOSSOM::Slot08(int level, CGameActor* source) { +void CSkillAction_TR_ROSEBLOSSOM::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("roseblossom_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("roseblossom_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A5660 // FUNCTION: fn_09021 -void CSkillAction_TR_ROSEBLOSSOM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_ROSEBLOSSOM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && target) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( @@ -596,7 +596,7 @@ void CSkillAction_TR_ROSEBLOSSOM::Slot11(int level, CGameActor* source, CGameAct const float angle = ScreenAngle( &source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values ); - effect->Slot17(angle + 180.0f); + effect->SetAngle(angle + 180.0f); } } } diff --git a/Source/Contents/Skills/SkillActionWindHawk.cpp b/Source/Contents/Skills/SkillActionWindHawk.cpp index 9a295d07e..7234c89f1 100644 --- a/Source/Contents/Skills/SkillActionWindHawk.cpp +++ b/Source/Contents/Skills/SkillActionWindHawk.cpp @@ -11,56 +11,56 @@ class CSkillAction_WH_GALESTORM : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_WH_CALAMITYGALE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_CALAMITYGALE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_WH_CRESCIVE_BOLT : public CSkillAction { public: - int Slot01() override; - bool Slot06() override; - bool Slot07() override; - void Slot08(int level, CGameActor* source) override; - void Slot15(int sourceActor, CGameActor* target, CGameActor* argument3) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillCastMotion() override; + bool SuppressSupportSkillArrow() override; + bool SuppressAttackSkillArrow() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillHit(int sourceActor, CGameActor* target, CGameActor* argument3) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_WH_WILD_WALK : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; // OFFSET: 0x007A5A80 // FUNCTION: fn_09023 -void CSkillAction_WH_GALESTORM::Slot08(int level, CGameActor* source) { +void CSkillAction_WH_GALESTORM::OnSkillCast(int level, CGameActor* source) { if (CEffect* effect = g_effectMgr->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("galestorm_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x007A5BF0 // FUNCTION: fn_09024 -void CSkillAction_WH_GALESTORM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_WH_GALESTORM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && target) { g_effectMgr->Spawn(target->render.accountId, 1973, target->render.position.x, target->render.position.y, target->render.position.z, 0, level, 0, 0); } @@ -68,7 +68,7 @@ void CSkillAction_WH_GALESTORM::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x007A5C40 // FUNCTION: fn_09025 -void CSkillAction_WH_GALESTORM::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_WH_GALESTORM::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("galestorm_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -77,20 +77,20 @@ void CSkillAction_WH_GALESTORM::Slot16(int level, CGameActor* source, CGameActor // OFFSET: 0x007A5DB0 // FUNCTION: fn_09026 -void CSkillAction_WH_CALAMITYGALE::Slot08(int level, CGameActor* source) { +void CSkillAction_WH_CALAMITYGALE::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn( source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("calumitygale_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0 )) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A5F40 // FUNCTION: fn_09027 -void CSkillAction_WH_CALAMITYGALE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_WH_CALAMITYGALE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("calumitygale"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -99,7 +99,7 @@ void CSkillAction_WH_CALAMITYGALE::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x007A60A0 // FUNCTION: fn_09028 -void CEfstAction_CALAMITYGALE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_CALAMITYGALE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("calumitygale_loop"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -108,7 +108,7 @@ void CEfstAction_CALAMITYGALE::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x007A6220 // FUNCTION: fn_09029 -void CEfstAction_CALAMITYGALE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_CALAMITYGALE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("calumitygale_loop")); @@ -117,68 +117,68 @@ void CEfstAction_CALAMITYGALE::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x007A6350 // FUNCTION: fn_09030 -void CEfstAction_CALAMITYGALE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_CALAMITYGALE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007A6370 // FUNCTION: fn_09031 -EfstActionMessage CEfstAction_CALAMITYGALE::Slot03() { +EfstActionMessage CEfstAction_CALAMITYGALE::GetEfstBeginMessage() { return {LookupMessage(3805), 0xFFFF00}; } // OFFSET: 0x007A63A0 // FUNCTION: fn_09032 -EfstActionMessage CEfstAction_CALAMITYGALE::Slot04() { +EfstActionMessage CEfstAction_CALAMITYGALE::GetEfstEndMessage() { return {LookupMessage(3806), 0xFF}; } // OFFSET: 0x007A63D0 // FUNCTION: fn_09033 -int CSkillAction_WH_CRESCIVE_BOLT::Slot01() { +int CSkillAction_WH_CRESCIVE_BOLT::GetSkillCastMotion() { return 18; } // OFFSET: 0x007A63F0 // FUNCTION: fn_09035 -bool CSkillAction_WH_CRESCIVE_BOLT::Slot06() { +bool CSkillAction_WH_CRESCIVE_BOLT::SuppressSupportSkillArrow() { return true; } // OFFSET: 0x007A6400 // FUNCTION: fn_09036 -bool CSkillAction_WH_CRESCIVE_BOLT::Slot07() { +bool CSkillAction_WH_CRESCIVE_BOLT::SuppressAttackSkillArrow() { return true; } // OFFSET: 0x007A6410 // FUNCTION: fn_09037 -void CSkillAction_WH_CRESCIVE_BOLT::Slot08(int level, CGameActor* source) { +void CSkillAction_WH_CRESCIVE_BOLT::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("crescivebolt_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A65A0 // FUNCTION: fn_45492 -void CSkillAction_WH_CRESCIVE_BOLT::Slot15(int sourceActor, CGameActor* target, CGameActor* argument3) { +void CSkillAction_WH_CRESCIVE_BOLT::OnSkillHit(int sourceActor, CGameActor* target, CGameActor* argument3) { CGameActor* source = reinterpret_cast(sourceActor); if (source && target) { if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("crescivebolt"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17( + effect->SetAngle( ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values) + 180.0f ); - effect->Slot16(static_cast(source->unknown_0378 * source->render.speed * 16.0f)); + effect->SetDelay(static_cast(source->unknown_0378 * source->render.speed * 16.0f)); } } } // OFFSET: 0x007A6780 // FUNCTION: fn_09038 -void CSkillAction_WH_CRESCIVE_BOLT::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_WH_CRESCIVE_BOLT::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("crescivebolt_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -187,23 +187,23 @@ void CSkillAction_WH_CRESCIVE_BOLT::Slot16(int level, CGameActor* source, CGameA // OFFSET: 0x007A68F0 // FUNCTION: fn_09039 -void CSkillAction_WH_WILD_WALK::Slot08(int level, CGameActor* source) { +void CSkillAction_WH_WILD_WALK::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("wild_walk_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("wild_walk_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007A6B90 // FUNCTION: fn_09040 -void CSkillAction_WH_WILD_WALK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_WH_WILD_WALK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("wild_walk"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -213,10 +213,10 @@ void CSkillAction_WH_WILD_WALK::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x007A6D20 // FUNCTION: fn_09041 -void CSkillAction_WH_WILD_WALK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_WH_WILD_WALK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source && target) { if (CEffect* effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("wild_walk_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values)); + effect->SetAngle(ScreenAngle(&source->render.position.x, &target->render.position.x, static_cast(g_modeMgr.GetGameMode())->camera->frame.view.values)); } } } diff --git a/Source/Contents/Skills/SkillInfo.cpp b/Source/Contents/Skills/SkillInfo.cpp index a0521d7f0..dc2f90326 100644 --- a/Source/Contents/Skills/SkillInfo.cpp +++ b/Source/Contents/Skills/SkillInfo.cpp @@ -33,308 +33,308 @@ class CEfstAction_ChangeSize : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_CD_DIVINUS_FLOS : public CSkillAction { public: - void Slot16(int level, CGameActor* source, CGameActor* target) override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_GenderChange : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_ShowEffect : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_RA_UNLIMIT : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_UNLIMIT : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool flag) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool flag) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CEfstAction_SHADOW_WEAPON : public CEfstAction { public: - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CEfstAction_DANCING_KNIFE : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_SHC_SHADOW_STAB : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SHC_SHADOW_EXCEED : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_SHADOW_EXCEED : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot03() override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstBeginMessage() override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_ABC_CHASING_BREAK : public CSkillAction { public: - bool Slot07() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + bool SuppressAttackSkillArrow() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_ABC_CHASING_SHOT : public CSkillAction { public: - bool Slot07() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + bool SuppressAttackSkillArrow() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_ABC_ABYSS_FLAME_ATK : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_AG_ENERGY_CONVERSION : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SHC_ENCHANTING_SHADOW : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; + void OnSkillCast(int level, CGameActor* source) override; }; class CSkillAction_SHC_IMPACT_CRATER : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SHC_CROSS_SLASH : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SHC_DANCING_KNIFE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_ABC_HIT_AND_SLIDING : public CSkillAction { public: - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_ABC_ABYSS_FLAME : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_EM_PSYCHIC_STREAM : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IQ_BLAZING_FLAME_BLAST : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_BO_MAYHEMIC_THORNS : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_BO_EXPLOSIVE_POWDER : public CSkillAction { public: - bool Slot05() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + bool KeepSkillAttackSpeed() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_BO_MYSTERY_POWDER : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_MYSTERY_POWDER : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_BO_DUST_EXPLOSION : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_VIGOR : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_VIGOR : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot04() override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstEndMessage() override; }; class CSkillAction_DK_SERVANTWEAPON_ATK : public CSkillAction { public: - void Slot15(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_SERVANTWEAPON : public CEfstAction { public: - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - EfstActionMessage Slot04() override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + EfstActionMessage GetEfstEndMessage() override; }; class CEfstAction_SERVANT_SIGN : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_DK_SERVANT_W_PHANTOM : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int caster, CGameActor* target, CGameActor* argument3) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_SERVANT_W_DEMOL : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int caster, CGameActor* target, CGameActor* argument3) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_STORMSLASH : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_MADNESS_CRUSHER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - bool Slot04() override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + bool IsSkillWithoutMotion() override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_DRAGONIC_PIERCE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_DRAGONIC_BREATH : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_CHARGINGPIERCE : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_CHARGINGPIERCE : public CEfstAction { public: - EfstActionMessage Slot04() override; + EfstActionMessage GetEfstEndMessage() override; }; class CEfstAction_CHARGINGPIERCE_COUNT : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_DK_HACKANDSLASHER : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_HACKANDSLASHER_ATK : public CSkillAction { public: - int Slot02() override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NPC_BLOCK_EXPLOSION : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NPC_FROST_FIELD : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_FROST_STORM : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; struct DustExplosionSpawner { @@ -708,7 +708,7 @@ bool CSkillActionMgr::IsSupportAction(int skillId) { return false; } - return action->Slot00(); + return action->IsSupport(); } // OFFSET: 0x007737C0 @@ -769,7 +769,7 @@ bool ShowsCastEffect(int skillId) { // OFFSET: 0x00774730 // FUNCTION: fn_08326 -void CEfstAction_ChangeSize::Slot00(int, int value, int, int, CRenderObject* actor, bool) { +void CEfstAction_ChangeSize::OnEfstBegin(int, int value, int, int, CRenderObject* actor, bool) { if (!actor) { return; } @@ -788,7 +788,7 @@ void CEfstAction_ChangeSize::Slot00(int, int value, int, int, CRenderObject* act // OFFSET: 0x007760D0 // FUNCTION: fn_08344 -void CSkillAction_CD_DIVINUS_FLOS::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_CD_DIVINUS_FLOS::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (target) { g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("divinus_flos_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -796,7 +796,7 @@ void CSkillAction_CD_DIVINUS_FLOS::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x007747B0 // FUNCTION: fn_08327 -void CEfstAction_ChangeSize::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_ChangeSize::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2374); } @@ -804,19 +804,19 @@ void CEfstAction_ChangeSize::Slot01(int efstId, int argument2, int argument3, in // OFFSET: 0x007747E0 // FUNCTION: fn_08328 -void CEfstAction_ChangeSize::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_ChangeSize::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00774E20 // FUNCTION: fn_08331 -void CEfstAction_GenderChange::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_GenderChange::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00774E60 // FUNCTION: fn_08332 -void CEfstAction_ShowEffect::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_ShowEffect::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (!actor) { return; } @@ -835,7 +835,7 @@ void CEfstAction_ShowEffect::Slot00(int efstId, int value, int argument3, int ar // OFFSET: 0x00774ED0 // FUNCTION: fn_08333 -void CEfstAction_ShowEffect::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_ShowEffect::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -851,19 +851,19 @@ void CEfstAction_ShowEffect::Slot01(int efstId, int argument2, int argument3, in // OFFSET: 0x00774F30 // FUNCTION: fn_08334 -void CEfstAction_ShowEffect::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_ShowEffect::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00774FB0 // FUNCTION: fn_08335 -void CSkillAction_RA_UNLIMIT::Slot08(int level, CGameActor* source) { +void CSkillAction_RA_UNLIMIT::OnSkillCast(int level, CGameActor* source) { g_soundMgr->PlayWave("effect\\EF_BeginSpell.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); } // OFFSET: 0x00775250 // FUNCTION: fn_08337 -void CEfstAction_UNLIMIT::Slot00(int, int, int, int, CRenderObject* actor, bool) { +void CEfstAction_UNLIMIT::OnEfstBegin(int, int, int, int, CRenderObject* actor, bool) { if (!actor) { return; } @@ -878,31 +878,31 @@ void CEfstAction_UNLIMIT::Slot00(int, int, int, int, CRenderObject* actor, bool) // OFFSET: 0x007756D0 // FUNCTION: fn_08339 -void CEfstAction_UNLIMIT::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_UNLIMIT::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007764E0 // FUNCTION: fn_08346 -EfstActionMessage CEfstAction_SHADOW_WEAPON::Slot03() { +EfstActionMessage CEfstAction_SHADOW_WEAPON::GetEfstBeginMessage() { return {LookupMessage(3766), 0xFFFF00}; } // OFFSET: 0x00776510 // FUNCTION: fn_08347 -EfstActionMessage CEfstAction_SHADOW_WEAPON::Slot04() { +EfstActionMessage CEfstAction_SHADOW_WEAPON::GetEfstEndMessage() { return {LookupMessage(3767), 0xFF}; } // OFFSET: 0x00777910 // FUNCTION: fn_08359 -void CEfstAction_DANCING_KNIFE::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_DANCING_KNIFE::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00777DD0 // FUNCTION: fn_08364 -void CSkillAction_SHC_SHADOW_EXCEED::Slot11(int, CGameActor* source, CGameActor*) { +void CSkillAction_SHC_SHADOW_EXCEED::OnSkillEffect(int, CGameActor* source, CGameActor*) { if (source) { g_effectMgr->Spawn(static_cast(source->render.accountId), 2467, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -910,7 +910,7 @@ void CSkillAction_SHC_SHADOW_EXCEED::Slot11(int, CGameActor* source, CGameActor* // OFFSET: 0x00777E80 // FUNCTION: fn_08366 -void CEfstAction_SHADOW_EXCEED::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SHADOW_EXCEED::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -923,37 +923,37 @@ void CEfstAction_SHADOW_EXCEED::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x00777EE0 // FUNCTION: fn_08367 -void CEfstAction_SHADOW_EXCEED::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, true); +void CEfstAction_SHADOW_EXCEED::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, true); } // OFFSET: 0x00777F00 // FUNCTION: fn_08368 -EfstActionMessage CEfstAction_SHADOW_EXCEED::Slot03() { +EfstActionMessage CEfstAction_SHADOW_EXCEED::GetEfstBeginMessage() { return {LookupMessage(3762), 0xFFFF00}; } // OFFSET: 0x00777F30 // FUNCTION: fn_08369 -EfstActionMessage CEfstAction_SHADOW_EXCEED::Slot04() { +EfstActionMessage CEfstAction_SHADOW_EXCEED::GetEfstEndMessage() { return {LookupMessage(3763), 0xFF}; } // OFFSET: 0x00778140 // FUNCTION: fn_08371 -bool CSkillAction_ABC_CHASING_BREAK::Slot07() { +bool CSkillAction_ABC_CHASING_BREAK::SuppressAttackSkillArrow() { return true; } // OFFSET: 0x00778580 // FUNCTION: fn_08375 -bool CSkillAction_ABC_CHASING_SHOT::Slot07() { +bool CSkillAction_ABC_CHASING_SHOT::SuppressAttackSkillArrow() { return true; } // OFFSET: 0x007794D0 // FUNCTION: fn_08385 -bool CSkillAction_ABC_ABYSS_FLAME_ATK::Slot03(int argument) { +bool CSkillAction_ABC_ABYSS_FLAME_ATK::KeepSkillAttackMotion(int argument) { return true; } @@ -961,7 +961,7 @@ bool CSkillAction_ABC_ABYSS_FLAME_ATK::Slot03(int argument) { // FUNCTION: fn_08404 std::pair CSkillActionMgr::ActionSlot01(int skillId) { std::unique_ptr action(CreateAction(this->m_skillActions, skillId)); - return !action ? std::pair(false, 8) : std::pair(true, action->Slot01()); + return !action ? std::pair(false, 8) : std::pair(true, action->GetSkillCastMotion()); } // OFFSET: 0x0077AD90 @@ -988,7 +988,7 @@ EfstActionMessage CSkillActionMgr::EfstSlot03(int efstId) { return {nullptr, 0xFFFF00}; } - return action->Slot03(); + return action->GetEfstBeginMessage(); } // OFFSET: 0x0077AF80 @@ -999,7 +999,7 @@ EfstActionMessage CSkillActionMgr::EfstSlot04(int efstId) { return {nullptr, 0xFF}; } - return action->Slot04(); + return action->GetEfstEndMessage(); } // OFFSET: 0x0077B060 @@ -1010,14 +1010,14 @@ int CSkillActionMgr::ActionSlot14(int skillId) { return 0; } - return action->Slot14(); + return action->GetSkillScopeType(); } // OFFSET: 0x0077B210 // FUNCTION: fn_08409 std::pair CSkillActionMgr::ActionSlot02(int skillId) { std::unique_ptr action(CreateAction(this->m_skillActions, skillId)); - return !action ? std::pair(false, 7) : std::pair(true, action->Slot02()); + return !action ? std::pair(false, 7) : std::pair(true, action->GetSkillAttackMotion()); } // OFFSET: 0x0077B2E0 @@ -1028,7 +1028,7 @@ bool CSkillActionMgr::ActionSlot03(int skillId, int argument) { return false; } - return action->Slot03(argument); + return action->KeepSkillAttackMotion(argument); } // OFFSET: 0x0077B3A0 @@ -1039,7 +1039,7 @@ bool CSkillActionMgr::ActionSlot04(int skillId) { return false; } - return action->Slot04(); + return action->IsSkillWithoutMotion(); } // OFFSET: 0x0077B460 @@ -1050,7 +1050,7 @@ bool CSkillActionMgr::HasEfstAction(int efstId) { // OFFSET: 0x00774FF0 // FUNCTION: fn_08336 -void CSkillAction_RA_UNLIMIT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_RA_UNLIMIT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("unlimit_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1061,35 +1061,35 @@ void CSkillAction_RA_UNLIMIT::Slot11(int level, CGameActor* source, CGameActor* // OFFSET: 0x00775730 // FUNCTION: fn_08340 -void CSkillAction_AG_ENERGY_CONVERSION::Slot08(int level, CGameActor* source) { +void CSkillAction_AG_ENERGY_CONVERSION::OnSkillCast(int level, CGameActor* source) { if (source) { if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("energy_conversion_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("energy_conversion_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x00775BC0 // FUNCTION: fn_08342 -void CSkillAction_CD_DIVINUS_FLOS::Slot08(int level, CGameActor* source) { +void CSkillAction_CD_DIVINUS_FLOS::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("divinus_flos_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("divinus_flos_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x00775E60 // FUNCTION: fn_08343 -void CSkillAction_CD_DIVINUS_FLOS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_CD_DIVINUS_FLOS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("divinus_flos"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1100,7 +1100,7 @@ void CSkillAction_CD_DIVINUS_FLOS::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x00776260 // FUNCTION: fn_08345 -void CSkillAction_SHC_ENCHANTING_SHADOW::Slot08(int level, CGameActor* source) { +void CSkillAction_SHC_ENCHANTING_SHADOW::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("enchanting_shadow_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1111,7 +1111,7 @@ void CSkillAction_SHC_ENCHANTING_SHADOW::Slot08(int level, CGameActor* source) { // OFFSET: 0x00776550 // FUNCTION: fn_08349 -void CSkillAction_SHC_IMPACT_CRATER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_IMPACT_CRATER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("impact_crater"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1122,7 +1122,7 @@ void CSkillAction_SHC_IMPACT_CRATER::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x007767C0 // FUNCTION: fn_08350 -void CSkillAction_SHC_IMPACT_CRATER::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_IMPACT_CRATER::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("impact_crater_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1131,7 +1131,7 @@ void CSkillAction_SHC_IMPACT_CRATER::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x00776950 // FUNCTION: fn_08352 -void CSkillAction_SHC_CROSS_SLASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_CROSS_SLASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("cross_slash"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1140,7 +1140,7 @@ void CSkillAction_SHC_CROSS_SLASH::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x00776AC0 // FUNCTION: fn_08353 -void CSkillAction_SHC_CROSS_SLASH::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_CROSS_SLASH::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("cross_slash_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1149,22 +1149,22 @@ void CSkillAction_SHC_CROSS_SLASH::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x00776C40 // FUNCTION: fn_08355 -void CSkillAction_SHC_DANCING_KNIFE::Slot08(int level, CGameActor* source) { +void CSkillAction_SHC_DANCING_KNIFE::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dancing_knife_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dancing_knife_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x00776EF0 // FUNCTION: fn_08356 -void CSkillAction_SHC_DANCING_KNIFE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_DANCING_KNIFE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dancing_knife_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1173,18 +1173,18 @@ void CSkillAction_SHC_DANCING_KNIFE::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x00777C40 // FUNCTION: fn_08363 -void CSkillAction_SHC_SHADOW_EXCEED::Slot08(int level, CGameActor* source) { +void CSkillAction_SHC_SHADOW_EXCEED::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shadow_exceed_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007783F0 // FUNCTION: fn_08373 -void CSkillAction_ABC_CHASING_BREAK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_CHASING_BREAK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_break_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1193,7 +1193,7 @@ void CSkillAction_ABC_CHASING_BREAK::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x00778150 // FUNCTION: fn_08372 -void CSkillAction_ABC_CHASING_BREAK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_CHASING_BREAK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -1205,32 +1205,32 @@ void CSkillAction_ABC_CHASING_BREAK::Slot11(int level, CGameActor* source, CGame for (int angle = 0; angle < 360; angle += 45) { CEffect* effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_break"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot17(static_cast(angle)); - effect->Slot16(std::max(0, std::rand() % 150)); - effect->Slot22(0.15f); - effect->Slot32(); + effect->SetAngle(static_cast(angle)); + effect->SetDelay(std::max(0, std::rand() % 150)); + effect->SetScale(0.15f); + effect->EnableGroundRender(); } } } // OFFSET: 0x00778590 // FUNCTION: fn_08376 -void CSkillAction_ABC_CHASING_SHOT::Slot08(int level, CGameActor* source) { +void CSkillAction_ABC_CHASING_SHOT::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_shot_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_shot_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x00778830 // FUNCTION: fn_08377 -void CSkillAction_ABC_CHASING_SHOT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_CHASING_SHOT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -1242,16 +1242,16 @@ void CSkillAction_ABC_CHASING_SHOT::Slot11(int level, CGameActor* source, CGameA for (int angle = 0; angle < 360; angle += 45) { CEffect* effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_shot_single"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot17(static_cast(angle)); - effect->Slot22(0.15f); - effect->Slot32(); + effect->SetAngle(static_cast(angle)); + effect->SetScale(0.15f); + effect->EnableGroundRender(); } } } // OFFSET: 0x00778AD0 // FUNCTION: fn_08378 -void CSkillAction_ABC_CHASING_SHOT::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_CHASING_SHOT::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_shot_hitsub"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1260,7 +1260,7 @@ void CSkillAction_ABC_CHASING_SHOT::Slot15(int level, CGameActor* source, CGameA // OFFSET: 0x00778C50 // FUNCTION: fn_08379 -void CSkillAction_ABC_CHASING_SHOT::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_CHASING_SHOT::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chasing_shot_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1269,7 +1269,7 @@ void CSkillAction_ABC_CHASING_SHOT::Slot16(int level, CGameActor* source, CGameA // OFFSET: 0x00778DD0 // FUNCTION: fn_08381 -void CSkillAction_ABC_HIT_AND_SLIDING::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_HIT_AND_SLIDING::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hit_and_sliding_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1278,22 +1278,22 @@ void CSkillAction_ABC_HIT_AND_SLIDING::Slot16(int level, CGameActor* source, CGa // OFFSET: 0x00778F50 // FUNCTION: fn_08382 -void CSkillAction_ABC_ABYSS_FLAME::Slot08(int level, CGameActor* source) { +void CSkillAction_ABC_ABYSS_FLAME::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("abyss_flame_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("abyss_flame_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007791F0 // FUNCTION: fn_08383 -void CSkillAction_ABC_ABYSS_FLAME::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_ABYSS_FLAME::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("abyss_flame"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1302,7 +1302,7 @@ void CSkillAction_ABC_ABYSS_FLAME::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x00779360 // FUNCTION: fn_08384 -void CSkillAction_ABC_ABYSS_FLAME::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_ABYSS_FLAME::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("abyss_flame_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1311,7 +1311,7 @@ void CSkillAction_ABC_ABYSS_FLAME::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x007794E0 // FUNCTION: fn_08386 -void CSkillAction_ABC_ABYSS_FLAME_ATK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_ABYSS_FLAME_ATK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("abyss_flame_target"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1320,7 +1320,7 @@ void CSkillAction_ABC_ABYSS_FLAME_ATK::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x00779660 // FUNCTION: fn_08387 -void CSkillAction_ABC_ABYSS_FLAME_ATK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_ABC_ABYSS_FLAME_ATK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("abyss_flame_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1329,18 +1329,18 @@ void CSkillAction_ABC_ABYSS_FLAME_ATK::Slot16(int level, CGameActor* source, CGa // OFFSET: 0x00779870 // FUNCTION: fn_08388 -void CSkillAction_EM_PSYCHIC_STREAM::Slot08(int level, CGameActor* source) { +void CSkillAction_EM_PSYCHIC_STREAM::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("psychic_stream_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x00779A00 // FUNCTION: fn_08389 -void CSkillAction_EM_PSYCHIC_STREAM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_EM_PSYCHIC_STREAM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("psychic_stream"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1351,7 +1351,7 @@ void CSkillAction_EM_PSYCHIC_STREAM::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x00779C80 // FUNCTION: fn_08390 -void CSkillAction_EM_PSYCHIC_STREAM::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_EM_PSYCHIC_STREAM::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("psychic_stream_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1360,22 +1360,22 @@ void CSkillAction_EM_PSYCHIC_STREAM::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x00779E30 // FUNCTION: fn_08392 -void CSkillAction_IQ_BLAZING_FLAME_BLAST::Slot08(int level, CGameActor* source) { +void CSkillAction_IQ_BLAZING_FLAME_BLAST::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("blazing_flame_blast_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("blazing_flame_blast_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x0077A2A0 // FUNCTION: fn_08394 -void CSkillAction_IQ_BLAZING_FLAME_BLAST::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IQ_BLAZING_FLAME_BLAST::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("blazing_flame_blast_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -1383,7 +1383,7 @@ void CSkillAction_IQ_BLAZING_FLAME_BLAST::Slot16(int level, CGameActor* source, // OFFSET: 0x007754D0 // FUNCTION: fn_08338 -void CEfstAction_UNLIMIT::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_UNLIMIT::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -1396,7 +1396,7 @@ void CEfstAction_UNLIMIT::Slot01(int efstId, int argument2, int argument3, int a // OFFSET: 0x00777520 // FUNCTION: fn_08358 -void CEfstAction_DANCING_KNIFE::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_DANCING_KNIFE::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -1413,24 +1413,24 @@ void CEfstAction_DANCING_KNIFE::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x00774840 // FUNCTION: fn_08329 -void CEfstAction_GenderChange::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_GenderChange::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (!actor) { return; } EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gender_change_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot22(1.5f); + effect->SetScale(1.5f); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gender_change_loop"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot22(1.5f); + effect->SetScale(1.5f); } } // OFFSET: 0x00774AF0 // FUNCTION: fn_08330 -void CEfstAction_GenderChange::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_GenderChange::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (!actor) { return; } @@ -1438,13 +1438,13 @@ void CEfstAction_GenderChange::Slot01(int efstId, int argument2, int argument3, g_effectMgr->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gender_change_loop")); g_effectMgr->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gender_change_cast")); if (CEffect* effect = g_effectMgr->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("gender_change"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot22(1.5f); + effect->SetScale(1.5f); } } // OFFSET: 0x00777070 // FUNCTION: fn_08357 -void CEfstAction_DANCING_KNIFE::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_DANCING_KNIFE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (!actor) { return; } @@ -1461,7 +1461,7 @@ void CEfstAction_DANCING_KNIFE::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x007759F0 // FUNCTION: fn_08341 -void CSkillAction_AG_ENERGY_CONVERSION::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AG_ENERGY_CONVERSION::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1473,7 +1473,7 @@ void CSkillAction_AG_ENERGY_CONVERSION::Slot11(int level, CGameActor* source, CG // OFFSET: 0x00777940 // FUNCTION: fn_08361 -void CSkillAction_SHC_SHADOW_STAB::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_SHADOW_STAB::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -1483,13 +1483,13 @@ void CSkillAction_SHC_SHADOW_STAB::Slot11(int level, CGameActor* source, CGameAc ); EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shadow_stab"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x00777B00 // FUNCTION: fn_08362 -void CSkillAction_SHC_SHADOW_STAB::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_SHC_SHADOW_STAB::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -1504,7 +1504,7 @@ void CSkillAction_SHC_SHADOW_STAB::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x00777E20 // FUNCTION: fn_08365 -void CEfstAction_SHADOW_EXCEED::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_SHADOW_EXCEED::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (!actor || !argument6) { return; } @@ -1517,7 +1517,7 @@ void CEfstAction_SHADOW_EXCEED::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x0077A0F0 // FUNCTION: fn_08393 -void CSkillAction_IQ_BLAZING_FLAME_BLAST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_IQ_BLAZING_FLAME_BLAST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -1525,7 +1525,7 @@ void CSkillAction_IQ_BLAZING_FLAME_BLAST::Slot11(int level, CGameActor* source, const float scale = source->unknown_0378 * source->render.speed * 16.0f; EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("blazing_flame_blast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } } @@ -1537,7 +1537,7 @@ bool CSkillActionMgr::ActionSlot07(int skillId) { return false; } - return action->Slot07(); + return action->SuppressAttackSkillArrow(); } // OFFSET: 0x0077B620 @@ -1548,7 +1548,7 @@ bool CSkillActionMgr::ActionSlot06(int skillId) { return false; } - return action->Slot06(); + return action->SuppressSupportSkillArrow(); } // OFFSET: 0x0077B6E0 @@ -1559,7 +1559,7 @@ bool CSkillActionMgr::ActionSlot13(int skillId) { return false; } - return action->Slot13(); + return action->UseGroundSkillLastFrame(); } // OFFSET: 0x0077B7A0 @@ -1570,7 +1570,7 @@ bool CSkillActionMgr::ActionSlot05(int skillId) { return false; } - return action->Slot05(); + return action->KeepSkillAttackSpeed(); } // OFFSET: 0x0077B860 @@ -1581,7 +1581,7 @@ bool CSkillActionMgr::ActionSlot16(int skillId, int level, CGameActor* source, C return false; } - action->Slot16(level, source, target); + action->OnSkillDamage(level, source, target); return true; } @@ -1593,7 +1593,7 @@ bool CSkillActionMgr::EfstSlot00(int efstId, int value, int argument3, int argum return false; } - action->Slot00(efstId, value, argument3, argument4, actor, argument6); + action->OnEfstBegin(efstId, value, argument3, argument4, actor, argument6); return true; } @@ -1605,7 +1605,7 @@ bool CSkillActionMgr::ActionSlot08(int skillId, int level, CGameActor* source) { return false; } - action->Slot08(level, source); + action->OnSkillCast(level, source); return true; } @@ -1617,7 +1617,7 @@ bool CSkillActionMgr::ActionSlot09(int skillId, int argument1, int argument2, in return false; } - action->Slot09(argument1, argument2, argument3); + action->OnTargetSkillCast(argument1, argument2, argument3); return true; } @@ -1630,7 +1630,7 @@ bool CSkillActionMgr::ActionSlot10(int skillId, int level, CGameActor* source, s } const vector3d position = CellWorldPosition(column, row); - action->Slot10(level, source, std::bit_cast(position.x), std::bit_cast(position.y), std::bit_cast(position.z)); + action->OnGroundSkillCast(level, source, std::bit_cast(position.x), std::bit_cast(position.y), std::bit_cast(position.z)); return true; } @@ -1642,7 +1642,7 @@ bool CSkillActionMgr::EfstSlot01(int efstId, int argument2, int argument3, int a return false; } - action->Slot01(efstId, argument2, argument3, argument4, actor); + action->OnEfstEnd(efstId, argument2, argument3, argument4, actor); return true; } @@ -1654,7 +1654,7 @@ bool CSkillActionMgr::ActionSlot12(int skillId, int column, int row, int argumen return false; } - action->Slot12(CellWorldPosition(column, row), argument2, argument3); + action->OnGroundSkillEffect(CellWorldPosition(column, row), argument2, argument3); return true; } @@ -1666,7 +1666,7 @@ bool CSkillActionMgr::ActionSlot15(int skillId, int level, CGameActor* source, C return false; } - action->Slot15(level, source, target); + action->OnSkillHit(level, source, target); return true; } @@ -1678,7 +1678,7 @@ bool CSkillActionMgr::EfstSlot02(int efstId, int value, int argument3, int argum return false; } - action->Slot02(efstId, value, argument3, argument4, actor); + action->OnEfstUpdate(efstId, value, argument3, argument4, actor); return true; } @@ -1690,7 +1690,7 @@ bool CSkillActionMgr::ObjectSlot01(int skillId, CRenderObject* object) { return false; } - action->Slot01(object); + action->OnSkillObjectRemove(object); return true; } @@ -1702,7 +1702,7 @@ bool CSkillActionMgr::ObjectSlot00(int skillId, int argument, CRenderObject* obj return false; } - action->Slot00(argument, object, source); + action->OnSkillObjectCreate(argument, object, source); return true; } @@ -1714,7 +1714,7 @@ bool CSkillActionMgr::ActionSlot11(int skillId, int level, CGameActor* source, C return false; } - action->Slot11(level, source, target); + action->OnSkillEffect(level, source, target); return true; } @@ -1738,20 +1738,20 @@ void CSkillActionMgr::RegisterSkillAction(int skillId, std::functionSpawn(source->render.accountId, 2228, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, 2229, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x0077CD90 // FUNCTION: fn_08438 -void CSkillAction_BO_MAYHEMIC_THORNS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_BO_MAYHEMIC_THORNS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mayhemic_thorns"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1762,7 +1762,7 @@ void CSkillAction_BO_MAYHEMIC_THORNS::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x0077D020 // FUNCTION: fn_08440 -void CSkillAction_BO_EXPLOSIVE_POWDER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_BO_EXPLOSIVE_POWDER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("explosive_powder"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1771,13 +1771,13 @@ void CSkillAction_BO_EXPLOSIVE_POWDER::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x0077D190 // FUNCTION: fn_08441 -bool CSkillAction_BO_EXPLOSIVE_POWDER::Slot05() { +bool CSkillAction_BO_EXPLOSIVE_POWDER::KeepSkillAttackSpeed() { return true; } // OFFSET: 0x0077D1A0 // FUNCTION: fn_08442 -void CSkillAction_BO_MYSTERY_POWDER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_BO_MYSTERY_POWDER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mistery_powder"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1786,7 +1786,7 @@ void CSkillAction_BO_MYSTERY_POWDER::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x0077D310 // FUNCTION: fn_08443 -void CSkillAction_BO_MYSTERY_POWDER::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_BO_MYSTERY_POWDER::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mistery_powder_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1795,7 +1795,7 @@ void CSkillAction_BO_MYSTERY_POWDER::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x0077D490 // FUNCTION: fn_08444 -void CEfstAction_MYSTERY_POWDER::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_MYSTERY_POWDER::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mistery_powder_loop_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1806,7 +1806,7 @@ void CEfstAction_MYSTERY_POWDER::Slot00(int efstId, int value, int argument3, in // OFFSET: 0x0077D720 // FUNCTION: fn_08445 -void CEfstAction_MYSTERY_POWDER::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_MYSTERY_POWDER::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("mistery_powder_loop_bottom")); @@ -1817,13 +1817,13 @@ void CEfstAction_MYSTERY_POWDER::Slot01(int efstId, int argument2, int argument3 // OFFSET: 0x0077D940 // FUNCTION: fn_08446 -void CEfstAction_MYSTERY_POWDER::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_MYSTERY_POWDER::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0077D960 // FUNCTION: fn_08447 -void CSkillAction_BO_DUST_EXPLOSION::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_BO_DUST_EXPLOSION::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!target) { return; } @@ -1832,17 +1832,17 @@ void CSkillAction_BO_DUST_EXPLOSION::Slot11(int level, CGameActor* source, CGame for (int delay = 0; delay < 600; delay += 200) { const int quadrant = std::max(std::rand() % 4, 0); if (CEffect* effect = spawnDustExplosion(quadrant, target->render.position)) { - effect->Slot16(delay); + effect->SetDelay(delay); } if (CEffect* effect = spawnDustExplosion((quadrant + 2) % 4, target->render.position)) { - effect->Slot16(delay); + effect->SetDelay(delay); } } } // OFFSET: 0x0077D9E0 // FUNCTION: fn_08448 -void CSkillAction_BO_DUST_EXPLOSION::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_BO_DUST_EXPLOSION::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dust_explosion_hit_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1887,7 +1887,7 @@ CEffect* DustExplosionSpawner::operator()(int quadrant, const vector3d& position // OFFSET: 0x0077DF70 // FUNCTION: fn_08450 -void CSkillAction_DK_VIGOR::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_VIGOR::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("vigor_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1896,7 +1896,7 @@ void CSkillAction_DK_VIGOR::Slot11(int level, CGameActor* source, CGameActor* ta // OFFSET: 0x0077E0D0 // FUNCTION: fn_08451 -void CEfstAction_VIGOR::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_VIGOR::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("vigor_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1905,7 +1905,7 @@ void CEfstAction_VIGOR::Slot00(int efstId, int value, int argument3, int argumen // OFFSET: 0x0077E230 // FUNCTION: fn_08452 -void CEfstAction_VIGOR::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_VIGOR::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("vigor_buff")); @@ -1914,19 +1914,19 @@ void CEfstAction_VIGOR::Slot01(int efstId, int argument2, int argument3, int arg // OFFSET: 0x0077E350 // FUNCTION: fn_08453 -void CEfstAction_VIGOR::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_VIGOR::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0077E370 // FUNCTION: fn_08454 -EfstActionMessage CEfstAction_VIGOR::Slot04() { +EfstActionMessage CEfstAction_VIGOR::GetEfstEndMessage() { return {LookupMessage(3747), 0xFF}; } // OFFSET: 0x0077E3B0 // FUNCTION: fn_08456 -void CSkillAction_DK_SERVANTWEAPON_ATK::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_SERVANTWEAPON_ATK::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servantweapon_down"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1935,7 +1935,7 @@ void CSkillAction_DK_SERVANTWEAPON_ATK::Slot15(int level, CGameActor* source, CG // OFFSET: 0x0077E530 // FUNCTION: fn_08457 -void CSkillAction_DK_SERVANTWEAPON_ATK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_SERVANTWEAPON_ATK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servantweapon_hit_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1946,7 +1946,7 @@ void CSkillAction_DK_SERVANTWEAPON_ATK::Slot16(int level, CGameActor* source, CG // OFFSET: 0x0077E7B0 // FUNCTION: fn_08458 -void CEfstAction_SERVANTWEAPON::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SERVANTWEAPON::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2460); } @@ -1954,17 +1954,17 @@ void CEfstAction_SERVANTWEAPON::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0077E7E0 // FUNCTION: fn_08459 -EfstActionMessage CEfstAction_SERVANTWEAPON::Slot04() { +EfstActionMessage CEfstAction_SERVANTWEAPON::GetEfstEndMessage() { return {LookupMessage(3745), 0xFF}; } // OFFSET: 0x0077E820 // FUNCTION: fn_08461 -void CSkillAction_DK_SERVANT_W_PHANTOM::Slot16(int actor, CGameActor* targetActor, CGameActor*) { +void CSkillAction_DK_SERVANT_W_PHANTOM::OnSkillDamage(int actor, CGameActor* targetActor, CGameActor*) { CGameActor* source = reinterpret_cast(actor); if (source) { if (CEffect* effect = g_effectMgr->Find(source->render.accountId, 0x99C)) { - effect->Slot14(0x1453); + effect->SetLifeTime(0x1453); } } @@ -1976,7 +1976,7 @@ void CSkillAction_DK_SERVANT_W_PHANTOM::Slot16(int actor, CGameActor* targetActo // OFFSET: 0x0077EAD0 // FUNCTION: fn_08462 -void CEfstAction_SERVANT_SIGN::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_SERVANT_SIGN::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_sign_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -1987,7 +1987,7 @@ void CEfstAction_SERVANT_SIGN::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x0077ED40 // FUNCTION: fn_08463 -void CEfstAction_SERVANT_SIGN::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_SERVANT_SIGN::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_sign_bottom")); @@ -1998,13 +1998,13 @@ void CEfstAction_SERVANT_SIGN::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x0077EF40 // FUNCTION: fn_08464 -void CEfstAction_SERVANT_SIGN::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_SERVANT_SIGN::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x0077EF70 // FUNCTION: fn_08466 -void CSkillAction_DK_SERVANT_W_PHANTOM::Slot08(int level, CGameActor* source) { +void CSkillAction_DK_SERVANT_W_PHANTOM::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2012,7 +2012,7 @@ void CSkillAction_DK_SERVANT_W_PHANTOM::Slot08(int level, CGameActor* source) { // OFFSET: 0x0077EFA0 // FUNCTION: fn_08467 -void CSkillAction_DK_SERVANT_W_PHANTOM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_SERVANT_W_PHANTOM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Find(source->render.accountId, 2460); } @@ -2020,7 +2020,7 @@ void CSkillAction_DK_SERVANT_W_PHANTOM::Slot11(int level, CGameActor* source, CG // OFFSET: 0x0077EFD0 // FUNCTION: fn_08468 -void CSkillAction_DK_SERVANT_W_PHANTOM::Slot15(int caster, CGameActor* target, CGameActor* argument3) { +void CSkillAction_DK_SERVANT_W_PHANTOM::OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) { if (!target) { return; } @@ -2034,25 +2034,25 @@ void CSkillAction_DK_SERVANT_W_PHANTOM::Slot15(int caster, CGameActor* target, C g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_phantom_down"), offset.x, offset.y, offset.z, 0, -1, 0, 0); effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servantweapon_hit_bottom"), offset.x, offset.y, offset.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servantweapon_hit"), offset.x, offset.y, offset.z, 0, -1, 0, 0); } else { effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_phantom_sub_bottom"), offset.x, offset.y, offset.z, 0, -1, 0, 0); if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } effect = g_effectMgr->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_phantom_sub"), offset.x, offset.y, offset.z, 0, -1, 0, 0); } if (effect) { - effect->Slot16(duration); + effect->SetDelay(duration); } } // OFFSET: 0x0077F600 // FUNCTION: fn_08469 -void CSkillAction_DK_SERVANT_W_DEMOL::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_SERVANT_W_DEMOL::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Find(source->render.accountId, 2460); } @@ -2060,12 +2060,12 @@ void CSkillAction_DK_SERVANT_W_DEMOL::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x0077F630 // FUNCTION: fn_08470 -void CSkillAction_DK_SERVANT_W_DEMOL::Slot15(int caster, CGameActor* target, CGameActor* argument3) { +void CSkillAction_DK_SERVANT_W_DEMOL::OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) { CGameActor* source = reinterpret_cast(caster); if (source) { const int duration = static_cast(source->render.speed * 100.0f + 100.0f); if (CEffect* effect = g_effectMgr->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_demolition_collect"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(duration); + effect->SetDelay(duration); } } @@ -2081,7 +2081,7 @@ void CSkillAction_DK_SERVANT_W_DEMOL::Slot15(int caster, CGameActor* target, CGa // OFFSET: 0x0077F9B0 // FUNCTION: fn_08471 -void CSkillAction_DK_SERVANT_W_DEMOL::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_SERVANT_W_DEMOL::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("servant_demolition_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2090,7 +2090,7 @@ void CSkillAction_DK_SERVANT_W_DEMOL::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x0077FB40 // FUNCTION: fn_08473 -void CSkillAction_DK_STORMSLASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_STORMSLASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -2102,7 +2102,7 @@ void CSkillAction_DK_STORMSLASH::Slot11(int level, CGameActor* source, CGameActo return; } - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); for (int frame = 0; level > 0; --level, frame += 15) { const int variant = std::rand() % 4 + 1; effect->AddEvent(0, std::format("effect\\DK_STORMSLASH{}.wav", variant).c_str(), frame, 0); @@ -2111,13 +2111,13 @@ void CSkillAction_DK_STORMSLASH::Slot11(int level, CGameActor* source, CGameActo // OFFSET: 0x0077FD50 // FUNCTION: fn_08475 -bool CSkillAction_DK_MADNESS_CRUSHER::Slot04() { +bool CSkillAction_DK_MADNESS_CRUSHER::IsSkillWithoutMotion() { return true; } // OFFSET: 0x0077FD60 // FUNCTION: fn_08476 -void CSkillAction_DK_MADNESS_CRUSHER::Slot08(int level, CGameActor* source) { +void CSkillAction_DK_MADNESS_CRUSHER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2125,7 +2125,7 @@ void CSkillAction_DK_MADNESS_CRUSHER::Slot08(int level, CGameActor* source) { // OFFSET: 0x0077FD90 // FUNCTION: fn_08477 -void CSkillAction_DK_MADNESS_CRUSHER::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_MADNESS_CRUSHER::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("madness_crusher_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2136,18 +2136,18 @@ void CSkillAction_DK_MADNESS_CRUSHER::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x00780020 // FUNCTION: fn_08479 -void CSkillAction_DK_DRAGONIC_PIERCE::Slot08(int level, CGameActor* source) { +void CSkillAction_DK_DRAGONIC_PIERCE::OnSkillCast(int level, CGameActor* source) { if (source) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dragonic_pierce_cast"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot14(level); + effect->SetLifeTime(level); } } } // OFFSET: 0x007801B0 // FUNCTION: fn_08480 -void CSkillAction_DK_DRAGONIC_PIERCE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_DRAGONIC_PIERCE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -2174,27 +2174,27 @@ void CSkillAction_DK_DRAGONIC_PIERCE::Slot11(int level, CGameActor* source, CGam std::string name = horizontal ? "dragonic_pierce_horizon" : "dragonic_pierce_vertical"; EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId(name), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); float offset; if (horizontal) { - effect->Slot26(flip); + effect->SetFlipX(flip); offset = flip ? 0.0f : -180.0f; } else { - effect->Slot27(flip); + effect->SetFlipY(flip); offset = flip ? -90.0f : -270.0f; } - effect->Slot17(static_cast((static_cast(angle + offset) + 360) % 360)); + effect->SetAngle(static_cast((static_cast(angle + offset) + 360) % 360)); } effects = g_effectMgr; if (CEffect* effect = effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dragonic_pierce_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0)) { - effect->Slot16(static_cast(scale)); + effect->SetDelay(static_cast(scale)); } } // OFFSET: 0x007805A0 // FUNCTION: fn_08481 -void CSkillAction_DK_DRAGONIC_PIERCE::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_DRAGONIC_PIERCE::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dragonic_pierce_hit_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2205,7 +2205,7 @@ void CSkillAction_DK_DRAGONIC_PIERCE::Slot16(int level, CGameActor* source, CGam // OFFSET: 0x00780840 // FUNCTION: fn_08483 -void CSkillAction_DK_DRAGONIC_BREATH::Slot08(int level, CGameActor* source) { +void CSkillAction_DK_DRAGONIC_BREATH::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2213,7 +2213,7 @@ void CSkillAction_DK_DRAGONIC_BREATH::Slot08(int level, CGameActor* source) { // OFFSET: 0x00780870 // FUNCTION: fn_08484 -void CSkillAction_DK_DRAGONIC_BREATH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_DRAGONIC_BREATH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("dragonic_breath_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2224,7 +2224,7 @@ void CSkillAction_DK_DRAGONIC_BREATH::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x00780AF0 // FUNCTION: fn_08485 -void CSkillAction_DK_DRAGONIC_BREATH::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_DRAGONIC_BREATH::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -2248,7 +2248,7 @@ void CSkillAction_DK_DRAGONIC_BREATH::Slot15(int level, CGameActor* source, CGam // OFFSET: 0x00780DB0 // FUNCTION: fn_08487 -void CSkillAction_DK_CHARGINGPIERCE::Slot08(int level, CGameActor* source) { +void CSkillAction_DK_CHARGINGPIERCE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2256,7 +2256,7 @@ void CSkillAction_DK_CHARGINGPIERCE::Slot08(int level, CGameActor* source) { // OFFSET: 0x00780DE0 // FUNCTION: fn_08488 -void CSkillAction_DK_CHARGINGPIERCE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_CHARGINGPIERCE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("chargingpierce_cast_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2267,15 +2267,15 @@ void CSkillAction_DK_CHARGINGPIERCE::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x00781070 // FUNCTION: fn_08489 -EfstActionMessage CEfstAction_CHARGINGPIERCE::Slot04() { +EfstActionMessage CEfstAction_CHARGINGPIERCE::GetEfstEndMessage() { return {LookupMessage(3746), 0xFF}; } // OFFSET: 0x007810A0 // FUNCTION: fn_08490 -void CEfstAction_CHARGINGPIERCE_COUNT::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_CHARGINGPIERCE_COUNT::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (argument3) { - this->Slot01(efstId, value, argument3, 0, actor); + this->OnEfstEnd(efstId, value, argument3, 0, actor); if (CRenderObject* target = static_cast(g_modeMgr.GetGameMode())->scene->GetGameActorByAidIncludeMe(argument3)) { EffectLists* effects = g_effectMgr; effects->Spawn(argument3, CEZ2STREffectMgr::GetInstance()->EffectId("chargingpierce_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2294,7 +2294,7 @@ void CEfstAction_CHARGINGPIERCE_COUNT::Slot00(int efstId, int value, int argumen // OFFSET: 0x007812F0 // FUNCTION: fn_08491 -void CEfstAction_CHARGINGPIERCE_COUNT::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_CHARGINGPIERCE_COUNT::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2461); } @@ -2302,7 +2302,7 @@ void CEfstAction_CHARGINGPIERCE_COUNT::Slot01(int efstId, int argument2, int arg // OFFSET: 0x00781330 // FUNCTION: fn_08493 -void CSkillAction_DK_HACKANDSLASHER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_HACKANDSLASHER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hackandslash_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2313,7 +2313,7 @@ void CSkillAction_DK_HACKANDSLASHER::Slot11(int level, CGameActor* source, CGame // OFFSET: 0x007815A0 // FUNCTION: fn_08494 -void CSkillAction_DK_HACKANDSLASHER::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_HACKANDSLASHER::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hackandslash_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2322,13 +2322,13 @@ void CSkillAction_DK_HACKANDSLASHER::Slot16(int level, CGameActor* source, CGame // OFFSET: 0x00781710 // FUNCTION: fn_08495 -int CSkillAction_DK_HACKANDSLASHER_ATK::Slot02() { +int CSkillAction_DK_HACKANDSLASHER_ATK::GetSkillAttackMotion() { return 0; } // OFFSET: 0x00781720 // FUNCTION: fn_08496 -void CSkillAction_DK_HACKANDSLASHER_ATK::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_DK_HACKANDSLASHER_ATK::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hackandslash_hit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2337,7 +2337,7 @@ void CSkillAction_DK_HACKANDSLASHER_ATK::Slot16(int level, CGameActor* source, C // OFFSET: 0x00781B50 // FUNCTION: fn_08497 -void CSkillAction_NPC_BLOCK_EXPLOSION::Slot08(int level, CGameActor* source) { +void CSkillAction_NPC_BLOCK_EXPLOSION::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2345,7 +2345,7 @@ void CSkillAction_NPC_BLOCK_EXPLOSION::Slot08(int level, CGameActor* source) { // OFFSET: 0x00781B80 // FUNCTION: fn_08498 -void CSkillAction_NPC_BLOCK_EXPLOSION::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_BLOCK_EXPLOSION::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 2406, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -2356,7 +2356,7 @@ void CSkillAction_NPC_BLOCK_EXPLOSION::Slot11(int level, CGameActor* source, CGa // OFFSET: 0x00781C30 // FUNCTION: fn_08499 -void CSkillAction_NPC_FROST_FIELD::Slot08(int level, CGameActor* source) { +void CSkillAction_NPC_FROST_FIELD::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } @@ -2364,7 +2364,7 @@ void CSkillAction_NPC_FROST_FIELD::Slot08(int level, CGameActor* source) { // OFFSET: 0x00781C60 // FUNCTION: fn_08500 -void CSkillAction_NPC_FROST_FIELD::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_FROST_FIELD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 2408, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(source->render.accountId, 2409, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2380,7 +2380,7 @@ void CSkillAction_NPC_FROST_FIELD::Slot11(int level, CGameActor* source, CGameAc // OFFSET: 0x00781DB0 // FUNCTION: fn_08501 -void CSkillAction_NPC_FROST_FIELD::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_FROST_FIELD::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 1310, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -2388,7 +2388,7 @@ void CSkillAction_NPC_FROST_FIELD::Slot16(int level, CGameActor* source, CGameAc // OFFSET: 0x00781E00 // FUNCTION: fn_08502 -void CEfstAction_FROST_STORM::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_FROST_STORM::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { g_effectMgr->Spawn(actor->render.accountId, 2403, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -2396,7 +2396,7 @@ void CEfstAction_FROST_STORM::Slot00(int efstId, int value, int argument3, int a // OFFSET: 0x00781E50 // FUNCTION: fn_08503 -void CEfstAction_FROST_STORM::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_FROST_STORM::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2403); } @@ -2404,183 +2404,183 @@ void CEfstAction_FROST_STORM::Slot01(int efstId, int argument2, int argument3, i // OFFSET: 0x00781E80 // FUNCTION: fn_08504 -void CEfstAction_FROST_STORM::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_FROST_STORM::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } class CSkillAction_NPC_LIGHTNING_JUDGEMENT : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_GROGGY : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_NPC_RESET_EFST : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_TARGET_MARKER : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_NPC_AIMED_SHOWER : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NPC_BLAZING_ERUPTION : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NPC_BLOCK_SEAL : public CSkillAction { public: - void Slot08(int level, CGameActor* source) override; + void OnSkillCast(int level, CGameActor* source) override; }; class CEfstAction_BLOCK_SEAL : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_HN_DOUBLEBOWLINGBASH : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; - void Slot16(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_MEGA_SONIC_BLOW : public CSkillAction { public: - int Slot02() override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_SHIELD_CHAIN_RUSH : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_SPIRAL_PIERCE_MAX : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_METEOR_STORM_BUSTER : public CSkillAction { public: - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - void Slot12(vector3d position, int argument2, int argument3) override; - bool Slot13() override; - int Slot14() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; + bool UseGroundSkillLastFrame() override; + int GetSkillScopeType() override; }; class CSkillAction_HN_JUPITEL_THUNDER_STORM : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_JACK_FROST_NOVA : public CSkillAction { public: - int Slot02() override; - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; - void Slot10(int level, CGameActor* source, int argument3, int argument4, int argument5) override; - int Slot14() override; + int GetSkillAttackMotion() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; + void OnGroundSkillCast(int level, CGameActor* source, int argument3, int argument4, int argument5) override; + int GetSkillScopeType() override; }; class CSkillObjectAction_HN_JACK_FROST_NOVA : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; class CSkillAction_HN_HELLS_DRIVE : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_GROUND_GRAVITATION : public CSkillAction { public: - int Slot02() override; - bool Slot03(int argument) override; - void Slot08(int level, CGameActor* source) override; + int GetSkillAttackMotion() override; + bool KeepSkillAttackMotion(int argument) override; + void OnSkillCast(int level, CGameActor* source) override; }; class CSkillObjectAction_HN_GROUND_GRAVITATION : public CSkillObjectAction { public: - void Slot00(int argument, CRenderObject* object, CGameActor* source) override; - void Slot01(CRenderObject* object) override; + void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) override; + void OnSkillObjectRemove(CRenderObject* object) override; }; class CSkillAction_HN_NAPALM_VULCAN_STRIKE : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot15(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_HN_BREAKINGLIMIT : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_BREAKINGLIMIT : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_HN_RULEBREAK : public CSkillAction { public: - int Slot02() override; - void Slot08(int level, CGameActor* source) override; - void Slot11(int level, CGameActor* source, CGameActor* target) override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CEfstAction_RULEBREAK : public CEfstAction { public: - void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; - void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; - void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) override; + void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) override; + void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; class CSkillAction_HN_OVERCOMING_CRISIS : public CSkillAction { public: - void Slot11(int level, CGameActor* source, CGameActor* target) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; // OFFSET: 0x00781EA0 // FUNCTION: fn_08505 -void CSkillAction_NPC_LIGHTNING_JUDGEMENT::Slot08(int level, CGameActor* source) { +void CSkillAction_NPC_LIGHTNING_JUDGEMENT::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2588,7 +2588,7 @@ void CSkillAction_NPC_LIGHTNING_JUDGEMENT::Slot08(int level, CGameActor* source) // OFFSET: 0x00781ED0 // FUNCTION: fn_08506 -void CSkillAction_NPC_LIGHTNING_JUDGEMENT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_LIGHTNING_JUDGEMENT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("spark_blaster_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2601,7 +2601,7 @@ void CSkillAction_NPC_LIGHTNING_JUDGEMENT::Slot11(int level, CGameActor* source, // OFFSET: 0x007820B0 // FUNCTION: fn_08507 -void CSkillAction_NPC_LIGHTNING_JUDGEMENT::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_LIGHTNING_JUDGEMENT::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 1256, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -2609,7 +2609,7 @@ void CSkillAction_NPC_LIGHTNING_JUDGEMENT::Slot16(int level, CGameActor* source, // OFFSET: 0x00782100 // FUNCTION: fn_08508 -void CEfstAction_GROGGY::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_GROGGY::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("groggy_on_loop"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2618,7 +2618,7 @@ void CEfstAction_GROGGY::Slot00(int efstId, int value, int argument3, int argume // OFFSET: 0x00782270 // FUNCTION: fn_08509 -void CEfstAction_GROGGY::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_GROGGY::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("groggy_on_loop")); @@ -2627,13 +2627,13 @@ void CEfstAction_GROGGY::Slot01(int efstId, int argument2, int argument3, int ar // OFFSET: 0x00782390 // FUNCTION: fn_08510 -void CEfstAction_GROGGY::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_GROGGY::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007823B0 // FUNCTION: fn_08511 -void CSkillAction_NPC_RESET_EFST::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_RESET_EFST::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 2410, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); const CPlayer* player = static_cast(g_modeMgr.GetGameMode())->scene->player; @@ -2645,7 +2645,7 @@ void CSkillAction_NPC_RESET_EFST::Slot11(int level, CGameActor* source, CGameAct // OFFSET: 0x00782470 // FUNCTION: fn_08512 -void CEfstAction_TARGET_MARKER::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_TARGET_MARKER::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("target_marker_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2656,7 +2656,7 @@ void CEfstAction_TARGET_MARKER::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x00782700 // FUNCTION: fn_08513 -void CEfstAction_TARGET_MARKER::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_TARGET_MARKER::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("target_marker_loop")); @@ -2665,13 +2665,13 @@ void CEfstAction_TARGET_MARKER::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x00782830 // FUNCTION: fn_08514 -void CEfstAction_TARGET_MARKER::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_TARGET_MARKER::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00782860 // FUNCTION: fn_08516 -void CSkillAction_NPC_AIMED_SHOWER::Slot08(int level, CGameActor* source) { +void CSkillAction_NPC_AIMED_SHOWER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } @@ -2679,7 +2679,7 @@ void CSkillAction_NPC_AIMED_SHOWER::Slot08(int level, CGameActor* source) { // OFFSET: 0x00782890 // FUNCTION: fn_08517 -void CSkillAction_NPC_AIMED_SHOWER::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_AIMED_SHOWER::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 1268, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); const CPlayer* player = static_cast(g_modeMgr.GetGameMode())->scene->player; @@ -2691,7 +2691,7 @@ void CSkillAction_NPC_AIMED_SHOWER::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x00782950 // FUNCTION: fn_08518 -void CSkillAction_NPC_AIMED_SHOWER::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_AIMED_SHOWER::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 2405, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); } @@ -2699,7 +2699,7 @@ void CSkillAction_NPC_AIMED_SHOWER::Slot16(int level, CGameActor* source, CGameA // OFFSET: 0x007829A0 // FUNCTION: fn_08519 -void CSkillAction_NPC_BLAZING_ERUPTION::Slot08(int level, CGameActor* source) { +void CSkillAction_NPC_BLAZING_ERUPTION::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(441, level / 16); } @@ -2707,7 +2707,7 @@ void CSkillAction_NPC_BLAZING_ERUPTION::Slot08(int level, CGameActor* source) { // OFFSET: 0x007829D0 // FUNCTION: fn_08520 -void CSkillAction_NPC_BLAZING_ERUPTION::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_NPC_BLAZING_ERUPTION::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { g_effectMgr->Spawn(source->render.accountId, 1270, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); g_effectMgr->Spawn(source->render.accountId, 1266, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2721,7 +2721,7 @@ void CSkillAction_NPC_BLAZING_ERUPTION::Slot11(int level, CGameActor* source, CG // OFFSET: 0x00782B20 // FUNCTION: fn_08521 -void CSkillAction_NPC_BLOCK_SEAL::Slot08(int level, CGameActor* source) { +void CSkillAction_NPC_BLOCK_SEAL::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2729,7 +2729,7 @@ void CSkillAction_NPC_BLOCK_SEAL::Slot08(int level, CGameActor* source) { // OFFSET: 0x00782B50 // FUNCTION: fn_08522 -void CEfstAction_BLOCK_SEAL::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_BLOCK_SEAL::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("npc_block_seal_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2743,7 +2743,7 @@ void CEfstAction_BLOCK_SEAL::Slot00(int efstId, int value, int argument3, int ar // OFFSET: 0x00782F20 // FUNCTION: fn_08523 -void CEfstAction_BLOCK_SEAL::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_BLOCK_SEAL::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { g_effectMgr->Retire(actor->render.accountId, 2400); EffectLists* effects = g_effectMgr; @@ -2755,19 +2755,19 @@ void CEfstAction_BLOCK_SEAL::Slot01(int efstId, int argument2, int argument3, in // OFFSET: 0x00783160 // FUNCTION: fn_08524 -void CEfstAction_BLOCK_SEAL::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_BLOCK_SEAL::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x007832E0 // FUNCTION: fn_08525 -int CSkillAction_HN_DOUBLEBOWLINGBASH::Slot02() { +int CSkillAction_HN_DOUBLEBOWLINGBASH::GetSkillAttackMotion() { return 58; } // OFFSET: 0x007832F0 // FUNCTION: fn_08526 -void CSkillAction_HN_DOUBLEBOWLINGBASH::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_DOUBLEBOWLINGBASH::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(12, level / 16); } @@ -2775,7 +2775,7 @@ void CSkillAction_HN_DOUBLEBOWLINGBASH::Slot08(int level, CGameActor* source) { // OFFSET: 0x00783320 // FUNCTION: fn_08527 -void CSkillAction_HN_DOUBLEBOWLINGBASH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_DOUBLEBOWLINGBASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("double_bowlingbash"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2784,7 +2784,7 @@ void CSkillAction_HN_DOUBLEBOWLINGBASH::Slot11(int level, CGameActor* source, CG // OFFSET: 0x007834A0 // FUNCTION: fn_08528 -void CSkillAction_HN_DOUBLEBOWLINGBASH::Slot16(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_DOUBLEBOWLINGBASH::OnSkillDamage(int level, CGameActor* source, CGameActor* target) { if (source) { static_cast(source)->LaunchEffect(73, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } @@ -2792,13 +2792,13 @@ void CSkillAction_HN_DOUBLEBOWLINGBASH::Slot16(int level, CGameActor* source, CG // OFFSET: 0x007834E0 // FUNCTION: fn_08529 -int CSkillAction_HN_MEGA_SONIC_BLOW::Slot02() { +int CSkillAction_HN_MEGA_SONIC_BLOW::GetSkillAttackMotion() { return 58; } // OFFSET: 0x007834F0 // FUNCTION: fn_08530 -void CSkillAction_HN_MEGA_SONIC_BLOW::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_MEGA_SONIC_BLOW::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { static_cast(source)->LaunchEffect(121, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); EffectLists* effects = g_effectMgr; @@ -2808,13 +2808,13 @@ void CSkillAction_HN_MEGA_SONIC_BLOW::Slot11(int level, CGameActor* source, CGam // OFFSET: 0x00783690 // FUNCTION: fn_08531 -int CSkillAction_HN_SHIELD_CHAIN_RUSH::Slot02() { +int CSkillAction_HN_SHIELD_CHAIN_RUSH::GetSkillAttackMotion() { return 59; } // OFFSET: 0x007836A0 // FUNCTION: fn_08532 -void CSkillAction_HN_SHIELD_CHAIN_RUSH::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_SHIELD_CHAIN_RUSH::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -2822,7 +2822,7 @@ void CSkillAction_HN_SHIELD_CHAIN_RUSH::Slot08(int level, CGameActor* source) { // OFFSET: 0x007836D0 // FUNCTION: fn_08533 -void CSkillAction_HN_SHIELD_CHAIN_RUSH::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_SHIELD_CHAIN_RUSH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (target) { EffectLists* effects = g_effectMgr; effects->Spawn(target->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("shield_chain_rush"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2831,13 +2831,13 @@ void CSkillAction_HN_SHIELD_CHAIN_RUSH::Slot11(int level, CGameActor* source, CG // OFFSET: 0x00783850 // FUNCTION: fn_08534 -int CSkillAction_HN_SPIRAL_PIERCE_MAX::Slot02() { +int CSkillAction_HN_SPIRAL_PIERCE_MAX::GetSkillAttackMotion() { return 58; } // OFFSET: 0x00783860 // FUNCTION: fn_08535 -void CSkillAction_HN_SPIRAL_PIERCE_MAX::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_SPIRAL_PIERCE_MAX::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(502, level / 16); } @@ -2845,7 +2845,7 @@ void CSkillAction_HN_SPIRAL_PIERCE_MAX::Slot08(int level, CGameActor* source) { // OFFSET: 0x00783890 // FUNCTION: fn_08536 -void CSkillAction_HN_SPIRAL_PIERCE_MAX::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_SPIRAL_PIERCE_MAX::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -2861,19 +2861,19 @@ void CSkillAction_HN_SPIRAL_PIERCE_MAX::Slot11(int level, CGameActor* source, CG effects = g_effectMgr; CEffect* effect = effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("spiral_pierce_max"), position.x, position.y, position.z, 0, -1, 0, 0); if (effect) { - effect->Slot17(angle); + effect->SetAngle(angle); } } // OFFSET: 0x00783C90 // FUNCTION: fn_08537 -bool CSkillAction_HN_METEOR_STORM_BUSTER::Slot03(int argument) { +bool CSkillAction_HN_METEOR_STORM_BUSTER::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x00783CA0 // FUNCTION: fn_08538 -void CSkillAction_HN_METEOR_STORM_BUSTER::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_METEOR_STORM_BUSTER::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(55, level / 16); } @@ -2881,7 +2881,7 @@ void CSkillAction_HN_METEOR_STORM_BUSTER::Slot08(int level, CGameActor* source) // OFFSET: 0x00783CD0 // FUNCTION: fn_08539 -void CSkillAction_HN_METEOR_STORM_BUSTER::Slot12(vector3d position, int argument2, int argument3) { +void CSkillAction_HN_METEOR_STORM_BUSTER::OnGroundSkillEffect(vector3d position, int argument2, int argument3) { g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("meteor_storm_buster_meteor_bottom"), position.x, position.y, position.z, 0, -1, 0, 0); g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("meteor_storm_buster_meteor"), position.x, position.y, position.z, 0, -1, 0, 0); g_effectMgr->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("meteor_storm_buster_bottom"), position.x, position.y, position.z, 0, -1, 0, 0); @@ -2890,25 +2890,25 @@ void CSkillAction_HN_METEOR_STORM_BUSTER::Slot12(vector3d position, int argument // OFFSET: 0x00784100 // FUNCTION: fn_08540 -bool CSkillAction_HN_METEOR_STORM_BUSTER::Slot13() { +bool CSkillAction_HN_METEOR_STORM_BUSTER::UseGroundSkillLastFrame() { return true; } // OFFSET: 0x00784110 // FUNCTION: fn_08541 -int CSkillAction_HN_METEOR_STORM_BUSTER::Slot14() { +int CSkillAction_HN_METEOR_STORM_BUSTER::GetSkillScopeType() { return 7; } // OFFSET: 0x00784120 // FUNCTION: fn_08542 -int CSkillAction_HN_JUPITEL_THUNDER_STORM::Slot02() { +int CSkillAction_HN_JUPITEL_THUNDER_STORM::GetSkillAttackMotion() { return 59; } // OFFSET: 0x00784130 // FUNCTION: fn_08543 -void CSkillAction_HN_JUPITEL_THUNDER_STORM::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_JUPITEL_THUNDER_STORM::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(57, level / 16); } @@ -2916,7 +2916,7 @@ void CSkillAction_HN_JUPITEL_THUNDER_STORM::Slot08(int level, CGameActor* source // OFFSET: 0x00784160 // FUNCTION: fn_08544 -void CSkillAction_HN_JUPITEL_THUNDER_STORM::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_JUPITEL_THUNDER_STORM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source && target) { static_cast(source)->LaunchEffect(12, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); g_effectMgr->Spawn(source->render.accountId, 2366, source->render.position.x, source->render.position.y, source->render.position.z, target->render.accountId, level, 0, 0); @@ -2925,19 +2925,19 @@ void CSkillAction_HN_JUPITEL_THUNDER_STORM::Slot11(int level, CGameActor* source // OFFSET: 0x007841F0 // FUNCTION: fn_08545 -int CSkillAction_HN_JACK_FROST_NOVA::Slot02() { +int CSkillAction_HN_JACK_FROST_NOVA::GetSkillAttackMotion() { return 59; } // OFFSET: 0x00784200 // FUNCTION: fn_08546 -bool CSkillAction_HN_JACK_FROST_NOVA::Slot03(int argument) { +bool CSkillAction_HN_JACK_FROST_NOVA::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x00784210 // FUNCTION: fn_08547 -void CSkillAction_HN_JACK_FROST_NOVA::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_JACK_FROST_NOVA::OnSkillCast(int level, CGameActor* source) { if (!source) { return; } @@ -2945,13 +2945,13 @@ void CSkillAction_HN_JACK_FROST_NOVA::Slot08(int level, CGameActor* source) { static_cast(source)->LaunchEffect(1449, level / 16); CEffect* effect = g_effectMgr->Spawn(source->render.accountId, g_serviceOptions.Get(229) ? 1543 : 1446, 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { - effect->Slot14(level); + effect->SetLifeTime(level); } } // OFFSET: 0x007842D0 // FUNCTION: fn_08548 -void CSkillAction_HN_JACK_FROST_NOVA::Slot10(int level, CGameActor* source, int argument3, int argument4, int argument5) { +void CSkillAction_HN_JACK_FROST_NOVA::OnGroundSkillCast(int level, CGameActor* source, int argument3, int argument4, int argument5) { CMode* mode = g_modeMgr.GetGameMode(); if (mode) { static_cast(g_modeMgr.GetGameMode())->LaunchDummyEffect(reinterpret_cast(&argument3), 0x5A8, level / 24, 0); @@ -2960,13 +2960,13 @@ void CSkillAction_HN_JACK_FROST_NOVA::Slot10(int level, CGameActor* source, int // OFFSET: 0x00784320 // FUNCTION: fn_08549 -int CSkillAction_HN_JACK_FROST_NOVA::Slot14() { +int CSkillAction_HN_JACK_FROST_NOVA::GetSkillScopeType() { return -2; } // OFFSET: 0x00784330 // FUNCTION: fn_08550 -void CSkillObjectAction_HN_JACK_FROST_NOVA::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_HN_JACK_FROST_NOVA::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { if (object) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("jack_frost_nova_start_bottom"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -2981,7 +2981,7 @@ void CSkillObjectAction_HN_JACK_FROST_NOVA::Slot00(int argument, CRenderObject* // OFFSET: 0x007847E0 // FUNCTION: fn_08551 -void CSkillObjectAction_HN_JACK_FROST_NOVA::Slot01(CRenderObject* object) { +void CSkillObjectAction_HN_JACK_FROST_NOVA::OnSkillObjectRemove(CRenderObject* object) { if (object) { const vector3d position = object->render.position; EffectLists* effects = g_effectMgr; @@ -2991,13 +2991,13 @@ void CSkillObjectAction_HN_JACK_FROST_NOVA::Slot01(CRenderObject* object) { // OFFSET: 0x00784950 // FUNCTION: fn_08552 -int CSkillAction_HN_HELLS_DRIVE::Slot02() { +int CSkillAction_HN_HELLS_DRIVE::GetSkillAttackMotion() { return 59; } // OFFSET: 0x00784960 // FUNCTION: fn_08553 -void CSkillAction_HN_HELLS_DRIVE::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_HELLS_DRIVE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(1709, level / 16); } @@ -3005,7 +3005,7 @@ void CSkillAction_HN_HELLS_DRIVE::Slot08(int level, CGameActor* source) { // OFFSET: 0x00784990 // FUNCTION: fn_08554 -void CSkillAction_HN_HELLS_DRIVE::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_HELLS_DRIVE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -3044,7 +3044,7 @@ void CSkillAction_HN_HELLS_DRIVE::Slot11(int level, CGameActor* source, CGameAct effect->position[0] = offsetX + source->render.position.x; effect->position[2] = offsetZ + source->render.position.z; effect->position[1] = source->render.position.y + 0.0f; - effect->Slot16(frame); + effect->SetDelay(frame); } if (CEffect* effect = g_effectMgr->Spawn( @@ -3054,26 +3054,26 @@ void CSkillAction_HN_HELLS_DRIVE::Slot11(int level, CGameActor* source, CGameAct effect->position[0] = offsetX + source->render.position.x; effect->position[2] = offsetZ + source->render.position.z; effect->position[1] = source->render.position.y + 0.0f; - effect->Slot16(frame); + effect->SetDelay(frame); } } } // OFFSET: 0x00784E40 // FUNCTION: fn_08555 -int CSkillAction_HN_GROUND_GRAVITATION::Slot02() { +int CSkillAction_HN_GROUND_GRAVITATION::GetSkillAttackMotion() { return 59; } // OFFSET: 0x00784E50 // FUNCTION: fn_08556 -bool CSkillAction_HN_GROUND_GRAVITATION::Slot03(int argument) { +bool CSkillAction_HN_GROUND_GRAVITATION::KeepSkillAttackMotion(int argument) { return true; } // OFFSET: 0x00784E60 // FUNCTION: fn_08557 -void CSkillAction_HN_GROUND_GRAVITATION::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_GROUND_GRAVITATION::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(9, level / 16); static_cast(source)->LaunchEffect(12, level / 16); @@ -3082,7 +3082,7 @@ void CSkillAction_HN_GROUND_GRAVITATION::Slot08(int level, CGameActor* source) { // OFFSET: 0x00784EA0 // FUNCTION: fn_08558 -void CSkillObjectAction_HN_GROUND_GRAVITATION::Slot00(int argument, CRenderObject* object, CGameActor* source) { +void CSkillObjectAction_HN_GROUND_GRAVITATION::OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { EffectLists* effects = g_effectMgr; effects->Spawn(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ground_gravitation_bottom_start"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); effects = g_effectMgr; @@ -3095,26 +3095,26 @@ void CSkillObjectAction_HN_GROUND_GRAVITATION::Slot00(int argument, CRenderObjec // OFFSET: 0x00785370 // FUNCTION: fn_08559 -void CSkillObjectAction_HN_GROUND_GRAVITATION::Slot01(CRenderObject* object) { +void CSkillObjectAction_HN_GROUND_GRAVITATION::OnSkillObjectRemove(CRenderObject* object) { EffectLists* effects = g_effectMgr; if (CEffect* effect = effects->Find(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ground_gravitation_bottom_loop"))) { - effect->Slot31(); + effect->EnableTimeLimit(); } effects = g_effectMgr; if (CEffect* effect = effects->Find(object->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("ground_gravitation_loop"))) { - effect->Slot31(); + effect->EnableTimeLimit(); } } // OFFSET: 0x007855C0 // FUNCTION: fn_08560 -int CSkillAction_HN_NAPALM_VULCAN_STRIKE::Slot02() { +int CSkillAction_HN_NAPALM_VULCAN_STRIKE::GetSkillAttackMotion() { return 59; } // OFFSET: 0x007855D0 // FUNCTION: fn_08561 -void CSkillAction_HN_NAPALM_VULCAN_STRIKE::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_NAPALM_VULCAN_STRIKE::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(58, level / 16); } @@ -3122,7 +3122,7 @@ void CSkillAction_HN_NAPALM_VULCAN_STRIKE::Slot08(int level, CGameActor* source) // OFFSET: 0x00785600 // FUNCTION: fn_08562 -void CSkillAction_HN_NAPALM_VULCAN_STRIKE::Slot15(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_NAPALM_VULCAN_STRIKE::OnSkillHit(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("napalm_vulcan_strike"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -3131,13 +3131,13 @@ void CSkillAction_HN_NAPALM_VULCAN_STRIKE::Slot15(int level, CGameActor* source, // OFFSET: 0x00785780 // FUNCTION: fn_08563 -int CSkillAction_HN_BREAKINGLIMIT::Slot02() { +int CSkillAction_HN_BREAKINGLIMIT::GetSkillAttackMotion() { return 58; } // OFFSET: 0x00785790 // FUNCTION: fn_08564 -void CSkillAction_HN_BREAKINGLIMIT::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_BREAKINGLIMIT::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2369, level / 16); } @@ -3145,7 +3145,7 @@ void CSkillAction_HN_BREAKINGLIMIT::Slot08(int level, CGameActor* source) { // OFFSET: 0x007857C0 // FUNCTION: fn_08565 -void CSkillAction_HN_BREAKINGLIMIT::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_BREAKINGLIMIT::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("breakinglimit"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -3154,7 +3154,7 @@ void CSkillAction_HN_BREAKINGLIMIT::Slot11(int level, CGameActor* source, CGameA // OFFSET: 0x00785930 // FUNCTION: fn_08566 -void CEfstAction_BREAKINGLIMIT::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_BREAKINGLIMIT::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("breakinglimit_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -3163,7 +3163,7 @@ void CEfstAction_BREAKINGLIMIT::Slot00(int efstId, int value, int argument3, int // OFFSET: 0x00785AB0 // FUNCTION: fn_08567 -void CEfstAction_BREAKINGLIMIT::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_BREAKINGLIMIT::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("breakinglimit_buff")); @@ -3172,19 +3172,19 @@ void CEfstAction_BREAKINGLIMIT::Slot01(int efstId, int argument2, int argument3, // OFFSET: 0x00785BE0 // FUNCTION: fn_08568 -void CEfstAction_BREAKINGLIMIT::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_BREAKINGLIMIT::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00785C00 // FUNCTION: fn_08569 -int CSkillAction_HN_RULEBREAK::Slot02() { +int CSkillAction_HN_RULEBREAK::GetSkillAttackMotion() { return 58; } // OFFSET: 0x00785C10 // FUNCTION: fn_08570 -void CSkillAction_HN_RULEBREAK::Slot08(int level, CGameActor* source) { +void CSkillAction_HN_RULEBREAK::OnSkillCast(int level, CGameActor* source) { if (source) { static_cast(source)->LaunchEffect(2369, level / 16); } @@ -3192,7 +3192,7 @@ void CSkillAction_HN_RULEBREAK::Slot08(int level, CGameActor* source) { // OFFSET: 0x00785C40 // FUNCTION: fn_08571 -void CSkillAction_HN_RULEBREAK::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_RULEBREAK::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rulebreak"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -3201,7 +3201,7 @@ void CSkillAction_HN_RULEBREAK::Slot11(int level, CGameActor* source, CGameActor // OFFSET: 0x00785DA0 // FUNCTION: fn_08572 -void CEfstAction_RULEBREAK::Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { +void CEfstAction_RULEBREAK::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { if (actor) { EffectLists* effects = g_effectMgr; effects->Spawn(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rulebreak_buff"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); @@ -3210,7 +3210,7 @@ void CEfstAction_RULEBREAK::Slot00(int efstId, int value, int argument3, int arg // OFFSET: 0x00785F10 // FUNCTION: fn_08573 -void CEfstAction_RULEBREAK::Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { +void CEfstAction_RULEBREAK::OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { if (actor) { EffectLists* effects = g_effectMgr; effects->Retire(actor->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rulebreak_buff")); @@ -3219,13 +3219,13 @@ void CEfstAction_RULEBREAK::Slot01(int efstId, int argument2, int argument3, int // OFFSET: 0x00786030 // FUNCTION: fn_08574 -void CEfstAction_RULEBREAK::Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { - this->Slot00(efstId, value, 0, 0, actor, false); +void CEfstAction_RULEBREAK::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + this->OnEfstBegin(efstId, value, 0, 0, actor, false); } // OFFSET: 0x00786050 // FUNCTION: fn_08575 -void CSkillAction_HN_OVERCOMING_CRISIS::Slot11(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_HN_OVERCOMING_CRISIS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("overcoming_crisis"), 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); diff --git a/Source/Contents/Skills/SkillInfo.h b/Source/Contents/Skills/SkillInfo.h index 7cee02e4c..48abacf94 100644 --- a/Source/Contents/Skills/SkillInfo.h +++ b/Source/Contents/Skills/SkillInfo.h @@ -23,73 +23,73 @@ struct EfstActionMessage { class CSkillAction { public: - virtual bool Slot00() { + virtual bool IsSupport() { return false; } - virtual int Slot01() { + virtual int GetSkillCastMotion() { return 8; } - virtual int Slot02() { + virtual int GetSkillAttackMotion() { return 7; } - virtual bool Slot03(int argument) { + virtual bool KeepSkillAttackMotion(int argument) { return false; } - virtual bool Slot04() { + virtual bool IsSkillWithoutMotion() { return false; } - virtual bool Slot05() { + virtual bool KeepSkillAttackSpeed() { return false; } - virtual bool Slot06() { + virtual bool SuppressSupportSkillArrow() { return false; } - virtual bool Slot07() { + virtual bool SuppressAttackSkillArrow() { return false; } - virtual void Slot08(int level, CGameActor* source) { + virtual void OnSkillCast(int level, CGameActor* source) { } - virtual void Slot09(int argument1, int argument2, int argument3) { + virtual void OnTargetSkillCast(int argument1, int argument2, int argument3) { } - virtual void Slot10(int level, CGameActor* source, int argument3, int argument4, int argument5) { + virtual void OnGroundSkillCast(int level, CGameActor* source, int argument3, int argument4, int argument5) { } - virtual void Slot11(int level, CGameActor* source, CGameActor* target) { + virtual void OnSkillEffect(int level, CGameActor* source, CGameActor* target) { } - virtual void Slot12(vector3d position, int argument2, int argument3) { + virtual void OnGroundSkillEffect(vector3d position, int argument2, int argument3) { } - virtual bool Slot13() { + virtual bool UseGroundSkillLastFrame() { return false; } - virtual int Slot14() { + virtual int GetSkillScopeType() { return 0; } - virtual void Slot15(int level, CGameActor* source, CGameActor* target) { + virtual void OnSkillHit(int level, CGameActor* source, CGameActor* target) { } - virtual void Slot16(int level, CGameActor* source, CGameActor* target) { + virtual void OnSkillDamage(int level, CGameActor* source, CGameActor* target) { } }; class CEfstAction { public: - virtual void Slot00(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { + virtual void OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { } - virtual void Slot01(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { + virtual void OnEfstEnd(int efstId, int argument2, int argument3, int argument4, CRenderObject* actor) { } - virtual void Slot02(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { + virtual void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { } - virtual EfstActionMessage Slot03() { + virtual EfstActionMessage GetEfstBeginMessage() { return {nullptr, 0xFFFF00}; } - virtual EfstActionMessage Slot04() { + virtual EfstActionMessage GetEfstEndMessage() { return {nullptr, 0xFF}; } }; class CSkillObjectAction { public: - virtual void Slot00(int argument, CRenderObject* object, CGameActor* source) { + virtual void OnSkillObjectCreate(int argument, CRenderObject* object, CGameActor* source) { } - virtual void Slot01(CRenderObject* object) { + virtual void OnSkillObjectRemove(CRenderObject* object) { } }; diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index ab696faea..09f980390 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -72,7 +72,7 @@ CHalluNPC::CHalluNPC(CGameActor* source) { this->SetUnknown0260(source->unknown_0260); this->SetActorJob(source->GetEffectiveJob(-1)); this->unknown_02CC = source->unknown_02CC; - this->SetUnknown03C4(source->Slot55()); + this->SetUnknown03C4(source->GetMonsterTransformJob()); this->render.position = source->render.position; this->render.unknown_005C = source->render.unknown_005C; this->render.unknown_0078 = source->render.unknown_0078; @@ -87,9 +87,9 @@ CHalluNPC::CHalluNPC(CGameActor* source) { this->render.isSingleColor = source->render.isSingleColor; this->render.unknown_007C = source->render.unknown_007C; this->render.unknown_0048 = 0; - this->stateFlags = source->Slot13(); - this->Slot18(source->GetEffectiveJob(-1), source->unknown_0260, 0); - this->guildId = source->Slot50(); + this->stateFlags = source->GetStateFlags(); + this->SetSprAct(source->GetEffectiveJob(-1), source->unknown_0260, 0); + this->guildId = source->GetGdid(); this->render.accountId = 0; this->unknown_0440 = 0.0f; this->unknown_0454 = 0; @@ -124,7 +124,7 @@ CHalluPlant::CHalluPlant() { this->render.unknown_007C = 0; this->render.unknown_0048 = 0; this->stateFlags = 0; - this->Slot18(this->GetEffectiveJob(-1), this->unknown_0260, 0); + this->SetSprAct(this->GetEffectiveJob(-1), this->unknown_0260, 0); this->guildId = 0; this->render.accountId = 0; this->unknown_0440 = 0; @@ -286,7 +286,7 @@ bool CSoundMaker::OnProcess() { // OFFSET: 0x00DA2AF0 // FUNCTION: fn_22378 -int CPc::Slot46() { +int CPc::GetBodyCostume() { return this->unknown_04D0; } @@ -356,25 +356,25 @@ void CHalluPlant::Render(int argument) { // OFFSET: 0x00DA2B40 // FUNCTION: fn_22380 -bool CPc::Slot58() { +bool CPc::IsArrowEffectSuppressed() { return this->unknown_04E0; } // OFFSET: 0x00DA2B50 // FUNCTION: fn_22381 -int CPc::Slot56() { +int CPc::GetMadogearType() { return this->unknown_04DC; } // OFFSET: 0x00DA2B60 // FUNCTION: fn_22382 -int CPc::Slot42() { +int CPc::GetPkState() { return this->unknown_04CC; } // OFFSET: 0x00DA2B70 // FUNCTION: fn_22383 -std::int64_t CPc::Slot35() { +std::int64_t CPc::GetWeapon() { return *reinterpret_cast(&this->weapon); } @@ -441,7 +441,7 @@ void CMasterChaser::ClearUnknown0138() { // OFFSET: 0x00DA3F50 // FUNCTION: fn_22408 -void CNpc::Slot16() { +void CNpc::RegisterPos() { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); int column; int row; @@ -460,7 +460,7 @@ void CNpc::Slot16() { // OFFSET: 0x00DA61C0 // FUNCTION: fn_22434 -void CNpc::Slot17() { +void CNpc::UnRegisterPos() { switch (this->GetEffectiveJob(-1)) { case 45: case 104: @@ -475,13 +475,13 @@ void CNpc::Slot17() { // OFFSET: 0x00DA5800 // FUNCTION: fn_22429 -void CPc::Slot59(bool value) { +void CPc::SetArrowEffectSuppressed(bool value) { this->unknown_04E0 = value; } // OFFSET: 0x00DA5810 // FUNCTION: fn_22430 -void CPc::Slot57(int value) { +void CPc::SetMadogearType(int value) { this->unknown_04DC = value; } @@ -510,7 +510,7 @@ bool CGndRiser::OnProcess() { alpha = -(frame * frame) / 25.0f; } - mode->scene->ground->Slot15(alpha, this->screenX, this->screenY); + mode->scene->ground->SetGndRiseAmount(alpha, this->screenX, this->screenY); } return true; @@ -733,7 +733,7 @@ void CNpc::SendMsg( break; } this->render.visible = IsVisibleJob(info->job); - this->Slot49(info->guildId, info->guildVersion); + this->SetGuildInfo(info->guildId, info->guildVersion); return; } @@ -902,7 +902,7 @@ void CSoundMaker::SendMsg( // OFFSET: 0x00DA5820 // FUNCTION: fn_22431 -void CNpc::Slot18(int job, int value, int) { +void CNpc::SetSprAct(int job, int value, int) { char name[64]; this->SetActorJob(job); this->SetUnknown0260(value); @@ -915,7 +915,7 @@ void CNpc::Slot18(int job, int value, int) { // OFFSET: 0x00DA58A0 // FUNCTION: fn_22432 -void CNpc::Slot21(int job) { +void CNpc::SetSprJob(int job) { char spriteName[128]; char actionName[128]; const char* spriteFormat; @@ -1180,8 +1180,8 @@ CHalluPC2::CHalluPC2(CPc* source) { this->SetUnknown0260(source->unknown_0260); this->SetActorJob(source->GetEffectiveJob(-1)); this->SetUnknown0404(source->GetUnknown0404()); - this->Slot47(source->unknown_02CC); - this->SetUnknown03C4(source->Slot55()); + this->SetRiding(source->unknown_02CC); + this->SetUnknown03C4(source->GetMonsterTransformJob()); this->render.position = source->render.position; this->render.unknown_005C = source->render.unknown_005C; this->render.unknown_0078 = source->render.unknown_0078; @@ -1197,12 +1197,12 @@ CHalluPC2::CHalluPC2(CPc* source) { this->render.unknown_007C = source->render.unknown_007C; this->render.unknown_0048 = 0; this->unknown_0444 = source->unknown_0444; - this->stateFlags = source->Slot13(); + this->stateFlags = source->GetStateFlags(); this->unknown_0478 = source->unknown_0478; this->LoadEquipSprites(source->GetEquipSpriteNames()); this->LoadEquipActions(source->GetEquipActionNames()); this->unknown_0418 = source->unknown_0418; - this->guildId = source->Slot50(); + this->guildId = source->GetGdid(); this->render.accountId = source->render.accountId; this->unknown_04F8 = 0.0f; this->unknown_050C = 0; @@ -1225,8 +1225,8 @@ CBlurPC::CBlurPC(CPc* source) { this->SetUnknown0260(source->unknown_0260); this->SetActorJob(source->GetEffectiveJob(-1)); this->SetUnknown0404(source->GetUnknown0404()); - this->Slot47(source->unknown_02CC); - this->SetUnknown03C4(source->Slot55()); + this->SetRiding(source->unknown_02CC); + this->SetUnknown03C4(source->GetMonsterTransformJob()); this->render.position = source->render.position; this->render.unknown_005C = source->render.unknown_005C; this->render.unknown_0078 = source->render.unknown_0078; @@ -1242,12 +1242,12 @@ CBlurPC::CBlurPC(CPc* source) { this->render.unknown_007C = source->render.unknown_007C; this->render.unknown_0048 = 0; this->unknown_0444 = source->unknown_0444; - this->stateFlags = source->Slot13(); + this->stateFlags = source->GetStateFlags(); this->unknown_0478 = source->unknown_0478; this->LoadEquipSprites(source->GetEquipSpriteNames()); this->LoadEquipActions(source->GetEquipActionNames()); this->unknown_0418 = source->unknown_0418; - this->guildId = source->Slot50(); + this->guildId = source->GetGdid(); this->render.accountId = source->render.accountId; this->unknown_04F8 = 0.0f; this->unknown_04FC = 0x10000000; @@ -1269,8 +1269,8 @@ CHalluPC::CHalluPC(CPc* source) { this->SetUnknown0260(source->unknown_0260); this->SetActorJob(source->GetEffectiveJob(-1)); this->SetUnknown0404(source->GetUnknown0404()); - this->Slot47(source->unknown_02CC); - this->SetUnknown03C4(source->Slot55()); + this->SetRiding(source->unknown_02CC); + this->SetUnknown03C4(source->GetMonsterTransformJob()); this->render.position = source->render.position; this->render.unknown_005C = source->render.unknown_005C; this->render.unknown_0078 = source->render.unknown_0078; @@ -1286,12 +1286,12 @@ CHalluPC::CHalluPC(CPc* source) { this->render.unknown_007C = source->render.unknown_007C; this->render.unknown_0048 = 0; this->unknown_0444 = source->unknown_0444; - this->stateFlags = source->Slot13(); + this->stateFlags = source->GetStateFlags(); this->unknown_0478 = source->unknown_0478; this->LoadEquipSprites(source->GetEquipSpriteNames()); this->LoadEquipActions(source->GetEquipActionNames()); this->unknown_0418 = source->unknown_0418; - this->guildId = source->Slot50(); + this->guildId = source->GetGdid(); this->render.accountId = source->render.accountId; this->unknown_04F8 = 0.0f; this->unknown_050C = 0; @@ -1299,7 +1299,7 @@ CHalluPC::CHalluPC(CPc* source) { this->render.unknown_0048 = source->render.unknown_0048; this->render.name = source->render.name; this->unknown_03E1 = true; - this->Slot44(source->Slot46(), 1); + this->SetBodyCostume(source->GetBodyCostume(), 1); this->unknown_049C = 0; this->unknown_0450 = 0; this->unknown_0454 = 0; @@ -1370,7 +1370,7 @@ bool CNpc::OnProcess() { case 111: this->ProcessDamageMessages(); this->UpdateGaugePositions(); - result = this->Slot14(); + result = this->ProcessState(); break; default: this->ProcessBodyState(); @@ -1380,7 +1380,7 @@ bool CNpc::OnProcess() { this->ModifyArgb(8, 8, 8, 8); } this->UpdateGaugePositions(); - result = this->Slot14(); + result = this->ProcessState(); break; } @@ -1586,7 +1586,7 @@ void CHalluPC::Render(int argument) { // OFFSET: 0x00DA59B0 // FUNCTION: fn_22433 -void CNpc::Slot15(int state, int) { +void CNpc::SetState(int state, int) { if (state == -1) { return; } @@ -1631,7 +1631,7 @@ void CNpc::Slot15(int state, int) { if (g_session.IsAllyActor(this->render.accountId, this->GetEffectiveJob(-1)) == 1 && this->GetEffectiveJob(-1) != 565 && !isDisguised) { this->SetAction(0, 4, 0); - this->Slot16(); + this->RegisterPos(); break; } @@ -1674,7 +1674,7 @@ void CNpc::Slot15(int state, int) { } this->unknown_02C8 = 0; this->render.isMotionFinished = false; - this->Slot16(); + this->RegisterPos(); } else { if (this->render.unknown_0070 != 0) { this->unknown_027C = timeGetTime(); @@ -1689,7 +1689,7 @@ void CNpc::Slot15(int state, int) { g_session.unknown_56A0 = 0; g_session.unknown_56A4 = 0; } - this->Slot16(); + this->RegisterPos(); } break; case 1: @@ -1701,7 +1701,7 @@ void CNpc::Slot15(int state, int) { } else { this->SetAction(8, 4, 0); } - this->Slot17(); + this->UnRegisterPos(); break; case 2: if (this->bodyState != 1 && this->bodyState != 2) { @@ -1720,8 +1720,8 @@ void CNpc::Slot15(int state, int) { } else { this->SetAction(16, 4, 1); } - this->unknown_0378 = static_cast(this->Slot37()); - this->Slot16(); + this->unknown_0378 = static_cast(this->GetAttackMotion()); + this->RegisterPos(); this->LaunchAttackProjectile(this->hitTargetAid, this->render.speed * this->unknown_0378); break; case 3: @@ -1738,10 +1738,10 @@ void CNpc::Slot15(int state, int) { this->render.unknown_00A4Bytes[1] = 0; if (this->GetEffectiveJob(-1) >= 6017 && this->GetEffectiveJob(-1) <= 6046) { this->SetAction(64, 4, 1); - this->Slot17(); + this->UnRegisterPos(); } else { this->SetAction(32, 8, 1); - this->Slot17(); + this->UnRegisterPos(); } break; case 4: @@ -1753,11 +1753,11 @@ void CNpc::Slot15(int state, int) { break; } if (this->render.previousAnimation >= 40) { - this->Slot08(); + this->ProcessMotion(); return; } this->SetAction(24, 4, 1); - this->Slot16(); + this->RegisterPos(); break; case 7: switch (this->unknown_0314) { diff --git a/Source/Contents/SpriteLayerDrawing.cpp b/Source/Contents/SpriteLayerDrawing.cpp index e73100c1d..dfe949283 100644 --- a/Source/Contents/SpriteLayerDrawing.cpp +++ b/Source/Contents/SpriteLayerDrawing.cpp @@ -260,7 +260,7 @@ void SpriteLayerRenderer::DrawLayerOutlines(std::uint32_t color) { SpriteQuad quad; int box[4]; std::uint32_t quadColor; - if (!this->pc->Slot09( + if (!this->pc->PrepareSprite( layer, this->unknown_0060, this->distanceScale, *resolved.cell, this->x, this->y, &this->position.x, this->scale, &bottomRhw, &topRhw, resolved.image, &quad, box, &quadColor, itemOffset.first, itemOffset.second, 0 )) { @@ -337,10 +337,10 @@ void SpriteLayerRenderer::DrawRobe(bool drawOnTop) { } std::string sprName = g_session.GetRobeSprName( - this->pc->GetEffectiveJob(-1), this->pc->unknown_04D4, this->pc->unknown_0260, this->pc->unknown_049C, this->pc->unknown_02CC, this->pc->Slot46() + this->pc->GetEffectiveJob(-1), this->pc->unknown_04D4, this->pc->unknown_0260, this->pc->unknown_049C, this->pc->unknown_02CC, this->pc->GetBodyCostume() ); std::string actName = g_session.GetRobeActName( - this->pc->GetEffectiveJob(-1), this->pc->unknown_04D4, this->pc->unknown_0260, this->pc->unknown_049C, this->pc->unknown_02CC, this->pc->Slot46() + this->pc->GetEffectiveJob(-1), this->pc->unknown_04D4, this->pc->unknown_0260, this->pc->unknown_049C, this->pc->unknown_02CC, this->pc->GetBodyCostume() ); if (!ResourceMgr::Instance().Exists(sprName.c_str()) || !ResourceMgr::Instance().Exists(actName.c_str())) { return; @@ -378,7 +378,7 @@ void SpriteLayerRenderer::DrawRobe(bool drawOnTop) { SpriteQuad quad; int box[4]; std::uint32_t quadColor; - this->pc->Slot09( + this->pc->PrepareSprite( this->unknown_0060, this->unknown_0060, this->distanceScale, cell, this->x, this->y, &this->position.x, this->scale, &bottomRhw, &topRhw, image, &quad, box, &quadColor, 0, 0, !drawOnTop ); @@ -489,7 +489,7 @@ SpriteLayerCell SpriteLayerRenderer::ResolveCell( if (IsIgnoredRidingState(this->layerViews[layer], this->pc->GetEffectiveJob(-1), this->pc->render.animation, this->pc->unknown_02CC) == true) { offsetY = SpriteRidingOffset( bodyFrame, this->pc->render.previousAnimation, this->pc->render.curMotion, this->pc->GetEffectiveJob(-1), this->pc->unknown_0260, - this->pc->Slot46() + this->pc->GetBodyCostume() ) + anchorY; } else { @@ -626,7 +626,7 @@ void SpriteLayerRenderer::DrawLayer( SpriteQuad quad; int box[4]; std::uint32_t quadColor; - if (!this->pc->Slot09( + if (!this->pc->PrepareSprite( index, this->unknown_0060, this->distanceScale, *resolved.cell, this->x, this->y, &this->position.x, this->scale, &bottomRhw, &topRhw, resolved.image, &quad, box, &quadColor, offsetX, offsetY, 0 )) { diff --git a/Source/Contents/World/WorldModelView.cpp b/Source/Contents/World/WorldModelView.cpp index a81fd4675..eaf9dd790 100644 --- a/Source/Contents/World/WorldModelView.cpp +++ b/Source/Contents/World/WorldModelView.cpp @@ -276,5 +276,5 @@ void CView::Render() { this->spatial.inside.clear(); this->spatial.clipped.clear(); - this->scene->ground->Slot04(reinterpret_cast(matrix)); + this->scene->ground->RenderLod(reinterpret_cast(matrix)); } diff --git a/Source/Contents/World/WorldObjects.cpp b/Source/Contents/World/WorldObjects.cpp index 855c344ef..8203c8601 100644 --- a/Source/Contents/World/WorldObjects.cpp +++ b/Source/Contents/World/WorldObjects.cpp @@ -349,7 +349,7 @@ CItem* CWorld::GetItemByAID(std::uint32_t aid) const { CRenderObject* CWorld::GetActorByGID(int gid) const { auto it = std::find_if(this->actors.begin(), this->actors.end(), [gid](CRenderObject* object) { CGameActor* actor = static_cast(object); - return !actor->unknown_0314 && gid == actor->Slot42(); + return !actor->unknown_0314 && gid == actor->GetPkState(); }); if (it != this->actors.end()) { @@ -480,9 +480,9 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) { if (((g_session.IsNpcJob(actor->GetEffectiveJob(-1)) || g_session.IsMonsterActor(actor)) && card.unknown_0094) || (g_session.IsAllyActor(actor->render.accountId, actor->GetEffectiveJob(-1)) && card.unknown_0094)) { this->nameBalloon->SetIcon(FormatOwnedString("유저인터페이스\\group\\group_%d.bmp", card.unknown_0094).c_str(), 0); - } else if (actor->Slot50() && showEmblem) { + } else if (actor->GetGdid() && showEmblem) { const unsigned char framedEmblem = g_serviceOptions.Get(0xF3); - std::string emblem = g_guildMgr->GetEmblemFilename(actor->Slot50()); + std::string emblem = g_guildMgr->GetEmblemFilename(actor->GetGdid()); this->nameBalloon->SetIcon(emblem.c_str(), static_cast(g_modeMgr.GetGameMode())->scene->unknown_004C == 1 && framedEmblem ? 1 : 0); } else if (reinterpret_cast(this->scene->player) == actor) { char path[256]; @@ -560,7 +560,7 @@ void CGameMode::ShowGuildEmblem(CGameActor* actor, int guildId, int unused) { } if (!IsAdminAccount(g_session.m_aid)) { - if (StateFlag02(actor->Slot13()) || StateFlag01(actor->Slot13()) || StateFlag06(actor->Slot13())) { + if (StateFlag02(actor->GetStateFlags()) || StateFlag01(actor->GetStateFlags()) || StateFlag06(actor->GetStateFlags())) { return; } } @@ -770,12 +770,12 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) { } CPlayer* player = static_cast(g_modeMgr.GetGameMode())->scene->player; - if (!StateFlag01(player->Slot13()) && !StateFlag02(player->Slot13())) { + if (!StateFlag01(player->GetStateFlags()) && !StateFlag02(player->GetStateFlags())) { this->actorMenuIds.push_back(0x2A); sprintf(line, LookupMessage(0x550), name.c_str()); menu->SendMsg(nullptr, 0x1F, reinterpret_cast(line), 0, 0, 0); } - if (!StateFlag01(player->Slot13()) && !StateFlag02(player->Slot13())) { + if (!StateFlag01(player->GetStateFlags()) && !StateFlag02(player->GetStateFlags())) { this->actorMenuIds.push_back(4); sprintf(line, LookupMessage(0x187), name.c_str()); menu->SendMsg(nullptr, 0x1F, reinterpret_cast(line), 0, 0, 0); @@ -797,7 +797,7 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) { if (g_guildInfo.m_guildId != 0) { CGameActor* member = static_cast(this->scene->GetGameActorByAID(pick->accountId)); - const std::uint32_t guildId = member != nullptr ? member->Slot50() : 0; + const std::uint32_t guildId = member != nullptr ? member->GetGdid() : 0; if (g_guildInfo.unknown_00AC != 0 && guildId == 0) { this->actorMenuIds.push_back(0x16); sprintf(line, LookupMessage(0x17E), name.c_str()); @@ -856,7 +856,7 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) { menu->SendMsg(nullptr, 0x48, 0, 0, 0, 0); if (CPc* pc = dynamic_cast(static_cast(this->scene->GetGameActorByAID(pick->accountId)))) { - const std::string code = std::string("[C-Code] : ") + ShortcutFilename(pc->Slot42()); + const std::string code = std::string("[C-Code] : ") + ShortcutFilename(pc->GetPkState()); this->actorMenuIds.push_back(0x39); menu->SendMsg(nullptr, 0x1F, reinterpret_cast(code.c_str()), 0, 0, 0); } diff --git a/Source/Contents/World/WorldProximity.cpp b/Source/Contents/World/WorldProximity.cpp index 23c9912b4..3c2fc4305 100644 --- a/Source/Contents/World/WorldProximity.cpp +++ b/Source/Contents/World/WorldProximity.cpp @@ -103,7 +103,7 @@ bool CWorld::IsGuildMaster(std::uint32_t aid) { return false; } - return gameActor->Slot42() == static_cast(g_guildInfo.unknown_00D0); + return gameActor->GetPkState() == static_cast(g_guildInfo.unknown_00D0); } } @@ -113,7 +113,7 @@ bool CWorld::IsGuildMaster(std::uint32_t aid) { // OFFSET: 0x00AC8750 // FUNCTION: fn_17677 bool CWorld::IsExistGuildMasterNearby(const float& x, const float& z) { - if (!this->player || this->player->Slot50() < 1) { + if (!this->player || this->player->GetGdid() < 1) { return false; } @@ -237,7 +237,7 @@ bool WorldProximityGuildMasterCallback::Invoke(const std::uint32_t& aidRef) { return false; } - if (static_cast(g_guildInfo.unknown_00D0) != gameActor->Slot42()) { + if (static_cast(g_guildInfo.unknown_00D0) != gameActor->GetPkState()) { return false; } @@ -265,7 +265,7 @@ bool WorldProximityRangeCallback::Invoke() { // OFFSET: 0x00AC9D50 // FUNCTION: fn_17686 __declspec(noinline) void CWorld::PcApproachToPlayer(std::uint32_t aid, const CellFloatPos& pos) { - if (this->player && this->player->Slot50() > 0 && this->IsGuildMaster(aid)) { + if (this->player && this->player->GetGdid() > 0 && this->IsGuildMaster(aid)) { auto isNearby = [](const CellFloatPos& cell, const CellFloatPos& player, int range) { return std::fabs(cell.x - player.x) <= static_cast(range) && std::fabs(cell.z - player.z) <= static_cast(range); }; diff --git a/Source/EntityInit.cpp b/Source/EntityInit.cpp index 83f2043ef..ff10bf064 100644 --- a/Source/EntityInit.cpp +++ b/Source/EntityInit.cpp @@ -149,11 +149,11 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->speed = *reinterpret_cast(actor->unknown_0170 + 4); entry->bodyState = static_cast(actor->bodyState); entry->healthState = static_cast(actor->unknown_02C4); - entry->effectState = actor->Slot13(); + entry->effectState = actor->GetStateFlags(); entry->job = static_cast(actor->GetEffectiveJob(-1)); entry->head = *reinterpret_cast(actor->unknown_029C); - entry->guildId = actor->Slot50(); - entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->Slot50())); + entry->guildId = actor->GetGdid(); + entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->GetGdid())); entry->isPkModeOn = actor->unknown_02C8 != 0; entry->sex = static_cast(actor->unknown_0260); entry->xSize = static_cast(actor->unknown_0294); @@ -173,8 +173,8 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->accessory3 = static_cast(pc->unknown_0458); entry->headPalette = static_cast(pc->unknown_0444); entry->robe = static_cast(pc->unknown_049C); - entry->characterId = pc->Slot42(); - entry->body = static_cast(pc->Slot46()); + entry->characterId = pc->GetPkState(); + entry->body = static_cast(pc->GetBodyCostume()); } } else { packet.resize(sizeof(ActorStandEntryPacket)); @@ -203,11 +203,11 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->speed = *reinterpret_cast(actor->unknown_0170 + 4); entry->bodyState = static_cast(actor->bodyState); entry->healthState = static_cast(actor->unknown_02C4); - entry->effectState = actor->Slot13(); + entry->effectState = actor->GetStateFlags(); entry->job = static_cast(actor->GetEffectiveJob(-1)); entry->head = *reinterpret_cast(actor->unknown_029C); - entry->guildId = actor->Slot50(); - entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->Slot50())); + entry->guildId = actor->GetGdid(); + entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->GetGdid())); entry->isPkModeOn = actor->unknown_02C8 != 0; entry->sex = static_cast(actor->unknown_0260); entry->xSize = static_cast(actor->unknown_0294); @@ -215,7 +215,7 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->level = actor->unknown_0210; entry->font = static_cast(actor->render.unknown_00FC); entry->bodyPalette = static_cast(actor->render.unknown_0048); - entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->Slot50())); + entry->emblemVersion = static_cast(g_guildMgr->GetEmblemVersion(actor->GetGdid())); if (actor->unknown_0314 == 0) { CPc* pc = static_cast(actor); @@ -228,8 +228,8 @@ std::vector CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1 entry->accessory3 = static_cast(pc->unknown_0458); entry->headPalette = static_cast(pc->unknown_0444); entry->robe = static_cast(pc->unknown_049C); - entry->characterId = pc->Slot42(); - entry->body = static_cast(pc->Slot46()); + entry->characterId = pc->GetPkState(); + entry->body = static_cast(pc->GetBodyCostume()); } } diff --git a/Source/Render/Primitives/ScreenLine.cpp b/Source/Render/Primitives/ScreenLine.cpp index fbf628dec..c3a115964 100644 --- a/Source/Render/Primitives/ScreenLine.cpp +++ b/Source/Render/Primitives/ScreenLine.cpp @@ -140,7 +140,7 @@ void UIRoMapWnd::DrawRecordAreas() { // OFFSET: 0x009181F0 // FUNCTION: fn_12592 -void UINewChatWnd::Slot43() { +void UINewChatWnd::DrawTransBox() { int x = 3; int y = 0; this->ToScreen(x, y); @@ -157,7 +157,7 @@ void UINewChatWnd::Slot43() { // OFFSET: 0x00918300 // FUNCTION: fn_12593 -void UISubChatHisWnd::Slot43() { +void UISubChatHisWnd::DrawTransBox() { int x = 0; int y = 0; this->ToScreen(x, y); diff --git a/Source/Resource/EmblemResource.cpp b/Source/Resource/EmblemResource.cpp index 8006941cf..bdc24d984 100644 --- a/Source/Resource/EmblemResource.cpp +++ b/Source/Resource/EmblemResource.cpp @@ -52,8 +52,8 @@ void CEmblemRes::Unload() { // OFFSET: 0x0074CD10 // FUNCTION: fn_07883 -void CEmblemRes::Slot02() { - this->gif.Slot02(); +void CEmblemRes::OnProcess() { + this->gif.OnProcess(); } // OFFSET: 0x0074CD20 diff --git a/Source/Resource/EmblemResource.h b/Source/Resource/EmblemResource.h index e3f5f0fad..86b7b6966 100644 --- a/Source/Resource/EmblemResource.h +++ b/Source/Resource/EmblemResource.h @@ -9,7 +9,7 @@ public: CEmblemRes(); CEmblemRes(const char* extension, const char* prefix); ~CEmblemRes() override; - void Slot02() override; + void OnProcess() override; bool IsTransient() override; CEmblemRes* Create() override; bool Load(const char* name) override; diff --git a/Source/Resource/GifResource.cpp b/Source/Resource/GifResource.cpp index 066af870f..fbe1b487f 100644 --- a/Source/Resource/GifResource.cpp +++ b/Source/Resource/GifResource.cpp @@ -179,7 +179,7 @@ bool CGifRes::AdvanceFrame() { // OFFSET: 0x00749D20 // FUNCTION: fn_07856 -void CGifRes::Slot02() { +void CGifRes::OnProcess() { this->frameChanged = this->AdvanceFrame(); } diff --git a/Source/Resource/GifResource.h b/Source/Resource/GifResource.h index a5b9306f8..f874739af 100644 --- a/Source/Resource/GifResource.h +++ b/Source/Resource/GifResource.h @@ -15,7 +15,7 @@ public: CGifRes(); CGifRes(const char* extension, const char* prefix); ~CGifRes() override; - void Slot02() override; + void OnProcess() override; bool IsTransient() override; CGifRes* Create() override; bool Load(const char* name) override; diff --git a/Source/Resource/Resource.cpp b/Source/Resource/Resource.cpp index effa6c523..cb50a96c6 100644 --- a/Source/Resource/Resource.cpp +++ b/Source/Resource/Resource.cpp @@ -28,13 +28,13 @@ CRes::~CRes() { // OFFSET: 0x00745260 // FUNCTION: fn_07756 -bool CRes::Slot01(int, int, int) { +bool CRes::LoadFromBuffer(int, int, int) { return false; } // OFFSET: 0x00745270 // FUNCTION: fn_07757 -void CRes::Slot02() { +void CRes::OnProcess() { } // OFFSET: 0x00745280 diff --git a/Source/Resource/Resource.h b/Source/Resource/Resource.h index 3e5c21efe..18a3cffc0 100644 --- a/Source/Resource/Resource.h +++ b/Source/Resource/Resource.h @@ -20,8 +20,8 @@ class CRes { public: CRes(); virtual ~CRes(); - virtual bool Slot01(int argument1, int argument2, int argument3); - virtual void Slot02(); + virtual bool LoadFromBuffer(int argument1, int argument2, int argument3); + virtual void OnProcess(); virtual bool IsTransient(); virtual CRes* Create() = 0; virtual bool Load(const char* name) = 0; diff --git a/Source/Resource/ResourceTransient.cpp b/Source/Resource/ResourceTransient.cpp index c5f52b490..58ae52df4 100644 --- a/Source/Resource/ResourceTransient.cpp +++ b/Source/Resource/ResourceTransient.cpp @@ -6,6 +6,6 @@ void ResourceMgr::UpdateTransient() { const auto end = this->m_transient.end(); for (auto it = this->m_transient.begin(); it != end; ++it) { - (*it)->Slot02(); + (*it)->OnProcess(); } } diff --git a/Source/Script/LuaScript.cpp b/Source/Script/LuaScript.cpp index 84fa45761..60982539f 100644 --- a/Source/Script/LuaScript.cpp +++ b/Source/Script/LuaScript.cpp @@ -210,7 +210,7 @@ int SetEmitterInfo(lua_State* state) { const int key = static_cast(luaL_checknumber(state, 2)); switch (key) { case 0: - effect->Slot07(); + effect->ResetParticles(); break; case 1: case 2: @@ -332,7 +332,7 @@ int SetMagicFloorInfo(lua_State* state) { const int key = static_cast(value); switch (key) { case 0: - effect->Slot07(); + effect->ResetParticles(); break; case 16: *reinterpret_cast(&effect->unknown_003C[8]) = static_cast(luaL_checknumber(state, 3)); @@ -393,7 +393,7 @@ int SetEvilsPawInfo(lua_State* state) { switch (static_cast(key)) { case 0: - effect->Slot07(); + effect->ResetParticles(); break; case 8: effect->size = static_cast(static_cast(luaL_checknumber(state, 3))); @@ -429,7 +429,7 @@ int SetOtherEffectInfo(lua_State* state) { const int key = static_cast(luaL_checknumber(state, 3)); switch (key) { case 0: - effect->Slot07(); + effect->ResetParticles(); break; case 16: *reinterpret_cast(&effect->unknown_003C[8]) = static_cast(luaL_checknumber(state, 4)); @@ -489,7 +489,7 @@ int SetAnimatedEmitterInfo(lua_State* state) { const int key = static_cast(luaL_checknumber(state, 2)); switch (key) { case 0: - effect->Slot07(); + effect->ResetParticles(); break; case 1: case 2: @@ -589,18 +589,18 @@ int SetEZ2STRInfo(lua_State* state) { switch (static_cast(key)) { case 47: { std::string name = luaL_checkstring(state, 3); - effect->Slot20(reinterpret_cast(name.c_str())); + effect->SetResource(reinterpret_cast(name.c_str())); break; } case 48: - effect->Slot21(static_cast(luaL_checknumber(state, 3))); + effect->SetFlags(static_cast(luaL_checknumber(state, 3))); break; case 49: - effect->Slot22(static_cast(luaL_checknumber(state, 3))); + effect->SetScale(static_cast(luaL_checknumber(state, 3))); break; case 50: { const float alpha = static_cast(luaL_checknumber(state, 3)); - effect->Slot23(alpha >= 1.0f ? 1.0f : (std::max)(0.0f, alpha)); + effect->SetAlpha(alpha >= 1.0f ? 1.0f : (std::max)(0.0f, alpha)); break; } } @@ -621,7 +621,7 @@ int SetWindEffectInfo(lua_State* state) { switch (static_cast(key)) { case 0: - effect->Slot07(); + effect->ResetParticles(); break; case 4: { const float x = static_cast(luaL_checknumber(state, 3)); diff --git a/Source/UI/Acceptance/UIAutoMessageWnd.h b/Source/UI/Acceptance/UIAutoMessageWnd.h index e6ebc7657..983f4f8dc 100644 --- a/Source/UI/Acceptance/UIAutoMessageWnd.h +++ b/Source/UI/Acceptance/UIAutoMessageWnd.h @@ -10,7 +10,7 @@ class UIEditCtrl; class UIAutoMessageWnd : public UIFrameWnd { public: UIAutoMessageWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 73594f931..680d8bf08 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -219,8 +219,8 @@ void UIChatHisBox::Configure(int x, int y, int width, int height, unsigned char) this->transparent = 1; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x008C73C0 @@ -318,7 +318,7 @@ UIChooseWarpWnd::UIChooseWarpWnd() // OFFSET: 0x008DD290 // FUNCTION: fn_12162 -void UIChooseSellBuyWnd::Slot15(int width, int height) { +void UIChooseSellBuyWnd::OnCreate(int width, int height) { const std::string buttonPrefix("유저인터페이스\\"); const char* names[3][3] = {{"btn_buy", "btn_buy_a", "btn_buy_b"}, {"btn_sell", "btn_sell_a", "btn_sell_b"}, {"btn_cancel", "btn_cancel_a", "btn_cancel_b"}}; int ids[3] = {224, 223, 185}; @@ -348,7 +348,7 @@ void UIChooseSellBuyWnd::Slot15(int width, int height) { // OFFSET: 0x008DD9A0 // FUNCTION: fn_12163 -void UIChooseWarpWnd::Slot15(int width, int height) { +void UIChooseWarpWnd::OnCreate(int width, int height) { auto* title = new UIStaticText(); title->SetSize(this->geometry.width - 30, 15); title->Move(12, 9); @@ -393,7 +393,7 @@ void UIChooseWarpWnd::Slot15(int width, int height) { // OFFSET: 0x008DE0E0 // FUNCTION: fn_12164 -void UIChooseWnd::Slot15(int width, int height) { +void UIChooseWnd::OnCreate(int width, int height) { this->m_list = new UIListBox(); int listHeight = height - 55; if (listHeight < 30) { @@ -432,7 +432,7 @@ void UIChooseWnd::Slot15(int width, int height) { // OFFSET: 0x008DE520 // FUNCTION: fn_12169 -void UIDisconnectedServerMsgWnd::Slot15(int width, int height) { +void UIDisconnectedServerMsgWnd::OnCreate(int width, int height) { auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\btn_ok.bmp", 0, 0); button->SetBitmap("유저인터페이스\\btn_ok_a.bmp", 1, 0); @@ -455,7 +455,7 @@ void UIDisconnectedServerMsgWnd::Slot15(int width, int height) { // OFFSET: 0x008DE6D0 // FUNCTION: fn_12170 -void UIEmailAddressWnd::Slot15(int, int) { +void UIEmailAddressWnd::OnCreate(int, int) { g_modeMgr.gameMode->SendMsg(10013, 0, 0, 0, 0); this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(this->geometry.width - 77, 16); @@ -756,7 +756,7 @@ static __forceinline UIBitmapButton* AddNumberedButtonInline(UIFrameWnd* frame, // OFFSET: 0x008E3340 // FUNCTION: fn_12182 -void UIMinimapZoomWnd::Slot15(int, int) { +void UIMinimapZoomWnd::OnCreate(int, int) { const int ys[5] = {128, 128, 128, 128, 128}; const int xs[5] = {1, this->geometry.width - 55, this->geometry.width - 41, this->geometry.width - 27, this->geometry.width - 13}; const int ids[5] = {452, 216, 217, 189, 454}; @@ -1549,8 +1549,8 @@ void UInCash_CallWnd::Paint() { // OFFSET: 0x008F32D0 // FUNCTION: fn_12264 -void UIItemIdentifyWnd::Slot26(int x, int y) { - this->Slot25(x, y); +void UIItemIdentifyWnd::OnLBtnDblClk(int x, int y) { + this->OnLBtnDown(x, y); this->SendMsg(nullptr, 6, 184, 0, 0, 0); } @@ -1659,7 +1659,7 @@ void UIStatusWnd::Paint() { // OFFSET: 0x008F3300 // FUNCTION: fn_12265 -void UIStatusWnd::Slot26(int, int y) { +void UIStatusWnd::OnLBtnDblClk(int, int y) { if (y < 17) { this->SendMsg(this, 6, 202, 0, 0, 0); } @@ -1667,7 +1667,7 @@ void UIStatusWnd::Slot26(int, int y) { // OFFSET: 0x008F3330 // FUNCTION: fn_12266 -void UIWhisperWnd::Slot26(int, int y) { +void UIWhisperWnd::OnLBtnDblClk(int, int y) { if (y >= 17 || this->m_code.size() == 0) { return; } @@ -1688,27 +1688,27 @@ void UIWhisperWnd::Slot26(int, int y) { // OFFSET: 0x008F3630 // FUNCTION: fn_12268 -void UIBookWnd::Slot25(int x, int y) { +void UIBookWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x008F3650 // FUNCTION: fn_12269 -void UICombinedCardItemCollection_ComparisonWnd::Slot25(int, int) { +void UICombinedCardItemCollection_ComparisonWnd::OnLBtnDown(int, int) { } // OFFSET: 0x008F38D0 // FUNCTION: fn_12272 -void UIItemCollection_ComparisonWnd::Slot25(int, int) { +void UIItemCollection_ComparisonWnd::OnLBtnDown(int, int) { } // OFFSET: 0x008F38E0 // FUNCTION: fn_12273 -void UIItemIdentifyWnd::Slot25(int x, int y) { +void UIItemIdentifyWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); return; } @@ -1743,20 +1743,20 @@ void UIItemIdentifyWnd::Slot25(int x, int y) { // OFFSET: 0x008F39B0 // FUNCTION: fn_12274 -void UIMinimapZoomWnd::Slot25(int, int) { +void UIMinimapZoomWnd::OnLBtnDown(int, int) { } // OFFSET: 0x008F39C0 // FUNCTION: fn_12275 -void UIPartySettingWnd::Slot25(int x, int y) { +void UIPartySettingWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x008F39E0 // FUNCTION: fn_12276 -void UIPetTamingDeceiveWnd::Slot25(int, int) { +void UIPetTamingDeceiveWnd::OnLBtnDown(int, int) { if (g_replayAnimationScaling != 0 || this->m_started != 0) { return; } @@ -1806,9 +1806,9 @@ void UIPetTamingDeceiveWnd::Paint() { // OFFSET: 0x008F3A40 // FUNCTION: fn_12277 -void UISelectCartWnd::Slot25(int x, int y) { +void UISelectCartWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } @@ -1863,12 +1863,12 @@ void UISelectCartWnd::AddCart(int index, int type) { // OFFSET: 0x008F3860 // FUNCTION: fn_12271 -void UIItemCollectionWnd::Slot25(int x, int y) { +void UIItemCollectionWnd::OnLBtnDown(int x, int y) { if (x <= 60 || y >= 17) { return; } - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); if (this->m_kind == 12) { UIWindow* comparison = g_windowMgr.unknown_0220; if (!comparison) { @@ -1893,21 +1893,21 @@ void UIItemCollectionWnd::Slot25(int x, int y) { // OFFSET: 0x008F3A60 // FUNCTION: fn_12278 -void UIStatusWnd::Slot25(int x, int y) { +void UIStatusWnd::OnLBtnDown(int x, int y) { if (y < this->m_titleHeight) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x008F3BA0 // FUNCTION: fn_12281 -void UICombinedCardItemCollection_ComparisonWnd::Slot31(int, int) { +void UICombinedCardItemCollection_ComparisonWnd::OnLBtnUp(int, int) { } // OFFSET: 0x008F3B70 // FUNCTION: fn_12280 -void UICombinedCardItemCollectionWnd::Slot31(int x, int y) { - this->UIFrameWnd::Slot31(x, y); +void UICombinedCardItemCollectionWnd::OnLBtnUp(int x, int y) { + this->UIFrameWnd::OnLBtnUp(x, y); if (UIWindow* comparison = g_windowMgr.unknown_0224) { const int targetAlpha = this->geometry.targetAlpha; const int alphaStart = this->geometry.alphaStart; @@ -1918,8 +1918,8 @@ void UICombinedCardItemCollectionWnd::Slot31(int x, int y) { // OFFSET: 0x008F3BB0 // FUNCTION: fn_12282 -void UIEquipWnd::Slot31(int x, int y) { - this->UIFrameWnd::Slot31(x, y); +void UIEquipWnd::OnLBtnUp(int x, int y) { + this->UIFrameWnd::OnLBtnUp(x, y); if (this->m_page != 3) { return; @@ -1939,8 +1939,8 @@ void UIEquipWnd::Slot31(int x, int y) { // OFFSET: 0x008F3C20 // FUNCTION: fn_12283 -void UIItemCollectionWnd::Slot31(int x, int y) { - this->UIFrameWnd::Slot31(x, y); +void UIItemCollectionWnd::OnLBtnUp(int x, int y) { + this->UIFrameWnd::OnLBtnUp(x, y); if (UIWindow* comparison = g_windowMgr.unknown_0220) { const int targetAlpha = this->geometry.targetAlpha; const int alphaStart = this->geometry.alphaStart; @@ -1951,12 +1951,12 @@ void UIItemCollectionWnd::Slot31(int x, int y) { // OFFSET: 0x008F3C50 // FUNCTION: fn_12284 -void UIItemCollection_ComparisonWnd::Slot31(int, int) { +void UIItemCollection_ComparisonWnd::OnLBtnUp(int, int) { } // OFFSET: 0x008F3C60 // FUNCTION: fn_12285 -void UIMenuWnd::Slot31(int x, int y) { +void UIMenuWnd::OnLBtnUp(int x, int y) { const int index = this->ItemAt(x, y); this->m_selected = index; if (index == -1 || this->m_items[index] == g_menuSeparator) { @@ -1987,7 +1987,7 @@ void UIMenuWnd::Slot31(int x, int y) { // OFFSET: 0x008F4520 // FUNCTION: fn_12288 -void UIItemCollectionWnd::Slot28(int x, int y) { +void UIItemCollectionWnd::OnMouseHover(int x, int y) { int slotX; int slotY; const int index = this->CardSlotAt(x, y, &slotX, &slotY); @@ -2014,7 +2014,7 @@ void UIItemCollectionWnd::Slot28(int x, int y) { // OFFSET: 0x008F46C0 // FUNCTION: fn_12290 -void UIStatusWnd::Slot28(int x, int y) { +void UIStatusWnd::OnMouseHover(int x, int y) { if (this->geometry.unknown_0030 != 0) { return; } @@ -2069,20 +2069,20 @@ void UIStatusWnd::Slot28(int x, int y) { // OFFSET: 0x008F4A80 // FUNCTION: fn_12291 -void UIEquipWnd::Slot27(int x, int y) { - this->UIFrameWnd::Slot27(x, y); - this->Slot28(x, y); +void UIEquipWnd::OnMouseMove(int x, int y) { + this->UIFrameWnd::OnMouseMove(x, y); + this->OnMouseHover(x, y); } // OFFSET: 0x008F4AB0 // FUNCTION: fn_12292 -void UIMenuWnd::Slot27(int x, int y) { - this->Slot28(x, y); +void UIMenuWnd::OnMouseMove(int x, int y) { + this->OnMouseHover(x, y); } // OFFSET: 0x008F4680 // FUNCTION: fn_12289 -void UIMenuWnd::Slot28(int x, int y) { +void UIMenuWnd::OnMouseHover(int x, int y) { const int previous = this->m_selected; this->m_selected = this->ItemAt(x, y); if (previous != this->m_selected) { @@ -2203,7 +2203,7 @@ void UITipboxWnd::UpdatePageText() { // OFFSET: 0x008D0230 // FUNCTION: fn_12083 -void UIExchangeWnd::Slot10(int x, int y, std::intptr_t value) { +void UIExchangeWnd::DragAndDrop(int x, int y, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); if (this->unknown_00CC != 0) { mode->SendMsg(18, 0, 0, 0, 0); @@ -2227,13 +2227,13 @@ void UIExchangeWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x008D0010 // FUNCTION: fn_12082 -void UIEquipWnd::Slot10(int x, int y, std::intptr_t value) { +void UIEquipWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (this->m_viewOther != 0) { return; } if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -2278,9 +2278,9 @@ void UIEquipWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x008D02D0 // FUNCTION: fn_12084 -void UInCashWnd::Slot10(int x, int y, std::intptr_t value) { +void UInCashWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -2314,13 +2314,13 @@ void UInCashWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x008D9F00 // FUNCTION: fn_12137 -bool UISkillDescribeWnd::Slot42(void*) { +bool UISkillDescribeWnd::GetCustomTransBoxInfo(void*) { return true; } // OFFSET: 0x008D9F10 // FUNCTION: fn_12138 -bool UIWhisperWnd::Slot42(void*) { +bool UIWhisperWnd::GetCustomTransBoxInfo(void*) { return true; } @@ -2346,19 +2346,19 @@ void UIEquipWnd::NotifyEquipmentChanged() { // OFFSET: 0x008DA420 // FUNCTION: fn_12143 -bool UIMinimapZoomWnd::Slot08() { +bool UIMinimapZoomWnd::IsTransmitMouseInput() { return true; } // OFFSET: 0x008DA430 // FUNCTION: fn_12144 -bool UIEquipWnd::Slot03() { +bool UIEquipWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x008DA440 // FUNCTION: fn_12145 -bool UIStatusWnd::Slot03() { +bool UIStatusWnd::NeedsFrameRefresh() { return true; } @@ -2466,12 +2466,12 @@ void UIWhisperWnd::Move(int x, int y) { // OFFSET: 0x008F4D40 // FUNCTION: fn_12294 -void UIEquipWnd::Slot19() { +void UIEquipWnd::OnProcess() { } // OFFSET: 0x008F4F80 // FUNCTION: fn_12296 -void UIItemCollectionWnd::Slot19() { +void UIItemCollectionWnd::OnProcess() { if (this->m_previewTick != 0 && timeGetTime() > this->m_previewTick + 100) { this->m_readButtons[1]->Invalidate(); this->m_previewTick = timeGetTime(); @@ -2480,7 +2480,7 @@ void UIItemCollectionWnd::Slot19() { // OFFSET: 0x008F4FC0 // FUNCTION: fn_12297 -void UINotifyItemObtainWnd::Slot19() { +void UINotifyItemObtainWnd::OnProcess() { if (timeGetTime() > this->m_shownTick + 5000) { g_windowMgr.CloseWindow(58); } @@ -2488,7 +2488,7 @@ void UINotifyItemObtainWnd::Slot19() { // OFFSET: 0x008F4FF0 // FUNCTION: fn_12298 -void UIPetTamingDeceiveWnd::Slot19() { +void UIPetTamingDeceiveWnd::OnProcess() { this->Invalidate(); const int frame = this->m_tick / this->m_delay; @@ -2503,7 +2503,7 @@ void UIPetTamingDeceiveWnd::Slot19() { // OFFSET: 0x008F5070 // FUNCTION: fn_12299 -void UIProhibitListWnd::Slot19() { +void UIProhibitListWnd::OnProcess() { const int count = static_cast(g_session.m_prohibitionLog.size()); if (this->m_count != count) { this->m_count = count; @@ -2513,26 +2513,26 @@ void UIProhibitListWnd::Slot19() { // OFFSET: 0x008F50B0 // FUNCTION: fn_12300 -void UISayDialogWnd::Slot19() { +void UISayDialogWnd::OnProcess() { for (UIWindow* child : this->m_children) { - child->Slot19(); + child->OnProcess(); } } // OFFSET: 0x008F5990 // FUNCTION: fn_12307 -void UIItemIdentifyWnd::Slot33(int, int) { +void UIItemIdentifyWnd::OnRBtnUp(int, int) { } // OFFSET: 0x008F59A0 // FUNCTION: fn_12308 -void UIWhisperWnd::Slot33(int, int) { +void UIWhisperWnd::OnRBtnUp(int, int) { this->SendMsg(nullptr, 49, 0, 0, 0, 0); } // OFFSET: 0x008F5A10 // FUNCTION: fn_12310 -void UIExchangeWnd::Slot35(int delta) { +void UIExchangeWnd::OnWheel(int delta) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 7, 1, 0, 0, 0); } else { @@ -2542,7 +2542,7 @@ void UIExchangeWnd::Slot35(int delta) { // OFFSET: 0x008F59C0 // FUNCTION: fn_12309 -void UIEquipWnd::Slot35(int delta) { +void UIEquipWnd::OnWheel(int delta) { if (g_session.unknown_80C8 > 4 && this->m_page == 3) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 8, 1, 0, 0, 0); @@ -2554,7 +2554,7 @@ void UIEquipWnd::Slot35(int delta) { // OFFSET: 0x008F5A50 // FUNCTION: fn_12311 -void UIItemIdentifyWnd::Slot35(int delta) { +void UIItemIdentifyWnd::OnWheel(int delta) { if (this->m_scrollable == 0) { return; } @@ -3300,7 +3300,7 @@ int UIEquipWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::int // OFFSET: 0x008DEC50 // FUNCTION: fn_12171 -void UIEquipWnd::Slot15(int width, int height) { +void UIEquipWnd::OnCreate(int width, int height) { const int top = this->m_viewOther != 0 ? 0 : 20; this->unknown_00D8 = top; if (height != top + this->geometry.height) { @@ -3902,13 +3902,13 @@ int UIListBox::LineCount() const { // OFFSET: 0x008DA450 // FUNCTION: fn_12146 -bool UInCashWnd::Slot03() { +bool UInCashWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x008DB750 // FUNCTION: fn_12159 -void UIBookWnd::Slot15(int width, int height) { +void UIBookWnd::OnCreate(int width, int height) { this->m_viewer = new UITextViewer(); this->m_viewer->Configure(30, 45, width - 60, height - 60, 0); this->AddChild(this->m_viewer); @@ -3936,7 +3936,7 @@ void UIBookWnd::Slot15(int width, int height) { // OFFSET: 0x008E1890 // FUNCTION: fn_12175 -void UIItemCollectionWnd::Slot15(int width, int height) { +void UIItemCollectionWnd::OnCreate(int width, int height) { this->m_kind = 12; this->m_viewer = new UITextViewer(); this->m_viewer->Configure(91, 31, width - 98, height - 40, 0); @@ -4006,15 +4006,15 @@ void UIItemCollectionWnd::Slot15(int width, int height) { // OFFSET: 0x008DE360 // FUNCTION: fn_12165 -void UICombinedCardItemCollectionWnd::Slot15(int width, int height) { - this->UIItemCollectionWnd::Slot15(width, height); +void UICombinedCardItemCollectionWnd::OnCreate(int width, int height) { + this->UIItemCollectionWnd::OnCreate(width, height); this->m_kind = 82; } // OFFSET: 0x008DE380 // FUNCTION: fn_12166 -void UICombinedCardItemCollection_ComparisonWnd::Slot15(int width, int height) { - this->UIItemCollectionWnd::Slot15(width, height); +void UICombinedCardItemCollection_ComparisonWnd::OnCreate(int width, int height) { + this->UIItemCollectionWnd::OnCreate(width, height); this->m_closeButton->Enable(0); this->m_kind = 250; const SkinPaletteCell cell = {7, 1}; @@ -4024,8 +4024,8 @@ void UICombinedCardItemCollection_ComparisonWnd::Slot15(int width, int height) { // OFFSET: 0x008E24C0 // FUNCTION: fn_12176 -void UIItemCollection_ComparisonWnd::Slot15(int width, int height) { - this->UIItemCollectionWnd::Slot15(width, height); +void UIItemCollection_ComparisonWnd::OnCreate(int width, int height) { + this->UIItemCollectionWnd::OnCreate(width, height); this->m_closeButton->Enable(0); this->m_kind = 234; unsigned red, green, blue; @@ -4036,7 +4036,7 @@ void UIItemCollection_ComparisonWnd::Slot15(int width, int height) { // OFFSET: 0x008DBD00 // FUNCTION: fn_12160 -void UICardItemIllustWnd::Slot15(int, int) { +void UICardItemIllustWnd::OnCreate(int, int) { this->unknown_00E4 = 0; this->m_name = LookupMessage(527); this->AddCloseButton("", 0); @@ -4044,7 +4044,7 @@ void UICardItemIllustWnd::Slot15(int, int) { // OFFSET: 0x008E2590 // FUNCTION: fn_12178 -void UIItemIdentifyWnd::Slot15(int, int) { +void UIItemIdentifyWnd::OnCreate(int, int) { this->m_title.assign(LookupMessage(521)); this->m_selected = -1; this->m_scroll = 0; @@ -4097,15 +4097,15 @@ void UIItemIdentifyWnd::Slot15(int, int) { // OFFSET: 0x008E2540 // FUNCTION: fn_12177 -void UIItemCompositionWnd::Slot15(int width, int height) { - this->UIItemIdentifyWnd::Slot15(width, height); +void UIItemCompositionWnd::OnCreate(int width, int height) { + this->UIItemIdentifyWnd::OnCreate(width, height); this->m_title = LookupMessage(522); this->m_compositionState = 0; } // OFFSET: 0x008DE490 // FUNCTION: fn_12168 -void UIComboBoxWnd::Slot15(int width, int height) { +void UIComboBoxWnd::OnCreate(int width, int height) { this->m_list = new UIComboBox(); this->m_list->Configure(0, 0, width, height, 1); this->AddChild(this->m_list); @@ -4113,7 +4113,7 @@ void UIComboBoxWnd::Slot15(int width, int height) { // OFFSET: 0x008E85C0 // FUNCTION: fn_12199 -void UISkillDescribeWnd::Slot15(int width, int height) { +void UISkillDescribeWnd::OnCreate(int width, int height) { this->unknown_00D4 = LookupMessage(526); this->m_skillId = -1; this->m_viewer = new UITextViewer(); @@ -4147,7 +4147,7 @@ void UISkillDescribeWnd::Slot15(int width, int height) { // OFFSET: 0x008E8DC0 // FUNCTION: fn_12201 -void UIStatusWnd::Slot15(int, int) { +void UIStatusWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("Alt+A", 0); this->AddMinimizeButton("Ctrl+A", 0); @@ -4203,7 +4203,7 @@ void UIStatusWnd::Slot15(int, int) { // OFFSET: 0x008E8860 // FUNCTION: fn_12200 -void UISkillNameChangeWnd::Slot15(int, int) { +void UISkillNameChangeWnd::OnCreate(int, int) { this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(this->geometry.width - 77, 16); this->m_edit->Move(15, 22); @@ -4231,7 +4231,7 @@ void UISkillNameChangeWnd::Slot15(int, int) { // OFFSET: 0x008EA780 // FUNCTION: fn_12205 -void UIToolTipWnd::Slot15(int width, int height) { +void UIToolTipWnd::OnCreate(int width, int height) { this->m_list = new UIListBox(); width -= 24; height -= 60; @@ -4266,7 +4266,7 @@ void UIToolTipWnd::Slot15(int width, int height) { // OFFSET: 0x008E7130 // FUNCTION: fn_12194 -void UIProhibitListWnd::Slot15(int, int) { +void UIProhibitListWnd::OnCreate(int, int) { this->AddCloseButton("", 0); char tooltip[] = "Command"; @@ -4417,7 +4417,7 @@ void UInCashWnd::DrawItems() { // OFFSET: 0x008E3C80 // FUNCTION: fn_12183 -void UIMonsterDisplayWnd::Slot15(int, int) { +void UIMonsterDisplayWnd::OnCreate(int, int) { this->unknown_00E4 = 0; this->unknown_00CC = LookupMessage(527); this->AddCloseButton("", 0); @@ -4425,13 +4425,13 @@ void UIMonsterDisplayWnd::Slot15(int, int) { // OFFSET: 0x008E3090 // FUNCTION: fn_12179 -void UIItemParamChangeDisplayWnd::Slot15(int, int) { +void UIItemParamChangeDisplayWnd::OnCreate(int, int) { this->SendMsg(nullptr, 60, 0, 0, 0, 0); } // OFFSET: 0x008E3330 // FUNCTION: fn_12181 -void UIMenuWnd::Slot15(int, int) { +void UIMenuWnd::OnCreate(int, int) { } // OFFSET: 0x008CED30 @@ -4952,7 +4952,7 @@ void UITipboxWnd::TrimAt(std::string& text, const char* marker) { // OFFSET: 0x00909DF0 // FUNCTION: fn_12402 -void UIChooseWnd::Slot11() { +void UIChooseWnd::StoreInfo() { if (this->m_placement) { this->m_placement->width = this->geometry.width; this->m_placement->height = this->geometry.height; @@ -4963,7 +4963,7 @@ void UIChooseWnd::Slot11() { // OFFSET: 0x00909E30 // FUNCTION: fn_12403 -void UICombinedCardItemCollectionWnd::Slot11() { +void UICombinedCardItemCollectionWnd::StoreInfo() { if (this->m_cardPlacement) { this->m_cardPlacement->x = this->geometry.x; this->m_cardPlacement->y = this->geometry.y; @@ -4974,7 +4974,7 @@ void UICombinedCardItemCollectionWnd::Slot11() { // OFFSET: 0x00909E70 // FUNCTION: fn_12404 -void UIEquipWnd::Slot11() { +void UIEquipWnd::StoreInfo() { if (this->m_placement) { this->m_placement->width = this->geometry.width; this->m_placement->height = this->geometry.height; @@ -4986,7 +4986,7 @@ void UIEquipWnd::Slot11() { // OFFSET: 0x00909F00 // FUNCTION: fn_12406 -void UIItemCollectionWnd::Slot11() { +void UIItemCollectionWnd::StoreInfo() { if (this->m_placement) { this->m_placement->x = this->geometry.x; this->m_placement->y = this->geometry.y; @@ -4997,7 +4997,7 @@ void UIItemCollectionWnd::Slot11() { // OFFSET: 0x00909F40 // FUNCTION: fn_12407 -void UIItemCompositionWnd::Slot11() { +void UIItemCompositionWnd::StoreInfo() { if (this->m_compositionPlacement) { this->m_compositionPlacement->width = this->geometry.width; this->m_compositionPlacement->height = this->geometry.height; @@ -5008,7 +5008,7 @@ void UIItemCompositionWnd::Slot11() { // OFFSET: 0x00909F80 // FUNCTION: fn_12408 -void UIItemIdentifyWnd::Slot11() { +void UIItemIdentifyWnd::StoreInfo() { if (this->m_placement) { this->m_placement->width = this->geometry.width; this->m_placement->height = this->geometry.height; @@ -5019,7 +5019,7 @@ void UIItemIdentifyWnd::Slot11() { // OFFSET: 0x00909FC0 // FUNCTION: fn_12409 -void UIItemParamChangeDisplayWnd::Slot11() { +void UIItemParamChangeDisplayWnd::StoreInfo() { if (this->m_placement) { this->m_placement->x = this->geometry.x; this->m_placement->y = this->geometry.y; @@ -5030,7 +5030,7 @@ void UIItemParamChangeDisplayWnd::Slot11() { // OFFSET: 0x0090A000 // FUNCTION: fn_12410 -void UIPartySettingWnd::Slot11() { +void UIPartySettingWnd::StoreInfo() { if (this->m_placement) { this->m_placement->x = this->geometry.x; this->m_placement->y = this->geometry.y; @@ -5041,7 +5041,7 @@ void UIPartySettingWnd::Slot11() { // OFFSET: 0x0090A040 // FUNCTION: fn_12411 -void UISayDialogWnd::Slot11() { +void UISayDialogWnd::StoreInfo() { if (this->m_placement) { this->m_placement->width = this->geometry.width; this->m_placement->height = this->geometry.height; @@ -5052,7 +5052,7 @@ void UISayDialogWnd::Slot11() { // OFFSET: 0x0090A180 // FUNCTION: fn_12414 -void UInCashWnd::Slot11() { +void UInCashWnd::StoreInfo() { if (this->m_placement) { this->m_placement->width = this->geometry.width; this->m_placement->height = this->geometry.height; @@ -5431,12 +5431,12 @@ int UIGraffiStrboxWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s // OFFSET: 0x008E4380 // FUNCTION: fn_12185 -void UINotifyItemObtainWnd::Slot15(int, int) { +void UINotifyItemObtainWnd::OnCreate(int, int) { } // OFFSET: 0x008E7120 // FUNCTION: fn_12193 -void UIPetTamingDeceiveWnd::Slot15(int, int) { +void UIPetTamingDeceiveWnd::OnCreate(int, int) { } // OFFSET: 0x008D3230 @@ -5554,7 +5554,7 @@ int UIItemTagCtrl::MeasureText(const std::string& text, const unsigned& bytes) { // OFFSET: 0x008E8390 // FUNCTION: fn_12197 -void UISayDialogWnd::Slot15(int width, int height) { +void UISayDialogWnd::OnCreate(int width, int height) { auto* viewer = new UITagTextViewer(); this->m_viewer = viewer; viewer->SetSize(width - 20, height - 40); @@ -5603,7 +5603,7 @@ int UINotifyJobLevelUpWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x008E0A20 // FUNCTION: fn_12173 -void UIExchangeWnd::Slot15(int, int) { +void UIExchangeWnd::OnCreate(int, int) { this->SendMsg(nullptr, 0x17, 0, 0, 0, 0); this->unknown_00CC = 0; this->unknown_00D0 = 0; @@ -5655,7 +5655,7 @@ void UIExchangeWnd::Slot15(int, int) { // OFFSET: 0x008DE400 // FUNCTION: fn_12167 -void UIComboBoxIDWnd::Slot15(int width, int height) { +void UIComboBoxIDWnd::OnCreate(int width, int height) { auto* list = new UIComboBoxID(); this->m_list = list; list->Configure(0, 0, width, height, 1); @@ -5690,7 +5690,7 @@ void UIChatRoomMakeWnd::Paint() { // OFFSET: 0x008DBD50 // FUNCTION: fn_12161 -void UIChatRoomMakeWnd::Slot15(int width, int height) { +void UIChatRoomMakeWnd::OnCreate(int width, int height) { if (g_session.IsTrickDeadActive()) { g_windowMgr.SendNotice(1, reinterpret_cast(LookupMessage(0x295)), 0xFF, 0, 0, 0); g_windowMgr.CloseWindow(0x1B); @@ -6087,7 +6087,7 @@ int UIPetTamingDeceiveWnd::SendMsg( // OFFSET: 0x0090A080 // FUNCTION: fn_12412 -void UIStatusWnd::Slot11() { +void UIStatusWnd::StoreInfo() { if (this->m_info == nullptr) { return; } @@ -6206,7 +6206,7 @@ void UIItemCollectionWnd::SetHeight(int height) { class UIAutoMessageWnd : public UIFrameWnd { public: UIAutoMessageWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -6263,7 +6263,7 @@ struct NCashRentalPacket { // OFFSET: 0x008EB280 // FUNCTION: fn_12208 -void UInCashWnd::Slot15(int width, int height) { +void UInCashWnd::OnCreate(int width, int height) { g_session.ClearTradeItems(); this->m_otherItems.clear(); this->m_pageCount = 1; @@ -6756,7 +6756,7 @@ int UInCashWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, // OFFSET: 0x008F5AA0 // FUNCTION: fn_12312 -void UInCashWnd::Slot35(int delta) { +void UInCashWnd::OnWheel(int delta) { if (g_session.GetList2Size() < 4) { return; } @@ -6921,7 +6921,7 @@ ITEM_INFO UIEquipWnd::ItemEntryAt(int x, int y) { // OFFSET: 0x008F31C0 // FUNCTION: fn_12263 -void UIEquipWnd::Slot26(int x, int y) { +void UIEquipWnd::OnLBtnDblClk(int x, int y) { if (y < 17) { this->SendMsg(this, 6, 202, 0, 0, 0); } @@ -6939,7 +6939,7 @@ void UIEquipWnd::Slot26(int x, int y) { // OFFSET: 0x008F3DD0 // FUNCTION: fn_12286 -void UIEquipWnd::Slot28(int x, int y) { +void UIEquipWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->ItemEntryAt(x, y); if (item.unknown_0000[1] != 0) { item.identified = 1; @@ -6998,7 +6998,7 @@ void UIEquipWnd::Slot28(int x, int y) { // OFFSET: 0x008F5400 // FUNCTION: fn_12302 -void UIEquipWnd::Slot32(int x, int y) { +void UIEquipWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->ItemEntryAt(x, y); if (item.unknown_0000[1] != 0) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&item), 0, 0, 0); @@ -7030,7 +7030,7 @@ ITEM_INFO UIExchangeWnd::ItemAt(int x, int y) { // OFFSET: 0x008F4300 // FUNCTION: fn_12287 -void UIExchangeWnd::Slot28(int x, int y) { +void UIExchangeWnd::OnMouseHover(int x, int y) { int tooltipY = y; ITEM_INFO item = this->ItemAt(x, y); this->m_hoverX = static_cast(x); @@ -7054,7 +7054,7 @@ void UIExchangeWnd::Slot28(int x, int y) { // OFFSET: 0x008F54C0 // FUNCTION: fn_12303 -void UIExchangeWnd::Slot32(int x, int y) { +void UIExchangeWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (item.unknown_0000[1] != 0) { if (UIWindow* window = g_windowMgr.EnsureWindow(12)) { @@ -7087,7 +7087,7 @@ ITEM_INFO UIItemIdentifyWnd::GetSelectedItem(int* found) { // OFFSET: 0x0090A0E0 // FUNCTION: fn_12413 -void UIWhisperWnd::Slot11() { +void UIWhisperWnd::StoreInfo() { if (this->unknown_0100) { this->unknown_0100->width = this->geometry.width; this->unknown_0100->height = this->geometry.height; @@ -7180,9 +7180,9 @@ ITEM_INFO UInCashWnd::ItemAt(int x, int y) { // OFFSET: 0x008F3A80 // FUNCTION: fn_12279 -void UInCashWnd::Slot25(int x, int y) { +void UInCashWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } ITEM_INFO item = this->ItemAt(x, y); @@ -7202,7 +7202,7 @@ void UInCashWnd::Slot25(int x, int y) { // OFFSET: 0x008F58C0 // FUNCTION: fn_12306 -void UInCashWnd::Slot32(int x, int y) { +void UInCashWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (item.unknown_0000[1] != 0 && this->m_selected >= 0) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&item), 0, 0, 0); @@ -7450,7 +7450,7 @@ UIPartyInvitationToWnd::UIPartyInvitationToWnd() // OFFSET: 0x008E60A0 // FUNCTION: fn_12191 -void UIPartySettingWnd::Slot15(int width, int height) { +void UIPartySettingWnd::OnCreate(int width, int height) { this->m_expShare = g_session.unknown_54A0 == 2 ? 0 : g_session.unknown_54A0; this->m_itemShare = g_session.unknown_54A4; this->m_itemDistribute = 0; @@ -7676,7 +7676,7 @@ UISayDialogWnd::UISayDialogWnd() // OFFSET: 0x008E3CD0 // FUNCTION: fn_12184 -void UINoticeConfirmWnd::Slot15(int width, int height) { +void UINoticeConfirmWnd::OnCreate(int width, int height) { const std::string prefix("유저인터페이스\\"); const char* names[2][3] = {{"btn_ok", "btn_ok_a", "btn_ok_b"}, {"btn_cancel", "btn_cancel_a", "btn_cancel_b"}}; int ids[2] = {184, 185}; @@ -7706,7 +7706,7 @@ void UINoticeConfirmWnd::Slot15(int width, int height) { // OFFSET: 0x008E4390 // FUNCTION: fn_12186 -void UINotifyLevelUpWnd::Slot15(int, int) { +void UINotifyLevelUpWnd::OnCreate(int, int) { int ids[3] = {192}; int positions[3] = {0}; const char* names[8] = {"lv_up"}; @@ -7726,7 +7726,7 @@ void UINotifyLevelUpWnd::Slot15(int, int) { // OFFSET: 0x008E4970 // FUNCTION: fn_12187 -void UINotifyQuestWnd::Slot15(int, int) { +void UINotifyQuestWnd::OnCreate(int, int) { int ids[3] = {192}; int positions[3] = {0}; const char* names[8] = {"quest"}; @@ -7746,7 +7746,7 @@ void UINotifyQuestWnd::Slot15(int, int) { // OFFSET: 0x008E4F50 // FUNCTION: fn_12188 -void UINpcEditDialogWnd::Slot15(int, int) { +void UINpcEditDialogWnd::OnCreate(int, int) { this->edit = new UIEditCtrl(); this->edit->SetSize(this->geometry.width - 77, 16); this->edit->Move(15, 22); @@ -7774,7 +7774,7 @@ void UINpcEditDialogWnd::Slot15(int, int) { // OFFSET: 0x008E54B0 // FUNCTION: fn_12189 -void UINpcTextEditDialogWnd::Slot15(int, int) { +void UINpcTextEditDialogWnd::OnCreate(int, int) { this->edit = new UIEditCtrl(); this->edit->SetSize(this->geometry.width - 77, 16); this->edit->Move(15, 22); @@ -7802,7 +7802,7 @@ void UINpcTextEditDialogWnd::Slot15(int, int) { } // OFFSET: 0x008E7660 // FUNCTION: fn_12195 -void UIQuitWnd::Slot15(int, int) { +void UIQuitWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\"); int positions[3][3] = {{29, 30, 0}, {29, 61, 0}, {29, 96, 0}}; int ids[3] = {220, 221, 185}; @@ -7824,7 +7824,7 @@ void UIQuitWnd::Slot15(int, int) { // OFFSET: 0x008E7CB0 // FUNCTION: fn_12196 -void UIRestartWnd::Slot15(int, int) { +void UIRestartWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\"); int ids[4] = {220, 252, 251, 185}; const char* names[4][4] = { @@ -7847,7 +7847,7 @@ void UIRestartWnd::Slot15(int, int) { // OFFSET: 0x008EAE30 // FUNCTION: fn_12206 -void UIWaitWnd::Slot15(int width, int height) { +void UIWaitWnd::OnCreate(int width, int height) { this->m_button = new UIBitmapButton(); this->m_button->SetBitmap("유저인터페이스\\btn_cancel.bmp", 0, 0); this->m_button->SetBitmap("유저인터페이스\\btn_cancel_a.bmp", 1, 0); @@ -7880,7 +7880,7 @@ namespace { // OFFSET: 0x008E5A20 // FUNCTION: fn_12190 -void UIPartyInvitationToWnd::Slot15(int, int) { +void UIPartyInvitationToWnd::OnCreate(int, int) { this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(120, 20); this->m_edit->Move(20, 42); @@ -8363,7 +8363,7 @@ int UIYourItemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // OFFSET: 0x008E6B40 // FUNCTION: fn_12192 -void UIPasswordWnd::Slot15(int, int) { +void UIPasswordWnd::OnCreate(int, int) { this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(90, 16); this->m_edit->Move(15, 22); @@ -9018,7 +9018,7 @@ void UICardItemIllustWnd::Paint() { // OFFSET: 0x008E8480 // FUNCTION: fn_12198 -void UISelectCartWnd::Slot15(int, int) { +void UISelectCartWnd::OnCreate(int, int) { this->AddCloseButton("", 0); const int levels[] = {0, 40, 65, 80, 90, 100, 110, 120, 130}; @@ -9112,7 +9112,7 @@ inline std::vector MakeReplayTaggedRecord(std::uint16_t id, const // OFFSET: 0x008D3AB0 // FUNCTION: fn_12104 -std::vector UIBabyAcceptWnd2::Slot44() { +std::vector UIBabyAcceptWnd2::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(21550, nullptr, 0); @@ -9127,7 +9127,7 @@ std::vector UIBabyAcceptWnd2::Slot44() { // OFFSET: 0x008D4100 // FUNCTION: fn_12106 -std::vector UIChooseSellBuyWnd::Slot44() { +std::vector UIChooseSellBuyWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(20850, nullptr, 0); @@ -9168,37 +9168,37 @@ static __forceinline std::vector BuildAcceptanceReplayRecords(UIT // OFFSET: 0x008D4A40 // FUNCTION: fn_12109 -std::vector UIExchangeAcceptWnd::Slot44() { +std::vector UIExchangeAcceptWnd::GetReplayData() { return BuildAcceptanceReplayRecords(this->viewer, 21650, 93); } // OFFSET: 0x008D3CD0 // FUNCTION: fn_12105 -std::vector UIBabyAcceptWnd::Slot44() { +std::vector UIBabyAcceptWnd::GetReplayData() { return BuildAcceptanceReplayRecords(this->viewer, 21500, 794); } // OFFSET: 0x008D5C80 // FUNCTION: fn_12113 -std::vector UIJoinFriendAcceptWnd::Slot44() { +std::vector UIJoinFriendAcceptWnd::GetReplayData() { return BuildAcceptanceReplayRecords(this->viewer, 21600, 818); } // OFFSET: 0x008D60B0 // FUNCTION: fn_12114 -std::vector UIJoinGuildAcceptWnd::Slot44() { +std::vector UIJoinGuildAcceptWnd::GetReplayData() { return BuildAcceptanceReplayRecords(this->viewer, 21800, 377); } // OFFSET: 0x008D64E0 // FUNCTION: fn_12115 -std::vector UIJoinPartyAcceptWnd::Slot44() { +std::vector UIJoinPartyAcceptWnd::GetReplayData() { return BuildAcceptanceReplayRecords(this->viewer, 21750, 94); } // OFFSET: 0x008D7110 // FUNCTION: fn_12118 -std::vector UIStarPlaceAcceptWnd::Slot44() { +std::vector UIStarPlaceAcceptWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(21700, nullptr, 0); @@ -9217,7 +9217,7 @@ std::vector UIStarPlaceAcceptWnd::Slot44() { // OFFSET: 0x008D4600 // FUNCTION: fn_12108 -std::vector UIChooseWnd::Slot44() { +std::vector UIChooseWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(21900, nullptr, 0); @@ -9268,19 +9268,19 @@ static __forceinline std::vector BuildItemListReplayRecords(const // OFFSET: 0x008D59B0 // FUNCTION: fn_12112 -std::vector UIItemIdentifyWnd::Slot44() { +std::vector UIItemIdentifyWnd::GetReplayData() { return BuildItemListReplayRecords(this->m_items, 22300, 0x177); } // OFFSET: 0x008D56E0 // FUNCTION: fn_12111 -std::vector UIItemCompositionWnd::Slot44() { +std::vector UIItemCompositionWnd::GetReplayData() { return BuildItemListReplayRecords(this->m_items, 22350, 0x17B); } // OFFSET: 0x008D6910 // FUNCTION: fn_12116 -std::vector UIMakingArrowListWnd::Slot44() { +std::vector UIMakingArrowListWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(22100, nullptr, 0); @@ -9334,7 +9334,7 @@ void UINotifyItemObtainWnd::Paint() { // OFFSET: 0x008EB010 // FUNCTION: fn_12207 -void UIWhisperWnd::Slot15(int, int) { +void UIWhisperWnd::OnCreate(int, int) { this->m_message0 = 184; this->m_resizer = new UIResizer(); @@ -9503,7 +9503,7 @@ void UInCashWnd::Paint() { // OFFSET: 0x008F4D50 // FUNCTION: fn_12295 -void UIExchangeWnd::Slot19() { +void UIExchangeWnd::OnProcess() { UIEditCtrl* edit = this->unknown_00C0; if (edit == nullptr) { return; @@ -9642,7 +9642,7 @@ void UIItemCollectionWnd::Paint() { // OFFSET: 0x008DB1F0 // FUNCTION: fn_12158 -void UIAutoMessageWnd::Slot15(int, int) { +void UIAutoMessageWnd::OnCreate(int, int) { this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(this->geometry.width - 77, 16); this->m_edit->Move(15, 22); @@ -9668,7 +9668,7 @@ void UIAutoMessageWnd::Slot15(int, int) { // OFFSET: 0x008EC840 // FUNCTION: fn_12209 -void UInCash_CallWnd::Slot15(int, int) { +void UInCash_CallWnd::OnCreate(int, int) { const int ids[] = {192}; const int positions[] = {0}; const char* names[] = {"NC_CashShop"}; @@ -9794,7 +9794,7 @@ UIMakingArrowListWnd::UIMakingArrowListWnd() // OFFSET: 0x008D4320 // FUNCTION: fn_12107 -std::vector UIChooseWarpWnd::Slot44() { +std::vector UIChooseWarpWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(21950, nullptr, 0); @@ -9813,7 +9813,7 @@ std::vector UIChooseWarpWnd::Slot44() { // OFFSET: 0x008D4E70 // FUNCTION: fn_12110 -std::vector UIExchangeWnd::Slot44() { +std::vector UIExchangeWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(20600, nullptr, 0); @@ -9860,7 +9860,7 @@ std::vector UIExchangeWnd::Slot44() { // OFFSET: 0x008D6D40 // FUNCTION: fn_12117 -std::vector UISayDialogWnd::Slot44() { +std::vector UISayDialogWnd::GetReplayData() { std::vector records; { const auto record = MakeReplayTaggedRecord(22500, nullptr, 0); @@ -9884,7 +9884,7 @@ std::vector UISayDialogWnd::Slot44() { // OFFSET: 0x008E30B0 // FUNCTION: fn_12180 -void UILoadingWnd::Slot15(int, int) { +void UILoadingWnd::OnCreate(int, int) { // GLOBAL: gl_25392 static int s_loadingScreenIndex; @@ -10009,7 +10009,7 @@ void UIEquipWnd::RefreshTitleList() { // OFFSET: 0x008F5580 // FUNCTION: fn_12304 -void UIItemCollectionWnd::Slot32(int x, int y) { +void UIItemCollectionWnd::OnRBtnDown(int x, int y) { int slotX; int slotY; const int index = this->CardSlotAt(x, y, &slotX, &slotY); @@ -10046,7 +10046,7 @@ void UIItemCollectionWnd::Slot32(int x, int y) { // OFFSET: 0x008F5790 // FUNCTION: fn_12305 -void UIItemCollection_ComparisonWnd::Slot32(int x, int y) { +void UIItemCollection_ComparisonWnd::OnRBtnDown(int x, int y) { int slotX; int slotY; const int index = this->CardSlotAt(x, y, &slotX, &slotY); @@ -10068,9 +10068,9 @@ void UIItemCollection_ComparisonWnd::Slot32(int x, int y) { // OFFSET: 0x008F3660 // FUNCTION: fn_12270 -void UIEquipWnd::Slot25(int x, int y) { +void UIEquipWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } if (this->m_viewOther != 0) { @@ -10125,7 +10125,7 @@ UInCashWnd::UInCashWnd() : UIItemBaseWnd() { // OFFSET: 0x008F33F0 // FUNCTION: fn_12267 -void UInCashWnd::Slot26(int x, int y) { +void UInCashWnd::OnLBtnDblClk(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (item.unknown_0000[1] == 0 || this->m_selected >= 0) { return; @@ -10272,7 +10272,7 @@ int UIMakingArrowListWnd::SendMsg(UIWindow*, int message, std::intptr_t a, std:: // OFFSET: 0x008F50E0 // FUNCTION: fn_12301 -void UITipboxWnd::Slot19() { +void UITipboxWnd::OnProcess() { if (this->unknown_00FC == true) { this->unknown_00FC = false; const int index = (std::max)(0, g_itemTagOwner->unknown_00B4); @@ -10451,7 +10451,7 @@ void UITipboxWnd::Paint() { // OFFSET: 0x008E9370 // FUNCTION: fn_12203 -void UITipOfTheDayWnd::Slot15(int width, int height) { +void UITipOfTheDayWnd::OnCreate(int width, int height) { const std::string prefix("유저인터페이스\\"); const char* names[3][3] = {{"btn_back", "btn_back_a", "btn_back_b"}, {"btn_next", "btn_next_a", "btn_next_b"}, {"btn_close", "btn_close_a", "btn_close_b"}}; int positions[3][2] = {{144, this->geometry.height - 24}, {189, this->geometry.height - 24}, {234, this->geometry.height - 24}}; @@ -10502,7 +10502,7 @@ void UITipOfTheDayWnd::Slot15(int width, int height) { // OFFSET: 0x008E9C90 // FUNCTION: fn_12204 -void UITipboxWnd::Slot15(int width, int) { +void UITipboxWnd::OnCreate(int width, int) { this->unknown_0100 = g_window315Enabled; this->m_message0 = 365; @@ -11586,7 +11586,7 @@ void UIEquipWnd::RefreshLook() unknown_00F8[7] = g_session.m_headPalette; CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); if (mode->scene && mode->scene->player) - unknown_011C = mode->scene->player->Slot46(); + unknown_011C = mode->scene->player->GetBodyCostume(); } else { unknown_00F8[0] = g_equipWindowLook.job; unknown_00F8[1] = g_equipWindowLook.sex; @@ -11645,7 +11645,7 @@ char* UIBookWnd::StripColorCodes(const char* text) { // OFFSET: 0x008F4AC0 // FUNCTION: fn_12293 -void UIBookWnd::Slot19() { +void UIBookWnd::OnProcess() { if (!this->m_autoRead || this->m_autoTick == 0 || timeGetTime() <= this->m_autoTick + 4000) { return; } @@ -12624,11 +12624,11 @@ int UIItemCollectionWnd::SendMsg(UIWindow* sender, int message, std::intptr_t ar if (this->m_compare) { if (this->geometry.height != 144) { this->SetHeight(this->m_extraHeight + 149); - this->Slot36(); + this->RefreshSnap(); } } else if (this->geometry.height != 120) { this->SetHeight(this->m_extraHeight + 120); - this->Slot36(); + this->RefreshSnap(); } this->unknown_01C4 = "유저인터페이스\\collection\\" + std::string(ItemResourcePath(this->m_item)) + ".bmp"; const std::vector& descriptions = this->m_item.Description(); diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp index b8f0c3be0..285e9a00e 100644 --- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp @@ -46,7 +46,7 @@ UIExchangeAcceptWnd::~UIExchangeAcceptWnd() = default; // OFFSET: 0x008E0380 // FUNCTION: fn_12172 -void UIExchangeAcceptWnd::Slot15(int width, int height) { +void UIExchangeAcceptWnd::OnCreate(int width, int height) { const std::string prefix("유저인터페이스\\"); const char* names[2][3] = {{"btn_ok", "btn_ok_a", "btn_ok_b"}, {"btn_cancel", "btn_cancel_a", "btn_cancel_b"}}; int ids[2] = {184, 185}; @@ -143,7 +143,7 @@ int UIExchangeAcceptWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, // OFFSET: 0x00909EC0 // FUNCTION: fn_12405 -void UIExchangeAcceptWnd::Slot11() { +void UIExchangeAcceptWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h index f30e93cde..9abf04dc3 100644 --- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h +++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.h @@ -11,10 +11,10 @@ class UIChooseSellBuyWnd : public UIFrameWnd { public: UIChooseSellBuyWnd(); ~UIChooseSellBuyWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; /* 00B4 */ std::uint32_t identity; /* 00B8 */ UITextViewer* viewer; @@ -28,10 +28,10 @@ class UIExchangeAcceptWnd : public UIChooseSellBuyWnd { public: UIExchangeAcceptWnd(); ~UIExchangeAcceptWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot11() override; - std::vector Slot44() override; + void StoreInfo() override; + std::vector GetReplayData() override; /* 00BC */ NormalItemSlotWindow* saved; }; @@ -41,7 +41,7 @@ public: UIJoinPartyAcceptWnd(); ~UIJoinPartyAcceptWnd() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; }; class UIAllyGuildAcceptWnd : public UIExchangeAcceptWnd { @@ -54,14 +54,14 @@ class UIBabyAcceptWnd2 : public UIExchangeAcceptWnd { public: UIBabyAcceptWnd2(); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; }; class UIBabyAcceptWnd : public UIExchangeAcceptWnd { public: UIBabyAcceptWnd(); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; }; class UICoupleAcceptWnd : public UIExchangeAcceptWnd { @@ -74,7 +74,7 @@ class UIJoinFriendAcceptWnd : public UIExchangeAcceptWnd { public: UIJoinFriendAcceptWnd(); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; /* 00C0 */ int m_accountId; /* 00C4 */ int m_characterId; @@ -84,7 +84,7 @@ class UIJoinGuildAcceptWnd : public UIExchangeAcceptWnd { public: UIJoinGuildAcceptWnd(); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; }; class UIMixAcceptWnd : public UIExchangeAcceptWnd { @@ -99,7 +99,7 @@ class UIStarPlaceAcceptWnd : public UIExchangeAcceptWnd { public: UIStarPlaceAcceptWnd(); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; /* 00C0 */ char m_place; }; diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp index d6f44c2b7..b7ca0eb3a 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp +++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp @@ -96,7 +96,7 @@ template <> void CUIListBoxEx // FUNCTION: fn_13993 // OFFSET: 0x009C2980 // FUNCTION: fn_13994 -template void CUIListBox::Slot15(int width, int height) { +template void CUIListBox::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { @@ -114,8 +114,8 @@ template void CUIListBox::Slot15(int width, int height) { this->AddChild(this->scrollBar); } -template void CUIListBox::Slot15(int, int); -template void CUIListBox::Slot15(int, int); +template void CUIListBox::OnCreate(int, int); +template void CUIListBox::OnCreate(int, int); // OFFSET: 0x009C2A50 // FUNCTION: fn_13995 @@ -125,17 +125,17 @@ template void CUIListBox::Slot15(int, int); // FUNCTION: fn_13997 // OFFSET: 0x009C2CC0 // FUNCTION: fn_13998 -template void CUIListBoxEx::Slot15(int width, int height) { +template void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); } -template void CUIListBoxEx::Slot15(int, int); -template void CUIListBoxEx::Slot15(int, int); -template void CUIListBoxEx::Slot15(int, int); -template void CUIListBoxEx::Slot15(int, int); +template void CUIListBoxEx::OnCreate(int, int); +template void CUIListBoxEx::OnCreate(int, int); +template void CUIListBoxEx::OnCreate(int, int); +template void CUIListBoxEx::OnCreate(int, int); // OFFSET: 0x009C12B0 // FUNCTION: fn_13987 @@ -187,7 +187,7 @@ void CUIListBoxEx::ClearItems // OFFSET: 0x009C2D90 // FUNCTION: fn_13999 -void CUIAdventureGuide::Slot15(int width, int height) { +void CUIAdventureGuide::OnCreate(int width, int height) { this->background = new CUIStaticImage(); this->background->SetSize(750, 468); this->background->Move(0, 0); @@ -512,12 +512,12 @@ void CUIAdventureGuide::OnClose() { // OFFSET: 0x009C14F0 // FUNCTION: fn_13991 -void CUIAdventureGuide::Slot53() { +void CUIAdventureGuide::Initialize() { this->unknown_00B4 = 0; this->Resize(750, 468); this->Move((g_renderer->viewport.width - this->geometry.width) / 2, (g_renderer->viewport.height - this->geometry.height) / 2); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x009DB710 @@ -537,7 +537,7 @@ namespace AdventureGuide { // FUNCTION: fn_14314 void CUITab::OnSelectSubTab(CUISubTab* subTab) { if (subTab) { - this->page->Slot54(this->type, subTab->id); + this->page->LoadPage(this->type, subTab->id); } } @@ -656,7 +656,7 @@ void CUIQuest::Paint() { // OFFSET: 0x009DCFF0 // FUNCTION: fn_14331 -void CUIIntro::Slot16() { +void CUIIntro::OnInit() { const std::string& title = g_adventureGuideMgr->unknown_0014; const std::map& texts = g_adventureGuideMgr->unknown_002C; if (texts.empty()) { @@ -674,17 +674,17 @@ void CUIIntro::Slot16() { // OFFSET: 0x009DD1C0 // FUNCTION: fn_14333 -void CUIItem::Slot16() { +void CUIItem::OnInit() { } // OFFSET: 0x009DD6B0 // FUNCTION: fn_14338 -void CUIQuest::Slot16() { +void CUIQuest::OnInit() { } // OFFSET: 0x009DD1D0 // FUNCTION: fn_14334 -void CUIItemInfo::Slot16() { +void CUIItemInfo::OnInit() { this->unknown_00F0->scrollBar->SetHidden(1); this->unknown_00F4->scrollBar->SetHidden(1); this->unknown_00F8->scrollBar->SetHidden(1); @@ -729,7 +729,7 @@ void CUIItemInfo::SetDescription(int type, const std::vector& descr // OFFSET: 0x009DD210 // FUNCTION: fn_14335 -void CUIMonster::Slot16() { +void CUIMonster::OnInit() { std::list episodes; g_adventureGuideMgr->GetEpisodeList(episodes); for (const AdventureGuideEpisode& episode : episodes) { @@ -743,14 +743,14 @@ void CUIMonster::Slot16() { // OFFSET: 0x009DD680 // FUNCTION: fn_14337 -void CUIMonsterInfo::Slot16() { +void CUIMonsterInfo::OnInit() { this->unknown_00EC->scrollBar->SetHidden(1); this->unknown_00F0->scrollBar->SetHidden(1); } // OFFSET: 0x009DD6C0 // FUNCTION: fn_14339 -void CUIQuestInfo::Slot16() { +void CUIQuestInfo::OnInit() { this->unknown_00EC->scrollBar->SetHidden(1); CUIVScrollBar* first = this->unknown_00EC->scrollBar; first->dragging = 0; @@ -763,18 +763,18 @@ void CUIQuestInfo::Slot16() { // OFFSET: 0x009DD720 // FUNCTION: fn_14340 -void CUISubTab::Slot16() { +void CUISubTab::OnInit() { this->unknown_00EC->Show(0); } // OFFSET: 0x009DD730 // FUNCTION: fn_14341 -void CUITab::Slot16() { +void CUITab::OnInit() { } // OFFSET: 0x009DD740 // FUNCTION: fn_14342 -void CUITabInfo::Slot16() { +void CUITabInfo::OnInit() { } // OFFSET: 0x009DC0F0 @@ -858,12 +858,12 @@ void CUIQuestInfo::SetViewerLines(const std::vector& lines) { // OFFSET: 0x009DDA40 // FUNCTION: fn_14347 -void CUIIntro::Slot54(int, int) { +void CUIIntro::LoadPage(int, int) { } // OFFSET: 0x009DDA50 // FUNCTION: fn_14348 -void CUIItem::Slot54(int type, int id) { +void CUIItem::LoadPage(int type, int id) { this->itemList->ClearData(); this->location = id; std::list> entries; @@ -888,13 +888,13 @@ void CUIItem::Slot54(int type, int id) { // OFFSET: 0x009DDE50 // FUNCTION: fn_14350 -void CUIMonster::Slot54(int, int) { +void CUIMonster::LoadPage(int, int) { this->unknown_0084->Show(0); } // OFFSET: 0x009DDE60 // FUNCTION: fn_14351 -void CUIQuest::Slot54(int type, int id) { +void CUIQuest::LoadPage(int type, int id) { this->questList->ClearData(); std::list> contents; g_adventureGuideMgr->GetContentsList(contents, type, id); @@ -992,7 +992,7 @@ void CUIListBox::SelectItem(CUIListItem* item) { // OFFSET: 0x009DC950 // FUNCTION: fn_14329 -void CUIAdventureGuide::Slot16() { +void CUIAdventureGuide::OnInit() { const char* title = LookupMessage(0xFD5); this->titleBar->SetTitle(title); @@ -1148,12 +1148,12 @@ void CUIAdventureGuide::OnSelectTab(AdventureGuide::CUITab* tab) { } if (subTabs->selected) { - page->Slot54(type, subTabs->selected->id); + page->LoadPage(type, subTabs->selected->id); } else { - page->Slot54(type, 0); + page->LoadPage(type, 0); } } else { - page->Slot54(type, 0); + page->LoadPage(type, 0); } } @@ -1161,7 +1161,7 @@ namespace AdventureGuide { // OFFSET: 0x009C5400 // FUNCTION: fn_14000 -void CUICharacterInfo::Slot15(int width, int height) { +void CUICharacterInfo::OnCreate(int width, int height) { this->jobIcon = new CUIStaticImage(); this->jobIcon->SetSize(25, 25); this->jobIcon->Move(10, 8); @@ -1222,7 +1222,7 @@ void CUICharacterInfo::Slot15(int width, int height) { // OFFSET: 0x009C8D00 // FUNCTION: fn_14003 -void CUIItemInfo::Slot15(int width, int height) { +void CUIItemInfo::OnCreate(int width, int height) { this->image = new CUIStaticImage(); this->image->SetSize(75, 100); this->image->Move(45, 14); @@ -1497,7 +1497,7 @@ void CUIItemInfo::Slot15(int width, int height) { // OFFSET: 0x009CC580 // FUNCTION: fn_14005 -void CUIMonsterInfo::Slot15(int width, int height) { +void CUIMonsterInfo::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(280, 12); this->unknown_00E8->Move(165, 19); @@ -1691,7 +1691,7 @@ void CUIMonsterInfo::Slot15(int width, int height) { // OFFSET: 0x009CFAF0 // FUNCTION: fn_14007 -void CUIQuestInfo::Slot15(int width, int height) { +void CUIQuestInfo::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticImage(); this->unknown_00E8->SetSize(85, 70); this->unknown_00E8->Move(250, 10); @@ -1907,7 +1907,7 @@ void CUIQuestInfo::Slot15(int width, int height) { // OFFSET: 0x009DCE10 // FUNCTION: fn_14330 -void CUICharacterInfo::Slot16() { +void CUICharacterInfo::OnInit() { this->jobIcon->SetImage(std::format("유저인터페이스\\renewalparty\\icon_jobs_{}.bmp", g_session.m_job)); const int level = g_session.m_level; this->level->SetText(std::format("Lv. {}", level)); @@ -1918,7 +1918,7 @@ void CUICharacterInfo::Slot16() { // OFFSET: 0x009DD750 // FUNCTION: fn_14343 -void CUIItemInfo::Slot32(int, int) { +void CUIItemInfo::OnRBtnDown(int, int) { ITEM_INFO info; info.SetItemId(this->itemId); info.unknown_0000[0] = this->type; @@ -2349,7 +2349,7 @@ namespace AdventureGuide { // OFFSET: 0x009C5BB0 // FUNCTION: fn_14001 -void CUIIntro::Slot15(int width, int height) { +void CUIIntro::OnCreate(int width, int height) { this->banner = new CUIStaticImage(); this->banner->SetSize(630, 216); this->banner->Move(0, 0); @@ -2487,7 +2487,7 @@ void CUIIntro::Slot15(int width, int height) { // OFFSET: 0x009C6F50 // FUNCTION: fn_14002 -void CUIItem::Slot15(int width, int height) { +void CUIItem::OnCreate(int width, int height) { CUIListBoxEx* itemList = new CUIListBoxEx(); this->itemList = itemList; itemList->itemWidth = 603; @@ -2650,7 +2650,7 @@ void CUIItem::Slot15(int width, int height) { // OFFSET: 0x009CDD40 // FUNCTION: fn_14006 -void CUIQuest::Slot15(int width, int height) { +void CUIQuest::OnCreate(int width, int height) { CUIListBoxEx* questList = new CUIListBoxEx(); this->questList = questList; questList->itemWidth = 603; @@ -2813,7 +2813,7 @@ void CUIQuest::Slot15(int width, int height) { // OFFSET: 0x009CAE30 // FUNCTION: fn_14004 -void CUIMonster::Slot15(int width, int height) { +void CUIMonster::OnCreate(int width, int height) { CUIListBoxEx* monsterList = new CUIListBoxEx(); this->monsterList = monsterList; monsterList->itemWidth = 603; diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.h b/Source/UI/AdventureGuide/UIAdventureGuide.h index 14a6bb4a6..ddaceb94c 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.h +++ b/Source/UI/AdventureGuide/UIAdventureGuide.h @@ -20,9 +20,9 @@ class CUIQuest; class CUIAdventureGuide : public CUIFrameWnd { public: __declspec(noinline) CUIAdventureGuide(); - void Slot15(int width, int height) override; - void Slot16() override; - virtual void Slot53(); + void OnCreate(int width, int height) override; + void OnInit() override; + virtual void Initialize(); void OnButtonClick(); void OnClose(); @@ -47,7 +47,7 @@ public: explicit CUIPage() : CUIControl() { } - virtual void Slot54(int first, int second) = 0; + virtual void LoadPage(int first, int second) = 0; }; class CUICharacterInfo : public CUIControl { @@ -57,8 +57,8 @@ public: __declspec(noinline) explicit CUICharacterInfo() : CUIControl(), jobIcon(nullptr), level(nullptr), jobLevel(nullptr), name(nullptr) { } - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; /* 0080 */ CUIStaticImage* jobIcon; /* 0084 */ CUIStaticText* level; @@ -73,10 +73,10 @@ public: __declspec(noinline) explicit CUIIntro() : CUIPage(), banner(nullptr), image(nullptr), contents(nullptr) { } - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot54(int first, int second) override; + void LoadPage(int first, int second) override; void OnSelectContents(CUITabInfo* item, const Guide_Intro::Contents& contents); void BindContents(CUITabInfo* item, const Guide_Intro::Contents& contents); @@ -94,10 +94,10 @@ public: : CUIPage(), itemList(nullptr), unknown_0084(nullptr), unknown_0088(nullptr), unknown_008C(), location(-1) { } - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot54(int type, int id) override; + void LoadPage(int type, int id) override; void BindItem(CUIItemInfo* item, const CItemData& data); void OnSelectItem(CUIItemInfo* item, const CItemData& data); void RequestNavigation(); @@ -117,10 +117,10 @@ public: __declspec(noinline) explicit CUIMonster() : CUIPage(), monsterList(nullptr), unknown_0084(nullptr), unknown_0088() { } - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot54(int first, int second) override; + void LoadPage(int first, int second) override; void OnSelectMonster(CUIMonsterInfo* item, const CMonsterData& data); void BindMonster(CUIMonsterInfo* item, const CMonsterData& data); @@ -138,10 +138,10 @@ public: __declspec(noinline) explicit CUIQuest() : CUIPage(), questList(nullptr), unknown_0084(nullptr), unknown_0088(nullptr), unknown_008C() { } - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot54(int type, int id) override; + void LoadPage(int type, int id) override; void OnSelectQuest(CUIQuestInfo* item, const CQuestInfo& data); void RequestNavigation(); diff --git a/Source/UI/Buttons/UIBitmapButton2.h b/Source/UI/Buttons/UIBitmapButton2.h index 85a0e8ba6..7bbc70076 100644 --- a/Source/UI/Buttons/UIBitmapButton2.h +++ b/Source/UI/Buttons/UIBitmapButton2.h @@ -5,10 +5,10 @@ class UIBitmapButton2 : public UIBitmapButton { public: - void Slot10(int argument1, int argument2, std::intptr_t argument3) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void DragAndDrop(int argument1, int argument2, std::intptr_t argument3) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; }; #endif diff --git a/Source/UI/Buttons/UIBmpRadioBtn.h b/Source/UI/Buttons/UIBmpRadioBtn.h index 52d0ed5ef..0ac9a2e02 100644 --- a/Source/UI/Buttons/UIBmpRadioBtn.h +++ b/Source/UI/Buttons/UIBmpRadioBtn.h @@ -25,16 +25,16 @@ class UIBmpRadioBtn : public UIWindow { public: UIBmpRadioBtn(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(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; // INLINED - void Slot47() override { + void OnMouseEnter() override { this->m_hovered = true; this->Invalidate(); } // INLINED - void Slot48() override { + void OnMouseLeave() override { this->m_hovered = false; this->Invalidate(); } @@ -59,8 +59,8 @@ public: UIBmpRadioBtn2() : UIBmpRadioBtn() { } void Invalidate() override; - void Slot47() override; - void Slot48() override; + void OnMouseEnter() override; + void OnMouseLeave() override; }; class UICaptchaImage : public UIWindow { @@ -68,7 +68,7 @@ public: UICaptchaImage(); ~UICaptchaImage() override; void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; /* 007C */ CBitmapRes m_bitmap; diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index 449f7c668..943dbd004 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -59,7 +59,7 @@ void UIButton::Paint() { // OFFSET: 0x0085EB20 // FUNCTION: fn_10839 -void UIButton::Slot25(int, int) { +void UIButton::OnLBtnDown(int, int) { if (this->m_disabled != 0) { return; } @@ -71,29 +71,29 @@ void UIButton::Slot25(int, int) { // OFFSET: 0x0085ED70 // FUNCTION: fn_10847 -void UISpriteButton2::Slot25(int x, int y) { - UIButton::Slot25(x, y); +void UISpriteButton2::OnLBtnDown(int x, int y) { + UIButton::OnLBtnDown(x, y); if (this->m_target) { - this->m_target->Slot25(this->geometry.x + x, this->geometry.y + y); + this->m_target->OnLBtnDown(this->geometry.x + x, this->geometry.y + y); } } // OFFSET: 0x0085EDC0 // FUNCTION: fn_10848 -void UISpriteButton::Slot25(int x, int y) { - UIButton::Slot25(x, y); - this->Root()->Slot25(this->geometry.x + x, this->geometry.y + y); +void UISpriteButton::OnLBtnDown(int x, int y) { + UIButton::OnLBtnDown(x, y); + this->Root()->OnLBtnDown(this->geometry.x + x, this->geometry.y + y); } // OFFSET: 0x0085E8B0 // FUNCTION: fn_10830 -void UIButton::Slot26(int x, int y) { - this->Slot25(x, y); +void UIButton::OnLBtnDblClk(int x, int y) { + this->OnLBtnDown(x, y); } // OFFSET: 0x0085F600 // FUNCTION: fn_10868 -void UIButton::Slot27(int x, int y) { +void UIButton::OnMouseMove(int x, int y) { if (this->m_disabled != 0) { return; } @@ -126,16 +126,16 @@ void UIButton::Slot27(int x, int y) { // OFFSET: 0x0085F7A0 // FUNCTION: fn_10870 -void UISpriteButton2::Slot27(int x, int y) { - UIButton::Slot27(x, y); +void UISpriteButton2::OnMouseMove(int x, int y) { + UIButton::OnMouseMove(x, y); if (this->m_target) { - this->m_target->Slot27(this->geometry.x + x, this->geometry.y + y); + this->m_target->OnMouseMove(this->geometry.x + x, this->geometry.y + y); } } // OFFSET: 0x0085F180 // FUNCTION: fn_10858 -void UIButton::Slot28(int x, int y) { +void UIButton::OnMouseHover(int x, int y) { UIWindow* parent = this->parent; if (parent && (this->geometry.id == 201 || this->geometry.id == 202) && parent->geometry.id != 203) { if (this->geometry.id == 202 && parent->geometry.id != 0) { @@ -155,13 +155,13 @@ void UIButton::Slot28(int x, int y) { } if (this->m_disabled == 0) { - this->Slot27(x, y); + this->OnMouseMove(x, y); } } // OFFSET: 0x0085F900 // FUNCTION: fn_10874 -void UIButton::Slot29(int x, int y) { +void UIButton::OnMouseCheck(int x, int y) { if (x < this->geometry.x || (this->geometry.x + this->geometry.width) < x || y < this->geometry.y || (this->geometry.y + this->geometry.height) < y) { if (this->geometry.unknown_0030 != 0) { this->geometry.unknown_0030 = 0; @@ -183,7 +183,7 @@ void UIButton::ResetCursor(int x, int y) { // OFFSET: 0x0085EED0 // FUNCTION: fn_10852 -void UIButton::Slot31(int x, int y) { +void UIButton::OnLBtnUp(int x, int y) { if (this->m_disabled != 0) { if (g_windowMgr.Capture() == this) { g_windowMgr.ReleaseCapture(); diff --git a/Source/UI/Buttons/UIButton.h b/Source/UI/Buttons/UIButton.h index 3764f81c4..8dcb9dcbd 100644 --- a/Source/UI/Buttons/UIButton.h +++ b/Source/UI/Buttons/UIButton.h @@ -33,13 +33,13 @@ public: UIButton(); ~UIButton() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot29(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnMouseCheck(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; virtual void Enable(unsigned char value); void SetTooltip(const char* text); diff --git a/Source/UI/Buttons/UICashEmotionSprBtn.h b/Source/UI/Buttons/UICashEmotionSprBtn.h index 37a512b79..a1af9530f 100644 --- a/Source/UI/Buttons/UICashEmotionSprBtn.h +++ b/Source/UI/Buttons/UICashEmotionSprBtn.h @@ -9,7 +9,7 @@ class UICashEmotionSprBtn : public UISpriteButton2 { public: UICashEmotionSprBtn(UIWindow* target); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void SetSelected(bool selected); diff --git a/Source/UI/Buttons/UICheckBox.cpp b/Source/UI/Buttons/UICheckBox.cpp index 551636f9b..26c1a9e79 100644 --- a/Source/UI/Buttons/UICheckBox.cpp +++ b/Source/UI/Buttons/UICheckBox.cpp @@ -90,7 +90,7 @@ void UICheckBox::SetHidden(bool hidden) { // OFFSET: 0x0085EB90 // FUNCTION: fn_10841 -void UICheckBox::Slot25(int, int) { +void UICheckBox::OnLBtnDown(int, int) { if (this->m_disabled != 0 || g_replayAnimationScaling) { return; } @@ -104,12 +104,12 @@ void UICheckBox::Slot25(int, int) { // OFFSET: 0x0085F310 // FUNCTION: fn_10859 -void UICheckBox::Slot28(int x, int y) { +void UICheckBox::OnMouseHover(int x, int y) { if (this->m_disabled != 0) { return; } - this->Slot27(x, y); + this->OnMouseMove(x, y); if (this->m_tooltip.empty()) { return; } diff --git a/Source/UI/Buttons/UICheckBox.h b/Source/UI/Buttons/UICheckBox.h index 947d385b0..bdfbdb3aa 100644 --- a/Source/UI/Buttons/UICheckBox.h +++ b/Source/UI/Buttons/UICheckBox.h @@ -17,8 +17,8 @@ public: UICheckBox(); ~UICheckBox() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; void ResetCursor(int x, int y) override; void SetChecked(int value); void SetImages(const char* checked, const char* unchecked, const char* text); diff --git a/Source/UI/Buttons/UIDescriptRace.cpp b/Source/UI/Buttons/UIDescriptRace.cpp index ef597a055..0dbe5e7c7 100644 --- a/Source/UI/Buttons/UIDescriptRace.cpp +++ b/Source/UI/Buttons/UIDescriptRace.cpp @@ -15,7 +15,7 @@ UIDescriptRace::UIDescriptRace(int race) : m_race(race), unknown_0284(0) { // OFFSET: 0x008861C0 // FUNCTION: fn_11323 -void UIDescriptRace::Slot15(int, int) { +void UIDescriptRace::OnCreate(int, int) { this->SendMsg(nullptr, 13, this->m_noRace, 0, 0, 0); } diff --git a/Source/UI/Buttons/UIDescriptRace.h b/Source/UI/Buttons/UIDescriptRace.h index 121e90875..6c7412de7 100644 --- a/Source/UI/Buttons/UIDescriptRace.h +++ b/Source/UI/Buttons/UIDescriptRace.h @@ -22,8 +22,8 @@ struct UIDescriptRaceText { class UIDescriptRace : public UIBitmapButton { public: explicit UIDescriptRace(int race); - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(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 Paint() override; void DrawRaceDescription(); diff --git a/Source/UI/Buttons/UIItemMoveInfo.h b/Source/UI/Buttons/UIItemMoveInfo.h index 737c30a76..5b83e2590 100644 --- a/Source/UI/Buttons/UIItemMoveInfo.h +++ b/Source/UI/Buttons/UIItemMoveInfo.h @@ -10,8 +10,8 @@ class UIItemMoveInfo : public UITextButton { public: UIItemMoveInfo(); void Paint() override; - void Slot28(int x, int y) override; - void Slot48() override; + void OnMouseHover(int x, int y) override; + void OnMouseLeave() override; protected: /* 00F8 */ int m_moveIndex; diff --git a/Source/UI/Buttons/UIItemTagButton.h b/Source/UI/Buttons/UIItemTagButton.h index 6b7bbaa3d..0ab0557e2 100644 --- a/Source/UI/Buttons/UIItemTagButton.h +++ b/Source/UI/Buttons/UIItemTagButton.h @@ -13,8 +13,8 @@ public: UIItemTagButton(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; /* 00F8 */ unsigned char unknown_00F8[0xF0]; /* 01E8 */ unsigned char unknown_01E8[0x8]; diff --git a/Source/UI/Buttons/UIJobSlotButton.cpp b/Source/UI/Buttons/UIJobSlotButton.cpp index 18e417513..6da8cf0ad 100644 --- a/Source/UI/Buttons/UIJobSlotButton.cpp +++ b/Source/UI/Buttons/UIJobSlotButton.cpp @@ -9,8 +9,8 @@ UIJobSlotButton::~UIJobSlotButton() = default; // OFFSET: 0x007BFC70 // FUNCTION: fn_09307 -void UIJobSlotButton::Slot31(int x, int y) { - this->UIButton::Slot31(x, y); +void UIJobSlotButton::OnLBtnUp(int x, int y) { + this->UIButton::OnLBtnUp(x, y); this->SetSelected(this->selected == 0); } diff --git a/Source/UI/Buttons/UIJobSlotButton.h b/Source/UI/Buttons/UIJobSlotButton.h index 3dba9acc2..4af03f16d 100644 --- a/Source/UI/Buttons/UIJobSlotButton.h +++ b/Source/UI/Buttons/UIJobSlotButton.h @@ -7,7 +7,7 @@ class UIJobSlotButton : public UIBitmapButton { public: UIJobSlotButton(); ~UIJobSlotButton() override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; __declspec(noinline) void SetSelected(unsigned char value); /* 0120 */ std::string selectedImage; diff --git a/Source/UI/Buttons/UINaviLinkButton.cpp b/Source/UI/Buttons/UINaviLinkButton.cpp index a569eefad..ea9ac845d 100644 --- a/Source/UI/Buttons/UINaviLinkButton.cpp +++ b/Source/UI/Buttons/UINaviLinkButton.cpp @@ -11,7 +11,7 @@ UINaviLinkButton::~UINaviLinkButton() = default; // OFFSET: 0x00893050 // FUNCTION: fn_11503 -void UINaviLinkButton::Slot25(int, int) { +void UINaviLinkButton::OnLBtnDown(int, int) { const auto end = this->link.find(g_naviLinkTagEnd); if (end == std::string::npos) { diff --git a/Source/UI/Buttons/UINaviLinkButton.h b/Source/UI/Buttons/UINaviLinkButton.h index d6cbe86d3..b36da0729 100644 --- a/Source/UI/Buttons/UINaviLinkButton.h +++ b/Source/UI/Buttons/UINaviLinkButton.h @@ -7,7 +7,7 @@ class UINaviLinkButton : public UITextButton { public: UINaviLinkButton(); ~UINaviLinkButton() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; std::string Link(); /* 00F8 */ std::string link; /* 0110 */ int column; diff --git a/Source/UI/Buttons/UIRadioBtn.cpp b/Source/UI/Buttons/UIRadioBtn.cpp index df46161a4..b3d6c9367 100644 --- a/Source/UI/Buttons/UIRadioBtn.cpp +++ b/Source/UI/Buttons/UIRadioBtn.cpp @@ -48,7 +48,7 @@ void UIRadioBtn::Paint() { // OFFSET: 0x0085ECB0 // FUNCTION: fn_10844 -void UIRadioBtn::Slot25(int, int) { +void UIRadioBtn::OnLBtnDown(int, int) { if (this->parent && this->enabled != 0) { this->parent->SendMsg(this, 6, this->geometry.id, this->value, 0, 0); } @@ -56,8 +56,8 @@ void UIRadioBtn::Slot25(int, int) { // OFFSET: 0x0085F400 // FUNCTION: fn_10861 -void UIRadioBtn::Slot28(int x, int y) { - this->Slot27(x, y); +void UIRadioBtn::OnMouseHover(int x, int y) { + this->OnMouseMove(x, y); if (this->tooltip.size()) { x = 10; y = -20; diff --git a/Source/UI/Buttons/UIRadioBtn.h b/Source/UI/Buttons/UIRadioBtn.h index 391179e96..56d16c4c0 100644 --- a/Source/UI/Buttons/UIRadioBtn.h +++ b/Source/UI/Buttons/UIRadioBtn.h @@ -11,8 +11,8 @@ public: UIRadioBtn(); ~UIRadioBtn() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(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 SetText(const char* value); diff --git a/Source/UI/Buttons/UIRadioButton.h b/Source/UI/Buttons/UIRadioButton.h index e705f45f6..6c8108136 100644 --- a/Source/UI/Buttons/UIRadioButton.h +++ b/Source/UI/Buttons/UIRadioButton.h @@ -15,8 +15,8 @@ public: void SetOnCheck(std::function callback); void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; }; class CUIRadioButton : public CUICheckBox { @@ -25,7 +25,7 @@ public: CUIRadioButton(); void SetOnSelect(std::function callback); - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; }; class CUIRadioItem : public CUIControl { diff --git a/Source/UI/Buttons/UIReplayButton.h b/Source/UI/Buttons/UIReplayButton.h index 1e277a28b..94749028d 100644 --- a/Source/UI/Buttons/UIReplayButton.h +++ b/Source/UI/Buttons/UIReplayButton.h @@ -7,7 +7,7 @@ class UIReplayButton : public UIBitmapButton { public: UIReplayButton(); - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; }; #endif diff --git a/Source/UI/Buttons/UISlotBmpButton.h b/Source/UI/Buttons/UISlotBmpButton.h index 5667f6996..6d4447651 100644 --- a/Source/UI/Buttons/UISlotBmpButton.h +++ b/Source/UI/Buttons/UISlotBmpButton.h @@ -10,12 +10,12 @@ class UISlotBmpButton : public UIBitmapButton { public: UISlotBmpButton(int index, bool); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnRBtnDown(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 SetSlot(int slot, int fallback); diff --git a/Source/UI/Buttons/UISpriteButton.h b/Source/UI/Buttons/UISpriteButton.h index daaae92f1..efecac19c 100644 --- a/Source/UI/Buttons/UISpriteButton.h +++ b/Source/UI/Buttons/UISpriteButton.h @@ -10,10 +10,10 @@ public: UISpriteButton(); __declspec(noinline) ~UISpriteButton() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; int FrameHeight(int action, int frame); int FrameWidth(int action, int frame); @@ -48,13 +48,13 @@ class UISpriteButton2 : public UISpriteButton { public: __declspec(noinline) UISpriteButton2(UIWindow* target); ~UISpriteButton2() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot35(int argument) override; - void Slot47() override; - void Slot48() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnWheel(int argument) override; + void OnMouseEnter() override; + void OnMouseLeave() override; protected: /* 0114 */ UIWindow* m_target; diff --git a/Source/UI/Buttons/UITVBitmapButton.h b/Source/UI/Buttons/UITVBitmapButton.h index 715d06bbb..befd22c89 100644 --- a/Source/UI/Buttons/UITVBitmapButton.h +++ b/Source/UI/Buttons/UITVBitmapButton.h @@ -8,9 +8,9 @@ class UITVBitmapButton : public UIBitmapButton { public: UITVBitmapButton(); - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; protected: /* 0120 */ int m_value; diff --git a/Source/UI/Buttons/UITVTextButton.h b/Source/UI/Buttons/UITVTextButton.h index a4ef1ba4c..60fe1657e 100644 --- a/Source/UI/Buttons/UITVTextButton.h +++ b/Source/UI/Buttons/UITVTextButton.h @@ -12,13 +12,13 @@ class UITVTextButton : public UIButton { public: UITVTextButton(); void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; void ResizeToText(); void SetLabel(std::string text); diff --git a/Source/UI/Buttons/UITagButton.cpp b/Source/UI/Buttons/UITagButton.cpp index bd8f3dbc1..f527147ae 100644 --- a/Source/UI/Buttons/UITagButton.cpp +++ b/Source/UI/Buttons/UITagButton.cpp @@ -14,7 +14,7 @@ UITagButton::UITagButton() : UITextButton(), item(), m_strings() { // OFFSET: 0x009B54A0 // FUNCTION: fn_13844 -void UITagButton::Slot31(int x, int y) { +void UITagButton::OnLBtnUp(int x, int y) { if (this->m_disabled != 0) { return; } diff --git a/Source/UI/Buttons/UITagButton.h b/Source/UI/Buttons/UITagButton.h index 0a61d0ce8..5faaef2ae 100644 --- a/Source/UI/Buttons/UITagButton.h +++ b/Source/UI/Buttons/UITagButton.h @@ -17,7 +17,7 @@ public: /* 00F8 */ ITEM_INFO item; /* 01F0 */ std::vector m_strings; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; void AddString(std::string text); std::string GetString(std::size_t index); diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index 7a084de32..9dfa7e08d 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -87,8 +87,8 @@ void UITextButton::Configure(const char* text, std::uint32_t color, int family, const auto extent = static_cast(height) * static_cast(std::strlen(text)); const int width = static_cast(extent / 2 + 4u * outline + 12u); this->UIWindow::Resize(width, height + 2); - this->Slot15(width, height + 2); - this->Slot22(width, height + 2); + this->OnCreate(width, height + 2); + this->OnSize(width, height + 2); } // OFFSET: 0x0088F820 @@ -112,7 +112,7 @@ void UITextButton::Paint() { // OFFSET: 0x00892450 // FUNCTION: fn_11471 -void UITextButton::Slot27(int x, int y) { +void UITextButton::OnMouseMove(int x, int y) { if (this->m_disabled != 0) { return; } @@ -150,17 +150,17 @@ void UITextButton::Slot27(int x, int y) { // OFFSET: 0x00892000 // FUNCTION: fn_11461 -void UITextButton::Slot28(int x, int y) { +void UITextButton::OnMouseHover(int x, int y) { if (this->parent) { - this->parent->Slot28((x + this->geometry.x), (y + this->geometry.y)); + this->parent->OnMouseHover((x + this->geometry.x), (y + this->geometry.y)); } - UIButton::Slot28(x, y); + UIButton::OnMouseHover(x, y); } // OFFSET: 0x00891140 // FUNCTION: fn_11445 -void UITextButton::Slot31(int x, int y) { +void UITextButton::OnLBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -183,7 +183,7 @@ void UITextButton::Slot31(int x, int y) { // OFFSET: 0x00892B60 // FUNCTION: fn_11487 -void UITextButton::Slot32(int, int) { +void UITextButton::OnRBtnDown(int, int) { if (this->m_disabled == 0) { if (this->parent) { this->parent->SendMsg(this, 99, this->geometry.id, this->m_value, 0, 0); @@ -195,7 +195,7 @@ void UITextButton::Slot32(int, int) { // OFFSET: 0x00892D60 // FUNCTION: fn_11494 -void UITextButton::Slot33(int x, int y) { +void UITextButton::OnRBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; @@ -217,15 +217,15 @@ void UITextButton::Slot33(int x, int y) { // OFFSET: 0x00892F30 // FUNCTION: fn_11500 -void UITextButton::Slot35(int value) { +void UITextButton::OnWheel(int value) { if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x008911D0 // FUNCTION: fn_11446 -void UITreeView::Slot31(int x, int y) { +void UITreeView::OnLBtnUp(int x, int y) { if (x >= 0 && x < this->geometry.width && y >= 0 && y < this->geometry.height) { this->unknown_0088 = 0; } @@ -236,30 +236,30 @@ void UITreeView::Slot31(int x, int y) { this->Invalidate(); if (this->parent) { - this->parent->Slot31(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnUp(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x00891A80 // FUNCTION: fn_11455 -void UIItemTagButton::Slot28(int x, int y) { +void UIItemTagButton::OnMouseHover(int x, int y) { std::string tag = "<"; tag += this->m_tooltip; tag += ">"; if (this->label != tag) { - UIButton::Slot28(x, y); + UIButton::OnMouseHover(x, y); } } // OFFSET: 0x00891F10 // FUNCTION: fn_11459 -void UIStaticItem_Illust::Slot28(int, int) { +void UIStaticItem_Illust::OnMouseHover(int, int) { } // OFFSET: 0x00891810 // FUNCTION: fn_11450 -void UIBmpRadioBtn::Slot28(int, int) { +void UIBmpRadioBtn::OnMouseHover(int, int) { if (!this->m_tooltip.empty()) { int screenX = 0, screenY = -20; this->ToScreen(screenX, screenY); @@ -369,21 +369,21 @@ void UIBmpRadioBtn2::Invalidate() { // OFFSET: 0x007C7CA0 // FUNCTION: fn_09408 -void UIBmpRadioBtn2::Slot47() { +void UIBmpRadioBtn2::OnMouseEnter() { this->m_hovered = true; this->Invalidate(); } // OFFSET: 0x007C7CB0 // FUNCTION: fn_09409 -void UIBmpRadioBtn2::Slot48() { +void UIBmpRadioBtn2::OnMouseLeave() { this->m_hovered = false; this->Invalidate(); } // OFFSET: 0x00891870 // FUNCTION: fn_11451 -void UICaptchaImage::Slot28(int, int) { +void UICaptchaImage::OnMouseHover(int, int) { if (this->m_tooltip.size() > 0) { int screenX = 0, screenY = -20; this->ToScreen(screenX, screenY); @@ -394,7 +394,7 @@ void UICaptchaImage::Slot28(int, int) { // OFFSET: 0x00891240 // FUNCTION: fn_11447 -void UIBarGraph4::Slot28(int, int) { +void UIBarGraph4::OnMouseHover(int, int) { if (!this->m_current || !this->m_maximum || *this->m_maximum < *this->m_current || *this->m_maximum == 0) { return; } @@ -415,7 +415,7 @@ void UIBarGraph4::Slot28(int, int) { // OFFSET: 0x008918D0 // FUNCTION: fn_11452 -void UIINT64BarGraph::Slot28(int, int) { +void UIINT64BarGraph::OnMouseHover(int, int) { if (this->m_maximum < this->m_current || 0 == this->m_maximum || this->m_maximum == 99999999) { return; } @@ -436,13 +436,13 @@ void UIINT64BarGraph::Slot28(int, int) { // OFFSET: 0x00891A40 // FUNCTION: fn_11454 -void UIItemMoveInfo::Slot28(int, int) { +void UIItemMoveInfo::OnMouseHover(int, int) { g_windowMgr.EnsureWindow(276)->SendMsg(nullptr, 147, this->m_moveIndex, 0, 0, 0); } // OFFSET: 0x00891A10 // FUNCTION: fn_11453 -void UIImgMenu::Slot28(int x, int y) { +void UIImgMenu::OnMouseHover(int x, int y) { const int previous = this->hovered; this->hovered = this->ItemAt(x, y); if (previous != this->hovered) { @@ -452,7 +452,7 @@ void UIImgMenu::Slot28(int x, int y) { // OFFSET: 0x00891F20 // FUNCTION: fn_11460 -void UITabControl::Slot28(int x, int y) { +void UITabControl::OnMouseHover(int x, int y) { int index = this->TabAt(x, y); if (index == -1) { @@ -503,7 +503,7 @@ std::string SkillUseTextFlat(const char* name, int level, int sp, int ap) { // OFFSET: 0x00891350 // FUNCTION: fn_11448 -void UIBasicItemCtrl::Slot28(int, int) { +void UIBasicItemCtrl::OnMouseHover(int, int) { std::string text; if (std::atoi(this->m_item.itemId.c_str()) < 1) { @@ -530,7 +530,7 @@ void UIBasicItemCtrl::Slot28(int, int) { // OFFSET: 0x008915E0 // FUNCTION: fn_11449 -void UIBasicSkillCtrl::Slot28(int, int) { +void UIBasicSkillCtrl::OnMouseHover(int, int) { if (this->m_skillId < 0) { return; } @@ -569,7 +569,7 @@ void UIWindowMgr::AddRendered(UIWindow* window) { // OFFSET: 0x00891CC0 // FUNCTION: fn_11457 -void UIServerListBox::Slot28(int x, int y) { +void UIServerListBox::OnMouseHover(int x, int y) { const int index = this->LineAt(x, y); const int height = g_mouse.y; if (this->balloonTexts.begin() != this->balloonTexts.end()) { @@ -597,7 +597,7 @@ void UIServerListBox::Slot28(int x, int y) { // OFFSET: 0x00891BC0 // FUNCTION: fn_11456 -void UIMemberListBox::Slot28(int, int y) { +void UIMemberListBox::OnMouseHover(int, int y) { const int line = this->topLine + y / this->lineHeight; if (line < this->topLine) { return; @@ -626,7 +626,7 @@ void UIMemberListBox::Slot28(int, int y) { // OFFSET: 0x00891E40 // FUNCTION: fn_11458 -void UIStaticItem::Slot28(int, int) { +void UIStaticItem::OnMouseHover(int, int) { char text[260]; std::memset(text, 0, sizeof(text)); int capacity = sizeof(text); @@ -648,7 +648,7 @@ void UIStaticItem::Slot28(int, int) { // OFFSET: 0x00892040 // FUNCTION: fn_11462 -void UIItemMoveInfo::Slot48() { +void UIItemMoveInfo::OnMouseLeave() { g_windowMgr.ShowWindowById(276, 0); this->Invalidate(); } @@ -659,8 +659,8 @@ void UIComboBox::Configure(int x, int y, int width, int height, unsigned char va this->transparent = value; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x008974A0 @@ -679,8 +679,8 @@ void UIComboBox::Resize(int width, int height) { // OFFSET: 0x00885240 // FUNCTION: fn_11317 -void UIComboBox::Slot15(int width, int height) { - UIListBox::Slot15(width, height); +void UIComboBox::OnCreate(int width, int height) { + UIListBox::OnCreate(width, height); } // OFFSET: 0x00895AC0 @@ -937,7 +937,7 @@ int UIBmpRadioBtn::SendMsg(UIWindow*, int message, std::intptr_t argument1, std: // OFFSET: 0x00892060 // FUNCTION: fn_11463 -void UIComboBox::Slot27(int x, int y) { +void UIComboBox::OnMouseMove(int x, int y) { const int previous = this->selected; this->selected = this->LineAt(x, y); @@ -948,7 +948,7 @@ void UIComboBox::Slot27(int x, int y) { // OFFSET: 0x00892100 // FUNCTION: fn_11465 -void UIComboBoxID::Slot27(int x, int y) { +void UIComboBoxID::OnMouseMove(int x, int y) { const int previous = this->selected; int line; @@ -968,13 +968,13 @@ void UIComboBoxID::Slot27(int x, int y) { // OFFSET: 0x00892160 // FUNCTION: fn_11466 -void UIImgMenu::Slot27(int x, int y) { - this->Slot28(x, y); +void UIImgMenu::OnMouseMove(int x, int y) { + this->OnMouseHover(x, y); } // OFFSET: 0x00892170 // FUNCTION: fn_11467 -void UIItemStoreComboBox::Slot27(int x, int y) { +void UIItemStoreComboBox::OnMouseMove(int x, int y) { const int previous = this->selected; int line; @@ -994,7 +994,7 @@ void UIItemStoreComboBox::Slot27(int x, int y) { // OFFSET: 0x00892340 // FUNCTION: fn_11469 -void UITVTextButton::Slot27(int x, int y) { +void UITVTextButton::OnMouseMove(int x, int y) { if (this->m_disabled != 0) { return; } @@ -1017,7 +1017,7 @@ void UITVTextButton::Slot27(int x, int y) { // OFFSET: 0x008923D0 // FUNCTION: fn_11470 -void UITabControl::Slot27(int x, int y) { +void UITabControl::OnMouseMove(int x, int y) { if (g_windowMgr.Capture() != this) { return; } @@ -1034,7 +1034,7 @@ void UITabControl::Slot27(int x, int y) { // OFFSET: 0x00892520 // FUNCTION: fn_11472 -void UITreeView::Slot27(int x, int y) { +void UITreeView::OnMouseMove(int x, int y) { this->unknown_00AC = x >= 0 && x < this->geometry.width && y >= 0 && y < this->geometry.height; } @@ -1073,7 +1073,7 @@ void UITVTextButton::ResetCursor(int x, int y) { // OFFSET: 0x00892600 // FUNCTION: fn_11477 -void UIEditCtrl_Currency::Slot19() { +void UIEditCtrl_Currency::OnProcess() { if (this->formattedLength == this->text.size()) { return; } @@ -1126,7 +1126,7 @@ void UIEditCtrl_Currency::Slot19() { // OFFSET: 0x00892910 // FUNCTION: fn_11478 -void UISlotBmpButton::Slot19() { +void UISlotBmpButton::OnProcess() { ++this->unknown_0134; if (this->unknown_0134 / this->unknown_0136 > 7) { @@ -1136,7 +1136,7 @@ void UISlotBmpButton::Slot19() { // OFFSET: 0x00892940 // FUNCTION: fn_11479 -void UIBasicItemCtrl::Slot32(int, int) { +void UIBasicItemCtrl::OnRBtnDown(int, int) { if (std::atoi(this->m_item.itemId.c_str()) > 0) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&this->m_item), 0, 0, 0); } @@ -1144,7 +1144,7 @@ void UIBasicItemCtrl::Slot32(int, int) { // OFFSET: 0x00892A10 // FUNCTION: fn_11481 -void UIBitmapButton2::Slot32(int, int) { +void UIBitmapButton2::OnRBtnDown(int, int) { if (this->m_disabled == 0) { if (this->parent) { this->parent->SendMsg(this, 101, this->geometry.id, 0, 0, 0); @@ -1156,14 +1156,14 @@ void UIBitmapButton2::Slot32(int, int) { // OFFSET: 0x00892A50 // FUNCTION: fn_11482 -void UIMemberListBox::Slot32(int x, int y) { +void UIMemberListBox::OnRBtnDown(int x, int y) { this->selected = this->LineAt(x, y); this->Invalidate(); } // OFFSET: 0x00892A80 // FUNCTION: fn_11483 -void UISlotBmpButton::Slot32(int, int) { +void UISlotBmpButton::OnRBtnDown(int, int) { if (this->parent) { this->parent->SendMsg(this, 6, this->geometry.id, 226, 0, 0); } @@ -1171,13 +1171,13 @@ void UISlotBmpButton::Slot32(int, int) { // OFFSET: 0x00892AB0 // FUNCTION: fn_11484 -void UIStaticItem::Slot32(int, int) { +void UIStaticItem::OnRBtnDown(int, int) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&this->m_item), 0, 0, 0); } // OFFSET: 0x00892AE0 // FUNCTION: fn_11485 -void UITVBitmapButton::Slot32(int, int) { +void UITVBitmapButton::OnRBtnDown(int, int) { if (this->m_disabled == 0) { if (this->parent) { this->parent->SendMsg(this, 101, this->m_value, 0, 0, 0); @@ -1189,7 +1189,7 @@ void UITVBitmapButton::Slot32(int, int) { // OFFSET: 0x00892B20 // FUNCTION: fn_11486 -void UITVTextButton::Slot32(int x, int y) { +void UITVTextButton::OnRBtnDown(int x, int y) { if (this->m_disabled == 0) { if (this->parent) { this->parent->SendMsg(this, 99, this->m_value, x, y, 0); @@ -1201,7 +1201,7 @@ void UITVTextButton::Slot32(int x, int y) { // OFFSET: 0x00892BA0 // FUNCTION: fn_11488 -void UIBitmapButton2::Slot33(int x, int y) { +void UIBitmapButton2::OnRBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -1222,7 +1222,7 @@ void UIBitmapButton2::Slot33(int x, int y) { // OFFSET: 0x00882410 // FUNCTION: fn_11301 -bool UIChatHisBox2::Slot08() { +bool UIChatHisBox2::IsTransmitMouseInput() { return false; } @@ -1232,19 +1232,19 @@ void UIChatHisBox2::Configure(int x, int y, int width, int height, unsigned char this->transparent = 0; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x00892C20 // FUNCTION: fn_11489 -void UIChatHisBox2::Slot33(int x, int y) { - this->parent->Slot33(x + this->geometry.x, y + this->geometry.y); +void UIChatHisBox2::OnRBtnUp(int x, int y) { + this->parent->OnRBtnUp(x + this->geometry.x, y + this->geometry.y); } // OFFSET: 0x00892C50 // FUNCTION: fn_11490 -void UIMemberListBox::Slot33(int, int) { +void UIMemberListBox::OnRBtnUp(int, int) { if (this->parent) { this->parent->SendMsg(nullptr, 49, 0, 0, 0, 0); } @@ -1252,7 +1252,7 @@ void UIMemberListBox::Slot33(int, int) { // OFFSET: 0x00892CA0 // FUNCTION: fn_11492 -void UITVBitmapButton::Slot33(int x, int y) { +void UITVBitmapButton::OnRBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -1273,7 +1273,7 @@ void UITVBitmapButton::Slot33(int x, int y) { // OFFSET: 0x00892D20 // FUNCTION: fn_11493 -void UITVTextButton::Slot33(int x, int y) { +void UITVTextButton::OnRBtnUp(int x, int y) { if (this->m_disabled == 0) { if (this->parent) { this->parent->SendMsg(this, 99, this->m_value, x, y, 0); @@ -1285,7 +1285,7 @@ void UITVTextButton::Slot33(int x, int y) { // OFFSET: 0x00892DE0 // FUNCTION: fn_11495 -void UIComboBoxV2Wnd::Slot35(int value) { +void UIComboBoxV2Wnd::OnWheel(int value) { this->selected += value < 0 ? 1 : -1; const int count = static_cast(this->list->lines.size()); @@ -1418,7 +1418,7 @@ void UIComboBoxID::Refresh() { // OFFSET: 0x00892EE0 // FUNCTION: fn_11498 -void UIListBoxID::Slot35(int value) { +void UIListBoxID::OnWheel(int value) { if (this->verticalOverflow != 0) { if (value < 0) { this->SendMsg(this->verticalBar, 7, 3, 0, 0, 0); @@ -1430,7 +1430,7 @@ void UIListBoxID::Slot35(int value) { // OFFSET: 0x00892F50 // FUNCTION: fn_11501 -void UITreeView::Slot35(int value) { +void UITreeView::OnWheel(int value) { if (this->verticalOverflow != 0) { if (value < 0) { this->SendMsg(this->verticalBar, 7, 3, 0, 0, 0); @@ -1442,8 +1442,8 @@ void UITreeView::Slot35(int value) { // OFFSET: 0x008861E0 // FUNCTION: fn_11324 -void UIItemStoreComboBox::Slot15(int width, int height) { - this->UIListBoxEx::Slot15(width, height); +void UIItemStoreComboBox::OnCreate(int width, int height) { + this->UIListBoxEx::OnCreate(width, height); this->lineHeight = 15; } @@ -1453,12 +1453,12 @@ void UITreeView::Resize(int width, int height) { UIWindow::Resize(width, height); this->verticalBar->Move(this->geometry.width - 10, 0); this->verticalBar->Resize(this->verticalBar->geometry.width, height); - this->Slot53(); + this->UpdateScrollBar(); } // OFFSET: 0x008961F0 // FUNCTION: fn_11516 -void UITreeView::Slot53() { +void UITreeView::UpdateScrollBar() { const int visible = this->geometry.height / this->itemHeight; const int count = this->itemCount; const int excess = count - visible; @@ -1561,7 +1561,7 @@ void UITVTextButton::Paint() { // OFFSET: 0x0088FFB0 // FUNCTION: fn_11397 -void UIBasicItemCtrl::Slot26(int, int) { +void UIBasicItemCtrl::OnLBtnDblClk(int, int) { this->m_item = ITEM_INFO(0); if (this->Root()) { @@ -1574,7 +1574,7 @@ void UIBasicItemCtrl::Slot26(int, int) { // OFFSET: 0x00890080 // FUNCTION: fn_11398 -void UIBasicSkillCtrl::Slot26(int, int) { +void UIBasicSkillCtrl::OnLBtnDblClk(int, int) { this->m_skillId = -1; if (this->Root()) { @@ -1587,18 +1587,18 @@ void UIBasicSkillCtrl::Slot26(int, int) { // OFFSET: 0x00890150 // FUNCTION: fn_11400 -void UIComboBox::Slot26(int, int) { +void UIComboBox::OnLBtnDblClk(int, int) { } // OFFSET: 0x00890170 // FUNCTION: fn_11402 -void UIComboBoxID::Slot26(int, int) { +void UIComboBoxID::OnLBtnDblClk(int, int) { } // OFFSET: 0x008902A0 // FUNCTION: fn_11408 -void UISlotBmpButton::Slot26(int x, int y) { - UIBitmapButton::Slot26(x, y); +void UISlotBmpButton::OnLBtnDblClk(int x, int y) { + UIBitmapButton::OnLBtnDblClk(x, y); if (this->parent) { this->parent->SendMsg(this, 6, 184, 0, 0, 0); @@ -1607,7 +1607,7 @@ void UISlotBmpButton::Slot26(int x, int y) { // OFFSET: 0x008902E0 // FUNCTION: fn_11409 -void UITVTextButton::Slot26(int x, int y) { +void UITVTextButton::OnLBtnDblClk(int x, int y) { if (this->m_disabled != 0) { return; } @@ -1623,7 +1623,7 @@ void UITVTextButton::Slot26(int x, int y) { // OFFSET: 0x00890400 // FUNCTION: fn_11411 -void UIBmpRadioBtn::Slot25(int, int) { +void UIBmpRadioBtn::OnLBtnDown(int, int) { if (this->parent) { this->parent->SendMsg(this, 6, this->geometry.id, this->m_value, 0, 0); } @@ -1631,17 +1631,17 @@ void UIBmpRadioBtn::Slot25(int, int) { // OFFSET: 0x00890450 // FUNCTION: fn_11413 -void UIComboBox::Slot25(int, int) { +void UIComboBox::OnLBtnDown(int, int) { } // OFFSET: 0x00890470 // FUNCTION: fn_11415 -void UIComboBoxID::Slot25(int, int) { +void UIComboBoxID::OnLBtnDown(int, int) { } // OFFSET: 0x008905F0 // FUNCTION: fn_11420 -void UIListBoxID::Slot25(int x, int y) { +void UIListBoxID::OnLBtnDown(int x, int y) { int line; if (x < 0 || y < 0 || x >= this->geometry.width || y >= this->geometry.height) { @@ -1657,7 +1657,7 @@ void UIListBoxID::Slot25(int x, int y) { // OFFSET: 0x00890640 // FUNCTION: fn_11421 -void UIListBoxNavi::Slot25(int x, int y) { +void UIListBoxNavi::OnLBtnDown(int x, int y) { if (g_replayAnimationScaling != 0) { return; } @@ -1673,15 +1673,15 @@ void UIListBoxNavi::Slot25(int x, int y) { // OFFSET: 0x00890690 // FUNCTION: fn_11422 -void UIMemberListBox::Slot25(int x, int y) { +void UIMemberListBox::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); this->Invalidate(); } // OFFSET: 0x008908A0 // FUNCTION: fn_11426 -void UISlotBmpButton::Slot25(int x, int y) { - UIBitmapButton::Slot25(x, y); +void UISlotBmpButton::OnLBtnDown(int x, int y) { + UIBitmapButton::OnLBtnDown(x, y); if (this->parent) { this->parent->SendMsg(this, 13, 0, 0, 0, 0); @@ -1691,7 +1691,7 @@ void UISlotBmpButton::Slot25(int x, int y) { // OFFSET: 0x008908F0 // FUNCTION: fn_11427 -void UITVTextButton::Slot25(int, int) { +void UITVTextButton::OnLBtnDown(int, int) { if (this->m_disabled != 0) { return; } @@ -1707,7 +1707,7 @@ void UITVTextButton::Slot25(int, int) { // OFFSET: 0x00890940 // FUNCTION: fn_11428 -void UITabControl::Slot25(int x, int y) { +void UITabControl::OnLBtnDown(int x, int y) { const int index = this->TabAt(x, y); if (index == -1) { @@ -1732,15 +1732,15 @@ void UITabControl::Slot25(int x, int y) { // OFFSET: 0x00890A00 // FUNCTION: fn_11430 -void UITreeView::Slot25(int x, int y) { +void UITreeView::OnLBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot25(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnDown(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x00890A30 // FUNCTION: fn_11431 -void UIBitmapButton2::Slot31(int x, int y) { +void UIBitmapButton2::OnLBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -1761,13 +1761,13 @@ void UIBitmapButton2::Slot31(int x, int y) { // OFFSET: 0x00890DA0 // FUNCTION: fn_11437 -void UIComboBoxV2Wnd::Slot31(int, int) { +void UIComboBoxV2Wnd::OnLBtnUp(int, int) { this->SendMsg(nullptr, 6, 273, 0, 0, 0); } // OFFSET: 0x00890E30 // FUNCTION: fn_11439 -void UIItemStoreComboBox::Slot31(int x, int y) { +void UIItemStoreComboBox::OnLBtnUp(int x, int y) { int line; if (x < 0 || y < 0 || x >= this->geometry.width || y >= this->geometry.height) { @@ -1786,7 +1786,7 @@ void UIItemStoreComboBox::Slot31(int x, int y) { // OFFSET: 0x00891050 // FUNCTION: fn_11442 -void UITVBitmapButton::Slot31(int x, int y) { +void UITVBitmapButton::OnLBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -1807,7 +1807,7 @@ void UITVBitmapButton::Slot31(int x, int y) { // OFFSET: 0x008910D0 // FUNCTION: fn_11443 -void UITVTextButton::Slot31(int x, int y) { +void UITVTextButton::OnLBtnUp(int x, int y) { if (this->m_disabled != 0) { return; } @@ -1827,7 +1827,7 @@ void UITVTextButton::Slot31(int x, int y) { // OFFSET: 0x00891130 // FUNCTION: fn_11444 -void UITabControl::Slot31(int, int) { +void UITabControl::OnLBtnUp(int, int) { g_windowMgr.ReleaseCapture(); } @@ -2177,20 +2177,20 @@ void UIZeroQuestScrollBar::Paint() { // OFFSET: 0x00884DD0 // FUNCTION: fn_11313 -void TableBox::Slot15(int, int) { +void TableBox::OnCreate(int, int) { } // OFFSET: 0x00884DE0 // FUNCTION: fn_11314 -void UIChatHisBox2::Slot15(int width, int height) { +void UIChatHisBox2::OnCreate(int width, int height) { auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move(width - 13, 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar2(); @@ -2199,22 +2199,22 @@ void UIChatHisBox2::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize(width - 13, horizontalHeight); horizontal->Move(0, height - 13); - horizontal->Slot15(width - 13, horizontalHeight); - horizontal->Slot22(width - 13, horizontalHeight); + horizontal->OnCreate(width - 13, horizontalHeight); + horizontal->OnSize(width - 13, horizontalHeight); this->AddChild(this->horizontalBar); } // OFFSET: 0x00884F40 // FUNCTION: fn_11315 -void UIChatHisBox3::Slot15(int width, int height) { +void UIChatHisBox3::OnCreate(int width, int height) { auto* vertical = new UIScrollBar3(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move(width - 10, 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar3(); @@ -2223,22 +2223,22 @@ void UIChatHisBox3::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize(width - 10, horizontalHeight); horizontal->Move(0, height - 10); - horizontal->Slot15(width - 10, horizontalHeight); - horizontal->Slot22(width - 10, horizontalHeight); + horizontal->OnCreate(width - 10, horizontalHeight); + horizontal->OnSize(width - 10, horizontalHeight); this->AddChild(this->horizontalBar); } // OFFSET: 0x008850C0 // FUNCTION: fn_11316 -void UIChatHisBox::Slot15(int width, int height) { +void UIChatHisBox::OnCreate(int width, int height) { auto* vertical = new UIScrollBar2(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move(width - 13, 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar2(); @@ -2247,8 +2247,8 @@ void UIChatHisBox::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize(width - 13, horizontalHeight); horizontal->Move(0, height - 13); - horizontal->Slot15(width - 13, horizontalHeight); - horizontal->Slot22(width - 13, horizontalHeight); + horizontal->OnCreate(width - 13, horizontalHeight); + horizontal->OnSize(width - 13, horizontalHeight); this->AddChild(this->horizontalBar); } @@ -2481,7 +2481,7 @@ void UITableBox::Paint() { // OFFSET: 0x008906D0 // FUNCTION: fn_11424 -void UIPackageBoxNameList::Slot25(int x, int y) { +void UIPackageBoxNameList::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); if (this->selected != -1) { this->parent->SendMsg(this, 6, this->geometry.id, this->selected, 0, 0); @@ -2492,15 +2492,15 @@ void UIPackageBoxNameList::Slot25(int x, int y) { // OFFSET: 0x00886AE0 // FUNCTION: fn_11328 -void UIListBoxID::Slot15(int width, int height) { +void UIListBoxID::OnCreate(int width, int height) { auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move((width - 13), 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar(); @@ -2509,27 +2509,27 @@ void UIListBoxID::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize((width - 13), horizontalHeight); horizontal->Move(0, (height - 13)); - horizontal->Slot15((width - 13), horizontalHeight); - horizontal->Slot22((width - 13), horizontalHeight); + horizontal->OnCreate((width - 13), horizontalHeight); + horizontal->OnSize((width - 13), horizontalHeight); this->AddChild(this->horizontalBar); } // OFFSET: 0x00887280 // FUNCTION: fn_11332 -void UITableBox::Slot15(int, int) { +void UITableBox::OnCreate(int, int) { } // OFFSET: 0x008872B0 // FUNCTION: fn_11335 -void UITreeView::Slot15(int width, int height) { +void UITreeView::OnCreate(int width, int height) { auto* vertical = new UIScrollBar3(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move((width - 10), 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); this->edit = new UIEditCtrl2(); @@ -2551,7 +2551,7 @@ void TableBox::Paint() { // OFFSET: 0x008870B0 // FUNCTION: fn_11331 -void UISlotBmpButton::Slot15(int, int) { +void UISlotBmpButton::OnCreate(int, int) { const std::string path = "유저인터페이스\\renewalparty\\"; char name[256]; std::sprintf(name, "%sicon_jobs_%d.bmp", path.c_str(), 0); @@ -2689,7 +2689,7 @@ void __stdcall Nullsub275(int, int, int, int) { // OFFSET: 0x008901E0 // FUNCTION: fn_11405 -void UIListBoxID::Slot26(int, int) { +void UIListBoxID::OnLBtnDblClk(int, int) { if (this->selected != -1) { this->parent->SendMsg(this, 6, this->geometry.id, this->lines[this->selected].id, 0, 0); } @@ -2697,7 +2697,7 @@ void UIListBoxID::Slot26(int, int) { // OFFSET: 0x00890230 // FUNCTION: fn_11406 -void UINewComboBoxCtrl::Slot26(int, int) { +void UINewComboBoxCtrl::OnLBtnDblClk(int, int) { if (this->parent) { this->parent->SendMsg(this, 124, this->selected, 0, 0, 0); } @@ -2705,7 +2705,7 @@ void UINewComboBoxCtrl::Slot26(int, int) { // OFFSET: 0x00890480 // FUNCTION: fn_11416 -void UIDescriptRace::Slot25(int, int) { +void UIDescriptRace::OnLBtnDown(int, int) { if (UIWindow* window = g_windowMgr.LookupWindow(278)) { window->SendMsg(this, 6, 204, 0, 0, 0); } @@ -2720,7 +2720,7 @@ void UIDescriptRace::Paint() { // OFFSET: 0x00890330 // FUNCTION: fn_11410 -void UITabControl::Slot26(int, int) { +void UITabControl::OnLBtnDblClk(int, int) { if (this->layout == 0 || this->layout == 2 || !this->unknown_00A8) { return; } @@ -2760,7 +2760,7 @@ void UIShowAndEditTimeCtrl::Paint() { // OFFSET: 0x008906C0 // FUNCTION: fn_11423 void __fastcall ActivateNaviLink(UINaviLinkButton* button, void*, int x, int y) { - button->UINaviLinkButton::Slot25(x, y); + button->UINaviLinkButton::OnLBtnDown(x, y); } // OFFSET: 0x0088AEC0 @@ -2914,7 +2914,7 @@ void UIComboBox_BmpWnd::Paint() { // OFFSET: 0x008904C0 // FUNCTION: fn_11417 -void UIItemTagButton::Slot25(int x, int y) { +void UIItemTagButton::OnLBtnDown(int x, int y) { if (this->m_disabled != 0) { return; } @@ -2942,7 +2942,7 @@ void UIItemTagButton::Slot25(int x, int y) { // OFFSET: 0x00890AC0 // FUNCTION: fn_11433 -void UIComboBox::Slot31(int x, int y) { +void UIComboBox::OnLBtnUp(int x, int y) { this->selected = this->LineAt(x, y); if (UIWindow* target = g_windowMgr.LookupWindow(this->targetId)) { target->SendMsg(nullptr, 39, this->selected, 0, 0, 0); @@ -2959,7 +2959,7 @@ void UIComboBox::Slot31(int x, int y) { // OFFSET: 0x00890C20 // FUNCTION: fn_11436 -void UIComboBoxID::Slot31(int x, int y) { +void UIComboBoxID::OnLBtnUp(int x, int y) { int line; if (x < 0 || y < 0 || x >= this->geometry.width || y >= this->geometry.height) { @@ -2996,7 +2996,7 @@ void UIComboBoxID::Slot31(int x, int y) { // OFFSET: 0x00892990 // FUNCTION: fn_11480 -void UIBasicSkillCtrl::Slot32(int x, int y) { +void UIBasicSkillCtrl::OnRBtnDown(int x, int y) { if (this->m_skillId < 0) { return; } @@ -3291,7 +3291,7 @@ void UIRechargeGage::Paint() { // OFFSET: 0x00890DC0 // FUNCTION: fn_11438 -void UIImgMenu::Slot31(int x, int y) { +void UIImgMenu::OnLBtnUp(int x, int y) { this->hovered = this->ItemAt(x, y); if (this->hovered != -1 && !this->unknown_0094[this->hovered]) { if (UIWindow* target = g_windowMgr.LookupWindow(this->unknown_00C8)) { @@ -3305,7 +3305,7 @@ void UIImgMenu::Slot31(int x, int y) { // OFFSET: 0x00890EE0 // FUNCTION: fn_11441 -void UIString::Slot31(int, int) { +void UIString::OnLBtnUp(int, int) { if (!this->unknown_0084.empty()) { UIWindow* window = g_windowMgr.EnsureWindow(201); window->SendMsg(nullptr, 62, reinterpret_cast(this->unknown_0084.c_str()), 1, 0, 0); @@ -3504,7 +3504,7 @@ void UITreeView::Paint() { this->HideNodes(this->root->children); this->itemCount = 0; this->LayoutNodes(this->root->children, 0, 0); - this->Slot53(); + this->UpdateScrollBar(); } // OFFSET: 0x0088F450 diff --git a/Source/UI/Buttons/UITextButton.h b/Source/UI/Buttons/UITextButton.h index b273c9b60..e9566d088 100644 --- a/Source/UI/Buttons/UITextButton.h +++ b/Source/UI/Buttons/UITextButton.h @@ -31,12 +31,12 @@ public: __declspec(noinline) UITextButton(); ~UITextButton() override; void Paint() override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int value) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int value) override; void Configure(const char* text, std::uint32_t color, int family, int height, unsigned char outline, unsigned char underline); void ResizeToText(); void ResizeToTextClipped(int width, int height); diff --git a/Source/UI/Buttons/UITextureButton.cpp b/Source/UI/Buttons/UITextureButton.cpp index 11f9908cc..21206116a 100644 --- a/Source/UI/Buttons/UITextureButton.cpp +++ b/Source/UI/Buttons/UITextureButton.cpp @@ -15,7 +15,7 @@ void UITextureButton::Paint() { // OFFSET: 0x0085F060 // FUNCTION: fn_10856 -void UITextureButton::Slot31(int x, int y) { +void UITextureButton::OnLBtnUp(int x, int y) { if (this->m_disabled == 1) { return; } diff --git a/Source/UI/Buttons/UITextureButton.h b/Source/UI/Buttons/UITextureButton.h index 793e794fb..6722b32b7 100644 --- a/Source/UI/Buttons/UITextureButton.h +++ b/Source/UI/Buttons/UITextureButton.h @@ -9,7 +9,7 @@ class UITextureButton : public UIButton { public: void Paint() override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; void VisitChildren() override; /* 00B4 */ int unknown_00B4; diff --git a/Source/UI/CashEmotion/UICashEmotionListWnd.h b/Source/UI/CashEmotion/UICashEmotionListWnd.h index 713cf061a..00ad06cc6 100644 --- a/Source/UI/CashEmotion/UICashEmotionListWnd.h +++ b/Source/UI/CashEmotion/UICashEmotionListWnd.h @@ -20,9 +20,9 @@ class UIStaticText; class UICashEmotionListWnd : public UIFrameWnd { public: UICashEmotionListWnd(); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/CashEmotion/UICashEmotionMiniWnd.h b/Source/UI/CashEmotion/UICashEmotionMiniWnd.h index 400ae6153..4cfb58556 100644 --- a/Source/UI/CashEmotion/UICashEmotionMiniWnd.h +++ b/Source/UI/CashEmotion/UICashEmotionMiniWnd.h @@ -14,7 +14,7 @@ class UICashEmotionMiniWnd : public UIWindow { public: UICashEmotionMiniWnd(); ~UICashEmotionMiniWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/CashEmotion/UICashEmotionPack.h b/Source/UI/CashEmotion/UICashEmotionPack.h index f6ce81d06..ca81e45aa 100644 --- a/Source/UI/CashEmotion/UICashEmotionPack.h +++ b/Source/UI/CashEmotion/UICashEmotionPack.h @@ -19,15 +19,15 @@ class UICashEmotionPack : public UIWindow { public: UICashEmotionPack(); ~UICashEmotionPack() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot35(int argument) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnWheel(int argument) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - virtual int Slot53(int packId, bool showTooltip, bool hoverable); + virtual int SetPack(int packId, bool showTooltip, bool hoverable); virtual void UpdateExpiry(Timestamp* expiry); virtual void ShowExpiry(__time32_t expiry); diff --git a/Source/UI/CashEmotion/UICashEmotionPiece.h b/Source/UI/CashEmotion/UICashEmotionPiece.h index 1e42620df..a3530cb05 100644 --- a/Source/UI/CashEmotion/UICashEmotionPiece.h +++ b/Source/UI/CashEmotion/UICashEmotionPiece.h @@ -10,14 +10,14 @@ class UICashEmotionSprBtn; class UICashEmotionPiece : public UIWindow { public: __declspec(noinline) UICashEmotionPiece(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot26(int x, int y) override; - void Slot35(int argument) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int argument) 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 Slot47() override; - void Slot48() override; + void OnMouseEnter() override; + void OnMouseLeave() override; void Set(int packId, int emotionId, bool showTooltip, bool hoverable, bool locked); diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp index 0ce9d2c48..acde2b8ad 100644 --- a/Source/UI/CashShop/UICashShopWnd.cpp +++ b/Source/UI/CashShop/UICashShopWnd.cpp @@ -113,9 +113,9 @@ EncryptedName<85, 0x3B915119EFD523EFULL>& CashShopReplaceCartItemText::operator( // OFFSET: 0x007CE570 // FUNCTION: fn_09529 -void UICashShopWnd::Slot10(int x, int y, std::intptr_t value) { +void UICashShopWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIFrameWnd::Slot10(x, y, value); + UIFrameWnd::DragAndDrop(x, y, value); return; } @@ -143,9 +143,9 @@ void UICashShopWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x007CE630 // FUNCTION: fn_09530 -void UICashShopWnd_Cart::Slot10(int x, int y, std::intptr_t value) { +void UICashShopWnd_Cart::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -168,17 +168,17 @@ void UICashShopWnd_Cart::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x007CE6C0 // FUNCTION: fn_09531 -void UICashShopWnd_CartItem::Slot10(int x, int y, std::intptr_t value) { +void UICashShopWnd_CartItem::DragAndDrop(int x, int y, std::intptr_t value) { if (this->parent != nullptr) { - this->parent->Slot10(x, y, value); + this->parent->DragAndDrop(x, y, value); } } // OFFSET: 0x007CE6E0 // FUNCTION: fn_09532 -void UICashShopWnd_Item::Slot10(int x, int y, std::intptr_t value) { +void UICashShopWnd_Item::DragAndDrop(int x, int y, std::intptr_t value) { if (this->parent != nullptr) { - this->parent->Slot10(x, y, value); + this->parent->DragAndDrop(x, y, value); } } @@ -193,13 +193,13 @@ void FormatMessageBuffer(char* buffer, const char* format, ...) { // OFFSET: 0x007CE730 // FUNCTION: fn_09534 -bool UICashShopWnd::Slot03() { +bool UICashShopWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x007CE740 // FUNCTION: fn_09535 -void UICashShopWnd::Slot15(int, int) { +void UICashShopWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -351,7 +351,7 @@ void UICashShopWnd::Slot15(int, int) { // OFFSET: 0x007CF760 // FUNCTION: fn_09536 -void UICashShopWnd_Cart::Slot15(int, int) { +void UICashShopWnd_Cart::OnCreate(int, int) { this->m_scrollBar = new UIScrollBar_Custom(); this->m_scrollBar->Configure(this->geometry.width - 7, 0, this->geometry.height, 1, 7, 7); this->m_scrollBar->SetArrowBitmaps("유저인터페이스\\cashshop\\shop_scroll_up.bmp", "유저인터페이스\\cashshop\\shop_scroll_down.bmp"); @@ -374,7 +374,7 @@ void UICashShopWnd_Cart::Slot15(int, int) { // OFFSET: 0x007CFB20 // FUNCTION: fn_09537 -void UICashShopWnd_CartItem::Slot15(int, int) { +void UICashShopWnd_CartItem::OnCreate(int, int) { UIBitmapButton* close = new UIBitmapButton(); close->SetBitmap("유저인터페이스\\cashshop\\btn_close.bmp", 0, 0); close->SetBitmap("유저인터페이스\\cashshop\\btn_close.bmp", 1, 0); @@ -405,7 +405,7 @@ void UICashShopWnd_CartItem::Slot15(int, int) { // OFFSET: 0x007CFD20 // FUNCTION: fn_09538 -void UICashShopWnd_Item::Slot15(int, int) { +void UICashShopWnd_Item::OnCreate(int, int) { this->m_addButton = new UIBmpTextButton(); this->m_addButton->SetBitmap("유저인터페이스\\cashshop\\btn_add_normal.bmp", 0, 0); this->m_addButton->SetBitmap("유저인터페이스\\cashshop\\btn_add_press.bmp", 1, 0); @@ -605,13 +605,13 @@ void UICashShopWnd_Item::Paint() { // OFFSET: 0x007D1020 // FUNCTION: fn_09544 -void UICashShopWnd_CartItem::Slot26(int, int) { +void UICashShopWnd_CartItem::OnLBtnDblClk(int, int) { this->SendMsg(this, 6, 0xD3, 0, 0, 0); } // OFFSET: 0x007D1040 // FUNCTION: fn_09545 -void UICashShopWnd_CartItem::Slot25(int, int) { +void UICashShopWnd_CartItem::OnLBtnDown(int, int) { if (this->m_item.unknown_0000[1] != 0) { static_cast(g_modeMgr.GetGameMode()) ->drag.BeginItem(g_windowMgr, 4, this->m_item, this->m_item.quantity, -1); @@ -620,7 +620,7 @@ void UICashShopWnd_CartItem::Slot25(int, int) { // OFFSET: 0x007D1080 // FUNCTION: fn_09546 -void UICashShopWnd_Item::Slot25(int, int) { +void UICashShopWnd_Item::OnLBtnDown(int, int) { if (this->m_item.unknown_0000[1] != 0) { static_cast(g_modeMgr.GetGameMode())->drag.BeginItem(g_windowMgr, 6, this->m_item, 1, -1); } @@ -628,7 +628,7 @@ void UICashShopWnd_Item::Slot25(int, int) { // OFFSET: 0x007D10B0 // FUNCTION: fn_09547 -void UICashShopWnd_Banner::Slot31(int, int) { +void UICashShopWnd_Banner::OnLBtnUp(int, int) { if (this->m_entries.empty()) { return; } @@ -639,7 +639,7 @@ void UICashShopWnd_Banner::Slot31(int, int) { // OFFSET: 0x007D1160 // FUNCTION: fn_09548 -void UICashShopWnd_CartItem::Slot28(int x, int y) { +void UICashShopWnd_CartItem::OnMouseHover(int x, int y) { if (static_cast(x - 0x30) <= 0x70 && static_cast(y - 0xC) <= 0xB) { int screenX = 0; int screenY = -10; @@ -650,7 +650,7 @@ void UICashShopWnd_CartItem::Slot28(int x, int y) { // OFFSET: 0x007D11D0 // FUNCTION: fn_09549 -void UICashShopWnd_Item::Slot28(int x, int y) { +void UICashShopWnd_Item::OnMouseHover(int x, int y) { if (y <= 0x17) { int screenX = 0; int screenY = -20; @@ -667,7 +667,7 @@ void UICashShopWnd_Banner::ResetCursor(int, int) { // OFFSET: 0x007D1240 // FUNCTION: fn_09551 -void UICashShopWnd::Slot19() { +void UICashShopWnd::OnProcess() { std::string search(this->unknown_00E0->Text()); if (search.compare(LookupMessage(3302)) != 0) { if (search.size() == 0) { @@ -683,15 +683,15 @@ void UICashShopWnd::Slot19() { this->unknown_00F4->SetText(IntToString(0, 0).c_str()); } - this->m_banner->Slot19(); + this->m_banner->OnProcess(); if (g_session.unknown_5912) { - this->m_secondBanner->Slot19(); + this->m_secondBanner->OnProcess(); } } // OFFSET: 0x007D14C0 // FUNCTION: fn_09552 -void UICashShopWnd_Banner::Slot19() { +void UICashShopWnd_Banner::OnProcess() { if (!this->m_entries.empty() && this->m_lastTick + 5000 < timeGetTime()) { const unsigned int next = this->m_index + 1; this->SendMsg(this->m_buttons[next < this->m_entries.size() ? next : 0], 6, 0xD7, 0, 0, 0); @@ -700,7 +700,7 @@ void UICashShopWnd_Banner::Slot19() { // OFFSET: 0x007D1540 // FUNCTION: fn_09553 -void UICashShopWnd_CartItem::Slot33(int x, int) { +void UICashShopWnd_CartItem::OnRBtnUp(int x, int) { if (static_cast(x - 4) <= 0x25) { UIWindow* window = g_windowMgr.EnsureWindow(12); if (window != nullptr) { @@ -711,7 +711,7 @@ void UICashShopWnd_CartItem::Slot33(int x, int) { // OFFSET: 0x007D1590 // FUNCTION: fn_09554 -void UICashShopWnd_Item::Slot33(int x, int y) { +void UICashShopWnd_Item::OnRBtnUp(int x, int y) { if (static_cast(x - 5) <= 0x4B && static_cast(y - 0x17) <= 0x64) { UIWindow* window = g_windowMgr.EnsureWindow(12); if (window != nullptr) { @@ -722,7 +722,7 @@ void UICashShopWnd_Item::Slot33(int x, int y) { // OFFSET: 0x007D15E0 // FUNCTION: fn_09555 -void UICashShopWnd_Cart::Slot35(int delta) { +void UICashShopWnd_Cart::OnWheel(int delta) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 7, 1, 0, 0, 0); } else { @@ -732,9 +732,9 @@ void UICashShopWnd_Cart::Slot35(int delta) { // OFFSET: 0x007D1620 // FUNCTION: fn_09556 -void UICashShopWnd_CartItem::Slot35(int delta) { +void UICashShopWnd_CartItem::OnWheel(int delta) { if (this->parent) { - this->parent->Slot35(delta); + this->parent->OnWheel(delta); } } diff --git a/Source/UI/CashShop/UICashShopWnd.h b/Source/UI/CashShop/UICashShopWnd.h index 00e31a68e..46aa0a27c 100644 --- a/Source/UI/CashShop/UICashShopWnd.h +++ b/Source/UI/CashShop/UICashShopWnd.h @@ -25,10 +25,10 @@ public: }; UICashShopWnd_Banner(); - void Slot19() override; + void OnProcess() override; void Paint() override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(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; /* 007C */ std::vector m_entries; @@ -43,14 +43,14 @@ class UICashShopWnd_CartItem : public UIWindow { public: UICashShopWnd_CartItem(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; /* 0080 */ ITEM_INFO m_item; @@ -60,10 +60,10 @@ class UICashShopWnd_Cart : public UIWindow { public: UICashShopWnd_Cart(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot35(int delta) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; /* 007C */ std::vector m_slots; @@ -80,12 +80,12 @@ public: : UIWindow(0), m_addButton(nullptr), m_largeLayout(false), m_soldOut(nullptr) { } - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnUp(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; /* 007C */ UIBmpTextButton* m_addButton; @@ -98,10 +98,10 @@ class UICashShopWnd : public UIFrameWnd { public: UICashShopWnd(); ~UICashShopWnd() override; - bool Slot03() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot19() override; + bool NeedsFrameRefresh() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() 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 LayoutPage(); diff --git a/Source/UI/Chat/UIChatRoomMakeWnd.h b/Source/UI/Chat/UIChatRoomMakeWnd.h index 18f3dfa05..bfbe51809 100644 --- a/Source/UI/Chat/UIChatRoomMakeWnd.h +++ b/Source/UI/Chat/UIChatRoomMakeWnd.h @@ -27,7 +27,7 @@ public: UIChatRoomMakeWnd(); ~UIChatRoomMakeWnd() override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00B4 */ std::string m_title; diff --git a/Source/UI/Chat/UIChatRoomTitle.cpp b/Source/UI/Chat/UIChatRoomTitle.cpp index 0f106068e..d57004a9d 100644 --- a/Source/UI/Chat/UIChatRoomTitle.cpp +++ b/Source/UI/Chat/UIChatRoomTitle.cpp @@ -20,7 +20,7 @@ UIChatRoomTitle::UIChatRoomTitle() : UIWindow(0) { // OFFSET: 0x0085AB80 // FUNCTION: fn_10785 -void UIChatRoomTitle::Slot15(int, int) { +void UIChatRoomTitle::OnCreate(int, int) { this->label = new UIStaticText(); this->label->SetSize(this->geometry.width - 34, 15); this->label->Move(31, 8); @@ -35,7 +35,7 @@ void UIChatRoomTitle::Slot15(int, int) { // OFFSET: 0x0085E8C0 // FUNCTION: fn_10831 -void UIChatRoomTitle::Slot26(int, int) { +void UIChatRoomTitle::OnLBtnDblClk(int, int) { CMode* mode = g_modeMgr.GetGameMode(); if (this->roomType == 0) { g_windowMgr.EnsureWindow(29)->SendMsg(nullptr, 47, this->roomId, 0, 0, 0); diff --git a/Source/UI/Chat/UIChatRoomTitle.h b/Source/UI/Chat/UIChatRoomTitle.h index 4341b123e..cc16b8945 100644 --- a/Source/UI/Chat/UIChatRoomTitle.h +++ b/Source/UI/Chat/UIChatRoomTitle.h @@ -22,8 +22,8 @@ class UIChatRoomTitle : public UIWindow { public: UIChatRoomTitle(); - void Slot15(int width, int height) override; - void Slot26(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDblClk(int x, int y) override; void Paint() override; void ResetCursor(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Chat/UINewChatWnd.cpp b/Source/UI/Chat/UINewChatWnd.cpp index 0e5fec6ff..acc2d8f51 100644 --- a/Source/UI/Chat/UINewChatWnd.cpp +++ b/Source/UI/Chat/UINewChatWnd.cpp @@ -104,7 +104,7 @@ int UINewChatWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i this->ToScreen(x, y); g_windowMgr.ReleaseCapture(); window->Move(x, y); - window->Slot25(g_mouse.x - this->m_tabWidth * a - x, g_mouse.y - y); + window->OnLBtnDown(g_mouse.x - this->m_tabWidth * a - x, g_mouse.y - y); } this->ApplyHeaderLayout(); return 0; diff --git a/Source/UI/Chat/UINewChatWnd.h b/Source/UI/Chat/UINewChatWnd.h index 2ada9c2e9..d432c5529 100644 --- a/Source/UI/Chat/UINewChatWnd.h +++ b/Source/UI/Chat/UINewChatWnd.h @@ -20,16 +20,16 @@ public: static void SaveChatWndInfo(); void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Move(int x, int y) override; - void Slot11() override; + void StoreInfo() override; void Show(int visible) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; - bool Slot42(void* output) override; - void Slot43() override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; + bool GetCustomTransBoxInfo(void* output) override; + void DrawTransBox() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SaveChatLogs(); void RefreshTabs(bool arrange); diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp index 0cf9ad813..cf276bf3c 100644 --- a/Source/UI/Chat/UISubChatHisWnd.cpp +++ b/Source/UI/Chat/UISubChatHisWnd.cpp @@ -20,18 +20,18 @@ // OFFSET: 0x009312E0 // FUNCTION: fn_12700 -void UISubChatHisWnd::Slot25(int x, int y) { +void UISubChatHisWnd::OnLBtnDown(int x, int y) { if (g_session.m_canDragWnd) { if (UIWindow* window = g_windowMgr.LookupWindow(132)) { window->SendMsg(this, 6, 193, this->m_index, 0, 2); } - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x009309B0 // FUNCTION: fn_12690 -void UISubChatHisWnd::Slot26(int x, int y) { +void UISubChatHisWnd::OnLBtnDblClk(int x, int y) { if (g_session.m_canDragWnd && x > 0 && x < this->m_inputWidth && y > 0 && y < this->m_inputHeight) { this->m_edit->SetText(""); this->m_edit->Resize(this->m_inputWidth - 10, this->m_inputHeight - 2); @@ -42,16 +42,16 @@ void UISubChatHisWnd::Slot26(int x, int y) { // OFFSET: 0x00932B70 // FUNCTION: fn_12715 -void UISubChatHisWnd::Slot27(int x, int y) { +void UISubChatHisWnd::OnMouseMove(int x, int y) { if (g_windowMgr.Capture() == this) { - this->UIFrameWnd::Slot27(x, y); + this->UIFrameWnd::OnMouseMove(x, y); } } // OFFSET: 0x00931710 // FUNCTION: fn_12706 -void UISubChatHisWnd::Slot31(int x, int y) { - this->UIFrameWnd::Slot31(x, y); +void UISubChatHisWnd::OnLBtnUp(int x, int y) { + this->UIFrameWnd::OnLBtnUp(x, y); if (g_session.m_canDragWnd) { int screenX = 0; int screenY = 0; @@ -82,7 +82,7 @@ void UISubChatHisWnd::Move(int x, int y) { // OFFSET: 0x0091C9E0 // FUNCTION: fn_12619 -bool UISubChatHisWnd::Slot42(void* output) { +bool UISubChatHisWnd::GetCustomTransBoxInfo(void* output) { *static_cast(output) = this->m_state; return true; } @@ -111,7 +111,7 @@ void UISubChatHisWnd::Paint() { // OFFSET: 0x00941020 // FUNCTION: fn_12788 -void UISubChatHisWnd::Slot11() { +void UISubChatHisWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.width; this->m_saved->height = this->geometry.height; @@ -122,7 +122,7 @@ void UISubChatHisWnd::Slot11() { // OFFSET: 0x0092A710 // FUNCTION: fn_12655 -void UISubChatHisWnd::Slot15(int width, int height) { +void UISubChatHisWnd::OnCreate(int width, int height) { { const std::string name = "유저인터페이스\\basic_interface\\stickon"; this->m_stickButton = new UIBitmapButton(); diff --git a/Source/UI/Chat/UISubChatHisWnd.h b/Source/UI/Chat/UISubChatHisWnd.h index 2d6fae1d6..4a5a0bb5f 100644 --- a/Source/UI/Chat/UISubChatHisWnd.h +++ b/Source/UI/Chat/UISubChatHisWnd.h @@ -31,15 +31,15 @@ public: UISubChatHisWnd(); void Resize(int width, int height) override; void Move(int x, int y) override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; - bool Slot42(void* output) override; - void Slot43() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; + bool GetCustomTransBoxInfo(void* output) override; + void DrawTransBox() 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 ApplyButtonLayout(); UIChatHisBox* ChatBox() const { return m_chatBox; } diff --git a/Source/UI/Chat/UISubChatMiniWnd.h b/Source/UI/Chat/UISubChatMiniWnd.h index b8d68f1b1..269cfc987 100644 --- a/Source/UI/Chat/UISubChatMiniWnd.h +++ b/Source/UI/Chat/UISubChatMiniWnd.h @@ -6,9 +6,9 @@ class UISubChatMiniWnd : public UIFrameWnd { public: UISubChatMiniWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; private: diff --git a/Source/UI/Chat/UIWhisperWnd.h b/Source/UI/Chat/UIWhisperWnd.h index 4276e1121..d77497e8f 100644 --- a/Source/UI/Chat/UIWhisperWnd.h +++ b/Source/UI/Chat/UIWhisperWnd.h @@ -32,13 +32,13 @@ public: /* 0104 */ std::string m_code; void Move(int x, int y) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot26(int x, int y) override; - void Slot33(int x, int y) override; - bool Slot42(void* output) override; - void Slot43() override; - void Slot11() override; + void OnLBtnDblClk(int x, int y) override; + void OnRBtnUp(int x, int y) override; + bool GetCustomTransBoxInfo(void* output) override; + void DrawTransBox() override; + void StoreInfo() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SaveChatLog(); diff --git a/Source/UI/Clan/UIClanWnd.cpp b/Source/UI/Clan/UIClanWnd.cpp index 7db1c07eb..972b09946 100644 --- a/Source/UI/Clan/UIClanWnd.cpp +++ b/Source/UI/Clan/UIClanWnd.cpp @@ -21,13 +21,13 @@ UIClanInfoManageWnd::UIClanInfoManageWnd() : UIClanWnd(), m_emblem(nullptr) {} // OFFSET: 0x0084CEF0 // FUNCTION: fn_10628 -int UIClanInfoManageWnd::Slot53() { +int UIClanInfoManageWnd::Tab() { return 0; } // OFFSET: 0x0084CFD0 // FUNCTION: fn_10629 -void UIClanInfoManageWnd::Slot15(int width, int height) { +void UIClanInfoManageWnd::OnCreate(int width, int height) { if (!this->m_title) { const char* title = LookupMessage(2355); this->m_title = new UIStaticText(); @@ -161,8 +161,8 @@ void UIClanWnd::Paint() { // OFFSET: 0x0084DA30 // FUNCTION: fn_10632 -void UIClanInfoManageWnd::Slot25(int x, int y) { - UIFrameWnd::Slot25(x, y); +void UIClanInfoManageWnd::OnLBtnDown(int x, int y) { + UIFrameWnd::OnLBtnDown(x, y); } // OFFSET: 0x0084DA40 @@ -218,7 +218,7 @@ void UIClanInfoManageWnd::LoadEmblem() { // OFFSET: 0x0084DC00 // FUNCTION: fn_10636 -void UIClanWnd::Slot11() { +void UIClanWnd::StoreInfo() { if (this->m_saved) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; diff --git a/Source/UI/Clan/UIClanWnd.h b/Source/UI/Clan/UIClanWnd.h index 651e01e9d..6f5124a55 100644 --- a/Source/UI/Clan/UIClanWnd.h +++ b/Source/UI/Clan/UIClanWnd.h @@ -12,10 +12,10 @@ public: // INLINED UIClanWnd() : UIFrameWnd(0), m_saved(nullptr), m_title(nullptr) { } - void Slot11() override; + void StoreInfo() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - virtual int Slot53() = 0; + virtual int Tab() = 0; protected: /* 00B4 */ ClanWndInfo* m_saved; @@ -25,11 +25,11 @@ protected: class UIClanInfoManageWnd : public UIClanWnd { public: UIClanInfoManageWnd(); - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - int Slot53() override; + int Tab() override; __declspec(noinline) void LoadEmblem(); protected: diff --git a/Source/UI/Dialogs/UIBookWnd.h b/Source/UI/Dialogs/UIBookWnd.h index 338ddba0c..aa06a5fac 100644 --- a/Source/UI/Dialogs/UIBookWnd.h +++ b/Source/UI/Dialogs/UIBookWnd.h @@ -28,10 +28,10 @@ public: /* 0144 */ std::vector m_lines; /* 0150 */ UISpriteButton* m_buttons[4]; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; int LoadBookmark(const char* name); diff --git a/Source/UI/Dialogs/UIChooseWarpWnd.h b/Source/UI/Dialogs/UIChooseWarpWnd.h index 987ac38e5..d695194ca 100644 --- a/Source/UI/Dialogs/UIChooseWarpWnd.h +++ b/Source/UI/Dialogs/UIChooseWarpWnd.h @@ -11,9 +11,9 @@ class UIListBox; class UIChooseWarpWnd : public UIFrameWnd { public: UIChooseWarpWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - std::vector Slot44() override; + std::vector GetReplayData() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00B4 */ UIListBox* m_list; diff --git a/Source/UI/Dialogs/UIChooseWnd.h b/Source/UI/Dialogs/UIChooseWnd.h index 9702508a9..5f25ab675 100644 --- a/Source/UI/Dialogs/UIChooseWnd.h +++ b/Source/UI/Dialogs/UIChooseWnd.h @@ -13,11 +13,11 @@ class UIChooseWnd : public UIFrameWnd { public: UIChooseWnd(); ~UIChooseWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; /* 00B4 */ int unknown_00B4; /* 00B8 */ std::vector m_items; diff --git a/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h b/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h index 87cb7ed03..3f248747f 100644 --- a/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h +++ b/Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h @@ -8,7 +8,7 @@ class UITextViewer; class UIDisconnectedServerMsgWnd : public UIFrameWnd { public: UIDisconnectedServerMsgWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp index 5abb99de9..ff01cd12a 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.cpp +++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp @@ -151,7 +151,7 @@ int UIMiniMapWnd::LoadMemos() { // OFFSET: 0x0099C090 // FUNCTION: fn_13556 -void UIEditctrlWnd::Slot15(int, int) { +void UIEditctrlWnd::OnCreate(int, int) { this->AddCloseButton(LookupMessage(2741), 0); this->AddNumberedButton(184, 205, 19, "minimap\\memo_ok", LookupMessage(2754), true); @@ -172,7 +172,7 @@ void UIEditctrlWnd::Slot15(int, int) { // OFFSET: 0x0099C200 // FUNCTION: fn_13557 -void UIMiniMapWnd::Slot15(int width, int height) { +void UIMiniMapWnd::OnCreate(int width, int height) { const int bottom = this->geometry.height; const float terrainWidth = static_cast(static_cast(g_modeMgr.GetGameMode())->TerrainWidth()); const float terrainHeight = static_cast(static_cast(g_modeMgr.GetGameMode())->TerrainHeight()); @@ -219,9 +219,9 @@ void UIEditctrlWnd::Paint() { // OFFSET: 0x0099C820 // FUNCTION: fn_13560 -void UIMiniMapWnd::Slot25(int x, int y) { +void UIMiniMapWnd::OnLBtnDown(int x, int y) { if (y <= 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -306,7 +306,7 @@ void UIMiniMapWnd::UpdatePlayerHead() { // OFFSET: 0x0099DC90 // FUNCTION: fn_13565 -void UIMiniMapWnd::Slot11() { +void UIMiniMapWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.x; this->m_saved->height = this->geometry.y; diff --git a/Source/UI/Dialogs/UIEditctrlWnd.h b/Source/UI/Dialogs/UIEditctrlWnd.h index 7e145f18f..dffd607c0 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.h +++ b/Source/UI/Dialogs/UIEditctrlWnd.h @@ -8,7 +8,7 @@ class UIEditCtrl; class UIEditctrlWnd : public UIFrameWnd { public: UIEditctrlWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.h b/Source/UI/Dialogs/UIEmailAddressWnd.h index e4bff34aa..5d5e9bee1 100644 --- a/Source/UI/Dialogs/UIEmailAddressWnd.h +++ b/Source/UI/Dialogs/UIEmailAddressWnd.h @@ -8,7 +8,7 @@ class UIEditCtrl; class UIEmailAddressWnd : public UIFrameWnd { public: UIEmailAddressWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp b/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp index dc210641b..aa3fce105 100644 --- a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp +++ b/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp @@ -8,7 +8,7 @@ // OFFSET: 0x008E1210 // FUNCTION: fn_12174 -void UIGraffiStrboxWnd::Slot15(int, int) { +void UIGraffiStrboxWnd::OnCreate(int, int) { this->edit = new UIEditCtrl(); this->edit->SetSize(240, 16); this->edit->Move(22, 50); diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.h b/Source/UI/Dialogs/UIGraffiStrboxWnd.h index 35f944983..9b61d5d06 100644 --- a/Source/UI/Dialogs/UIGraffiStrboxWnd.h +++ b/Source/UI/Dialogs/UIGraffiStrboxWnd.h @@ -8,7 +8,7 @@ class UIEditCtrl; class UIGraffiStrboxWnd : public UIFrameWnd { public: UIGraffiStrboxWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Dialogs/UILoadingWnd.h b/Source/UI/Dialogs/UILoadingWnd.h index 64d51881e..c8bec3046 100644 --- a/Source/UI/Dialogs/UILoadingWnd.h +++ b/Source/UI/Dialogs/UILoadingWnd.h @@ -9,7 +9,7 @@ class UILoadingWnd : public UIFrameWnd { public: UILoadingWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIMemorialDunWnd.h b/Source/UI/Dialogs/UIMemorialDunWnd.h index dc854cbeb..d119c88e9 100644 --- a/Source/UI/Dialogs/UIMemorialDunWnd.h +++ b/Source/UI/Dialogs/UIMemorialDunWnd.h @@ -11,7 +11,7 @@ class UIMemorialDunWnd : public UIFrameWnd { public: UIMemorialDunWnd(); void Move(int x, int y) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() 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 ResetDungeonInfo(); diff --git a/Source/UI/Dialogs/UIMenuWnd.h b/Source/UI/Dialogs/UIMenuWnd.h index ac8ac1af9..96cd811e0 100644 --- a/Source/UI/Dialogs/UIMenuWnd.h +++ b/Source/UI/Dialogs/UIMenuWnd.h @@ -19,11 +19,11 @@ public: /* 00DC */ unsigned char unknown_00DC; void Move(int x, int y) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void AddItem(const char* text, const std::uint32_t& color); diff --git a/Source/UI/Dialogs/UIMiniMapWnd.h b/Source/UI/Dialogs/UIMiniMapWnd.h index a9314a9c4..26ea2ba30 100644 --- a/Source/UI/Dialogs/UIMiniMapWnd.h +++ b/Source/UI/Dialogs/UIMiniMapWnd.h @@ -20,10 +20,10 @@ struct MiniMapMark { class UIMiniMapWnd : public UIFrameWnd { public: UIMiniMapWnd(); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; void ResetCursor(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 AddTownMarks(); diff --git a/Source/UI/Dialogs/UIMinimapZoomWnd.h b/Source/UI/Dialogs/UIMinimapZoomWnd.h index afceae855..3f97ebe69 100644 --- a/Source/UI/Dialogs/UIMinimapZoomWnd.h +++ b/Source/UI/Dialogs/UIMinimapZoomWnd.h @@ -10,10 +10,10 @@ struct TownInfo; class UIMinimapZoomWnd : public UIFrameWnd { public: UIMinimapZoomWnd(); - bool Slot08() override; + bool IsTransmitMouseInput() override; void Paint() override; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(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 AddTownButton(int index, TownInfo town); diff --git a/Source/UI/Dialogs/UINoticeConfirmWnd.h b/Source/UI/Dialogs/UINoticeConfirmWnd.h index 031201b19..080a43d0f 100644 --- a/Source/UI/Dialogs/UINoticeConfirmWnd.h +++ b/Source/UI/Dialogs/UINoticeConfirmWnd.h @@ -13,7 +13,7 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; #endif diff --git a/Source/UI/Dialogs/UINotifyLevelUpWnd.h b/Source/UI/Dialogs/UINotifyLevelUpWnd.h index f98eae06f..b1b2d7225 100644 --- a/Source/UI/Dialogs/UINotifyLevelUpWnd.h +++ b/Source/UI/Dialogs/UINotifyLevelUpWnd.h @@ -8,7 +8,7 @@ public: UINotifyLevelUpWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; #endif diff --git a/Source/UI/Dialogs/UINotifyQuestWnd.h b/Source/UI/Dialogs/UINotifyQuestWnd.h index 8949070a1..aa0ef87ee 100644 --- a/Source/UI/Dialogs/UINotifyQuestWnd.h +++ b/Source/UI/Dialogs/UINotifyQuestWnd.h @@ -8,7 +8,7 @@ public: UINotifyQuestWnd(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; #endif diff --git a/Source/UI/Dialogs/UINpcEditDialogWnd.h b/Source/UI/Dialogs/UINpcEditDialogWnd.h index 26a2d6890..011ceea1c 100644 --- a/Source/UI/Dialogs/UINpcEditDialogWnd.h +++ b/Source/UI/Dialogs/UINpcEditDialogWnd.h @@ -11,7 +11,7 @@ class UINpcEditDialogWnd : public UIFrameWnd { public: UINpcEditDialogWnd(); void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: @@ -24,7 +24,7 @@ public: class UINpcTextEditDialogWnd : public UINpcEditDialogWnd { public: UINpcTextEditDialogWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void InsertItemTag(const ITEM_INFO& item); void InsertSkillTag(int tagId); void Paint() override; diff --git a/Source/UI/Dialogs/UIPasswordWnd.h b/Source/UI/Dialogs/UIPasswordWnd.h index 7eee169bd..278e67fc7 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.h +++ b/Source/UI/Dialogs/UIPasswordWnd.h @@ -16,7 +16,7 @@ public: void Show(int visible) override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -30,7 +30,7 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void sub_90C9B0(int); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; class UIStorePasswordInputWnd : public UIFrameWnd { diff --git a/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h b/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h index 3e2cb4d7d..de8100783 100644 --- a/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h +++ b/Source/UI/Dialogs/UIPetTamingDeceiveWnd.h @@ -15,11 +15,11 @@ public: /* 00CC */ std::uint32_t m_finishTime; /* 00D0 */ int m_started; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) 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 Slot19() override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; }; #endif diff --git a/Source/UI/Dialogs/UIProhibitListWnd.h b/Source/UI/Dialogs/UIProhibitListWnd.h index c96d46f96..fe2b0d04d 100644 --- a/Source/UI/Dialogs/UIProhibitListWnd.h +++ b/Source/UI/Dialogs/UIProhibitListWnd.h @@ -9,9 +9,9 @@ public: /* 00B4 */ int m_count; /* 00B8 */ std::uint32_t m_aid; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot19() override; + void OnProcess() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; diff --git a/Source/UI/Dialogs/UIQuitWnd.h b/Source/UI/Dialogs/UIQuitWnd.h index 3d5bfbdec..548c5c11a 100644 --- a/Source/UI/Dialogs/UIQuitWnd.h +++ b/Source/UI/Dialogs/UIQuitWnd.h @@ -8,7 +8,7 @@ public: UIQuitWnd(); void Paint() 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 Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; #endif diff --git a/Source/UI/Dialogs/UIRestartWnd.h b/Source/UI/Dialogs/UIRestartWnd.h index bbf5c7efc..585ff5d98 100644 --- a/Source/UI/Dialogs/UIRestartWnd.h +++ b/Source/UI/Dialogs/UIRestartWnd.h @@ -8,7 +8,7 @@ public: UIRestartWnd(); void Paint() 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 Slot15(int width, int height) override; + void OnCreate(int width, int height) override; /* 00B4 */ unsigned char unknown_00B4[4]; }; diff --git a/Source/UI/Dialogs/UISayDialogWnd.h b/Source/UI/Dialogs/UISayDialogWnd.h index cbeb706bb..fc0e511e8 100644 --- a/Source/UI/Dialogs/UISayDialogWnd.h +++ b/Source/UI/Dialogs/UISayDialogWnd.h @@ -18,12 +18,12 @@ public: /* 00D0 */ WindowPlacement* m_placement; /* 00D4 */ int unknown_00D4; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Resize(int width, int height) override; - void Slot11() override; - void Slot19() override; + void StoreInfo() override; + void OnProcess() override; void Paint() override; - std::vector Slot44() override; + std::vector GetReplayData() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; __declspec(noinline) int ButtonX(UIBitmapButton* button); }; diff --git a/Source/UI/Dialogs/UISelectCartWnd.h b/Source/UI/Dialogs/UISelectCartWnd.h index 1059cb441..5587494ed 100644 --- a/Source/UI/Dialogs/UISelectCartWnd.h +++ b/Source/UI/Dialogs/UISelectCartWnd.h @@ -6,9 +6,9 @@ class UISelectCartWnd : public UIFrameWnd { public: UISelectCartWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void AddCart(int index, int type); diff --git a/Source/UI/Dialogs/UITipOfTheDayWnd.h b/Source/UI/Dialogs/UITipOfTheDayWnd.h index 225a1523b..460f097c6 100644 --- a/Source/UI/Dialogs/UITipOfTheDayWnd.h +++ b/Source/UI/Dialogs/UITipOfTheDayWnd.h @@ -10,7 +10,7 @@ extern int g_window315Enabled; class UITipOfTheDayWnd : public UIFrameWnd { public: UITipOfTheDayWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Dialogs/UITipboxWnd.h b/Source/UI/Dialogs/UITipboxWnd.h index a028786e3..11d573ad5 100644 --- a/Source/UI/Dialogs/UITipboxWnd.h +++ b/Source/UI/Dialogs/UITipboxWnd.h @@ -46,8 +46,8 @@ public: void Search(std::string& keyword); void RefreshTip(); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; /* 00B4 */ UIEditCtrl* unknown_00B4; diff --git a/Source/UI/Dialogs/UIToolTipWnd.h b/Source/UI/Dialogs/UIToolTipWnd.h index 9ad8e4816..bf7931704 100644 --- a/Source/UI/Dialogs/UIToolTipWnd.h +++ b/Source/UI/Dialogs/UIToolTipWnd.h @@ -8,7 +8,7 @@ class UIListBox; class UIToolTipWnd : public UIFrameWnd { public: UIToolTipWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp b/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp index 1f3878efe..30b39a0d9 100644 --- a/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp +++ b/Source/UI/Dialogs/UIWaitDBSaveWnd.cpp @@ -84,7 +84,7 @@ UIWaitDBSaveWnd::UIWaitDBSaveWnd() : UIWaitDBSaveWnd(WaitSpriteName(), WaitActio // OFFSET: 0x00AB4CE0 // FUNCTION: fn_17448 -void UIWaitDBSaveWnd::Slot15(int width, int height) { +void UIWaitDBSaveWnd::OnCreate(int width, int height) { UIButton* button = new UIButton(); button->SetSize(width, height); button->Move(0, 0); @@ -95,7 +95,7 @@ void UIWaitDBSaveWnd::Slot15(int width, int height) { // OFFSET: 0x00AB4D80 // FUNCTION: fn_17449 -void UIWaitDBSaveWnd::Slot18() { +void UIWaitDBSaveWnd::OnDestroy() { } // OFFSET: 0x00AB4D90 @@ -152,12 +152,12 @@ void UIWaitDBSaveWnd::Paint() { // OFFSET: 0x00AB5060 // FUNCTION: fn_17451 -void UIWaitDBSaveWnd::Slot27(int, int) { +void UIWaitDBSaveWnd::OnMouseMove(int, int) { } // OFFSET: 0x00AB5070 // FUNCTION: fn_17452 -void UIWaitDBSaveWnd::Slot19() { +void UIWaitDBSaveWnd::OnProcess() { if (this->m_closeTime != 0 && timeGetTime() >= this->m_closeTime) { this->m_closeTime = 0; g_windowMgr.CloseWindow(10024); diff --git a/Source/UI/Dialogs/UIWaitDBSaveWnd.h b/Source/UI/Dialogs/UIWaitDBSaveWnd.h index 00d60a0c2..78a287938 100644 --- a/Source/UI/Dialogs/UIWaitDBSaveWnd.h +++ b/Source/UI/Dialogs/UIWaitDBSaveWnd.h @@ -12,11 +12,11 @@ class UIWaitDBSaveWnd : public UIWindow { public: UIWaitDBSaveWnd(); UIWaitDBSaveWnd(const char* sprite, const char* action); - void Slot15(int width, int height) override; - void Slot18() override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; - void Slot27(int x, int y) override; + void OnMouseMove(int x, int y) override; /* 007C */ int m_animation; /* 0080 */ int m_frame; diff --git a/Source/UI/Dialogs/UIWaitWnd.h b/Source/UI/Dialogs/UIWaitWnd.h index 85fcfcddf..d7002ffe3 100644 --- a/Source/UI/Dialogs/UIWaitWnd.h +++ b/Source/UI/Dialogs/UIWaitWnd.h @@ -16,7 +16,7 @@ public: int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; void SetMessage(const char* text, int, int); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; #endif diff --git a/Source/UI/Edit/UICandidateWnd.cpp b/Source/UI/Edit/UICandidateWnd.cpp index 4764d3ea1..38f4a5374 100644 --- a/Source/UI/Edit/UICandidateWnd.cpp +++ b/Source/UI/Edit/UICandidateWnd.cpp @@ -26,15 +26,15 @@ UIKeyStrokeWnd::UIKeyStrokeWnd() : UIFrameWnd(0) {} // OFFSET: 0x0096D6F0 // FUNCTION: fn_13200 -void UICandidateWnd::Slot15(int, int) {} +void UICandidateWnd::OnCreate(int, int) {} // OFFSET: 0x0096D700 // FUNCTION: fn_13201 -void UICompositionWnd::Slot15(int, int) {} +void UICompositionWnd::OnCreate(int, int) {} // OFFSET: 0x0096D710 // FUNCTION: fn_13202 -void UIKeyStrokeWnd::Slot15(int, int) {} +void UIKeyStrokeWnd::OnCreate(int, int) {} // OFFSET: 0x0096D720 // FUNCTION: fn_13203 diff --git a/Source/UI/Edit/UICandidateWnd.h b/Source/UI/Edit/UICandidateWnd.h index 1d5d5d2e7..16d0cac9f 100644 --- a/Source/UI/Edit/UICandidateWnd.h +++ b/Source/UI/Edit/UICandidateWnd.h @@ -8,7 +8,7 @@ class UICandidateWnd : public UIFrameWnd { public: UICandidateWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -23,7 +23,7 @@ protected: class UICompositionWnd : public UIFrameWnd { public: UICompositionWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -34,7 +34,7 @@ protected: class UIKeyStrokeWnd : public UIFrameWnd { public: UIKeyStrokeWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; diff --git a/Source/UI/Edit/UIEditBoxEx.cpp b/Source/UI/Edit/UIEditBoxEx.cpp index 17c40a6b0..1a8346abe 100644 --- a/Source/UI/Edit/UIEditBoxEx.cpp +++ b/Source/UI/Edit/UIEditBoxEx.cpp @@ -9,7 +9,7 @@ // OFFSET: 0x009E4310 // FUNCTION: fn_14429 -bool CUIEditBoxEx::Slot05() { +bool CUIEditBoxEx::IsEditable() { return this->edit->disabled == 0; } diff --git a/Source/UI/Edit/UIEditBoxEx.h b/Source/UI/Edit/UIEditBoxEx.h index 02feb8eb9..42b1ac387 100644 --- a/Source/UI/Edit/UIEditBoxEx.h +++ b/Source/UI/Edit/UIEditBoxEx.h @@ -65,7 +65,7 @@ class CUIEditBoxEx : public CUIControl { public: CUIEditBoxEx(); void Resize(int width, int height) override; - bool Slot05() override; + bool IsEditable() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index a982c828f..596bc53e7 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -262,7 +262,7 @@ UIEditCtrl::~UIEditCtrl() = default; // OFFSET: 0x005C3210 // FUNCTION: fn_03552 -bool UIEditCtrl::Slot05() { +bool UIEditCtrl::IsEditable() { return this->disabled == 0; } @@ -297,7 +297,7 @@ void UIEditCtrl::Paint() { // OFFSET: 0x0085AAB0 // FUNCTION: fn_10783 -void UIEditCtrl::Slot23() { +void UIEditCtrl::OnBeginEdit() { g_serverLanguage->ResetInput(); g_serverLanguage->ReplaceInput(this->text.c_str()); g_serverLanguage->SetPassword(this->mask != 0); @@ -306,14 +306,14 @@ void UIEditCtrl::Slot23() { // OFFSET: 0x0085E3B0 // FUNCTION: fn_10826 -void UIEditCtrl::Slot24(int) { +void UIEditCtrl::OnFinishEdit(int) { this->Synchronize(); this->Invalidate(); } // OFFSET: 0x0085E400 // FUNCTION: fn_10828 -void UIWhisperEditCtrl::Slot24(int retained) { +void UIWhisperEditCtrl::OnFinishEdit(int retained) { this->AddHistory(); this->Synchronize(); this->Invalidate(); @@ -321,7 +321,7 @@ void UIWhisperEditCtrl::Slot24(int retained) { // OFFSET: 0x0085EC20 // FUNCTION: fn_10842 -void UIEditCtrl::Slot25(int, int) { +void UIEditCtrl::OnLBtnDown(int, int) { if (this->disabled == 0) { g_windowMgr.SetFocus(this); } @@ -329,12 +329,12 @@ void UIEditCtrl::Slot25(int, int) { // OFFSET: 0x0085F390 // FUNCTION: fn_10860 -void UIEditCtrl::Slot28(int x, int y) { +void UIEditCtrl::OnMouseHover(int x, int y) { if (this->disabled != 0) { return; } - this->Slot27(x, y); + this->OnMouseMove(x, y); if (!this->tooltip.empty()) { x = 10; @@ -438,7 +438,7 @@ int UIEditCtrl::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::int // OFFSET: 0x005C44E0 // FUNCTION: fn_03561 -int UIEditCtrl::Slot46() { +int UIEditCtrl::GetWindowType() { return 2; } @@ -631,9 +631,9 @@ UIEditCtrlWheel::~UIEditCtrlWheel() = default; // OFFSET: 0x0098A240 // FUNCTION: fn_13408 -void UIEditCtrlWheel::Slot35(int value) { +void UIEditCtrlWheel::OnWheel(int value) { if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -882,7 +882,7 @@ int UISpriteButton::FrameWidth(int action, int frame) { // OFFSET: 0x0097D220 // FUNCTION: fn_13325 -void UINoticeMessageBox_LockSellItem::Slot15(int, int) { +void UINoticeMessageBox_LockSellItem::OnCreate(int, int) { auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\inventory\\bt_close.bmp", 0, 0); button->SetBitmap("유저인터페이스\\inventory\\bt_close.bmp", 1, 0); @@ -895,7 +895,7 @@ void UINoticeMessageBox_LockSellItem::Slot15(int, int) { // OFFSET: 0x0097E3E0 // FUNCTION: fn_13327 -void UIItemWnd::Slot18() { +void UIItemWnd::OnDestroy() { } // OFFSET: 0x00896BC0 @@ -959,9 +959,9 @@ void UIEditCtrl_Custom::Synchronize() { // OFFSET: 0x00972520 // FUNCTION: fn_13272 -void UIItemStoreFindWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemStoreFindWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -970,9 +970,9 @@ void UIItemStoreFindWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972570 // FUNCTION: fn_13273 -void UIItemStoreSubWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemStoreSubWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -1002,7 +1002,7 @@ void UIItemStoreSubWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972630 // FUNCTION: fn_13274 -void UIItemStoreWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemStoreWnd::DragAndDrop(int x, int y, std::intptr_t value) { char text[250]; if (g_unknown_01738268) { if (g_unknown_01738270 == 1) { @@ -1021,7 +1021,7 @@ void UIItemStoreWnd::Slot10(int x, int y, std::intptr_t value) { } if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -1051,9 +1051,9 @@ void UIItemStoreWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009727F0 // FUNCTION: fn_13275 -void UIItemWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -1116,7 +1116,7 @@ void UIItemWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00989080 // FUNCTION: fn_13396 -void UIItemStoreFindWnd::Slot32(int x, int y) { +void UIItemStoreFindWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -1144,7 +1144,7 @@ void UIItemStoreFindWnd::Slot32(int x, int y) { // OFFSET: 0x00989210 // FUNCTION: fn_13397 -void UIItemStoreSubWnd::Slot32(int x, int y) { +void UIItemStoreSubWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -1172,7 +1172,7 @@ void UIItemStoreSubWnd::Slot32(int x, int y) { // OFFSET: 0x009893A0 // FUNCTION: fn_13398 -void UIItemStoreWnd::Slot32(int x, int y) { +void UIItemStoreWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -1198,7 +1198,7 @@ void UIItemStoreWnd::Slot32(int x, int y) { // OFFSET: 0x00989520 // FUNCTION: fn_13399 -void UIItemWnd::Slot32(int x, int y) { +void UIItemWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -1259,7 +1259,7 @@ void UIItemWnd::Slot32(int x, int y) { // OFFSET: 0x00989960 // FUNCTION: fn_13401 -void UIMerchantItemPurchaseWnd::Slot32(int x, int y) { +void UIMerchantItemPurchaseWnd::OnRBtnDown(int x, int y) { const int previous = this->hovered; this->hovered = this->GetItemIndexAt(x, y); @@ -1286,7 +1286,7 @@ void UIMerchantItemPurchaseWnd::Slot32(int x, int y) { // OFFSET: 0x00989B00 // FUNCTION: fn_13402 -void UIMerchantItemShopWnd::Slot32(int x, int y) { +void UIMerchantItemShopWnd::OnRBtnDown(int x, int y) { const int previous = this->hovered; this->hovered = this->GetItemIndexAt(x, y); @@ -1312,7 +1312,7 @@ void UIMerchantItemShopWnd::Slot32(int x, int y) { // OFFSET: 0x00989C40 // FUNCTION: fn_13403 -void UIMerchantItemWnd::Slot32(int x, int y) { +void UIMerchantItemWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -1342,7 +1342,7 @@ void UIMerchantItemWnd::Slot32(int x, int y) { // OFFSET: 0x00989DF0 // FUNCTION: fn_13404 -void UIMerchantMirrorItemWnd::Slot32(int x, int y) { +void UIMerchantMirrorItemWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -2368,7 +2368,7 @@ int UIItemDropCntWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, st // OFFSET: 0x0097C230 // FUNCTION: fn_13324 -void UIMerchantShopMakeWnd::Slot15(int width, int height) { +void UIMerchantShopMakeWnd::OnCreate(int width, int height) { int count; if (this->mode != 0) { count = g_session.m_buyingStoreSlotCount; @@ -2492,7 +2492,7 @@ void UIMerchantShopMakeWnd::Slot15(int width, int height) { // OFFSET: 0x00989FE0 // FUNCTION: fn_13405 -void UIMerchantShopMakeWnd::Slot32(int x, int y) { +void UIMerchantShopMakeWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -2636,7 +2636,7 @@ void UIMerchantItemMyShopWnd::Paint() { // OFFSET: 0x0097A670 // FUNCTION: fn_13319 -void UIMerchantItemPurchaseMSGWnd::Slot15(int, int) { +void UIMerchantItemPurchaseMSGWnd::OnCreate(int, int) { this->title = new UIStaticText(); this->title->SetSize(100, 15); this->title->SetTextFitted(LookupMessage(2326)); @@ -2883,7 +2883,7 @@ void UISkillListWnd::Paint() { // OFFSET: 0x00983F80 // FUNCTION: fn_13347 -void UIItemSellWnd2::Slot26(int x, int y) { +void UIItemSellWnd2::OnLBtnDblClk(int x, int y) { if (g_windowMgr.unknown_0064 == 0) { return; } @@ -2891,16 +2891,16 @@ void UIItemSellWnd2::Slot26(int x, int y) { UIWindow* target = g_windowMgr.unknown_0254; if (target) { - this->Slot25(x, y); + this->OnLBtnDown(x, y); CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); this->RecordDrop(x, y, mode->drag, 160); - target->Slot10(x, y, reinterpret_cast(&mode->drag)); + target->DragAndDrop(x, y, reinterpret_cast(&mode->drag)); } } // OFFSET: 0x00983FF0 // FUNCTION: fn_13348 -void UIItemSellWnd::Slot26(int x, int y) { +void UIItemSellWnd::OnLBtnDblClk(int x, int y) { if (g_windowMgr.unknown_0064 == 0) { return; } @@ -2908,28 +2908,28 @@ void UIItemSellWnd::Slot26(int x, int y) { UIWindow* target = g_windowMgr.unknown_0250; if (target) { - this->Slot25(x, y); + this->OnLBtnDown(x, y); CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); this->RecordDrop(x, y, mode->drag, 22); - target->Slot10(x, y, reinterpret_cast(&mode->drag)); + target->DragAndDrop(x, y, reinterpret_cast(&mode->drag)); } } // OFFSET: 0x00984130 // FUNCTION: fn_13351 -void UIItemStoreFindWnd::Slot26(int, int) { +void UIItemStoreFindWnd::OnLBtnDblClk(int, int) { this->SendMsg(nullptr, 6, 232, 0, 0, 0); } // OFFSET: 0x00984150 // FUNCTION: fn_13352 -void UIItemStoreSubWnd::Slot26(int, int) { +void UIItemStoreSubWnd::OnLBtnDblClk(int, int) { this->SendMsg(nullptr, 6, 232, 0, 0, 0); } // OFFSET: 0x00984170 // FUNCTION: fn_13353 -void UIItemWnd::Slot26(int x, int y) { +void UIItemWnd::OnLBtnDblClk(int x, int y) { if (y < 17) { this->SendMsg(this, 6, 202, 0, 0, 0); return; @@ -3011,17 +3011,17 @@ void UIItemWnd::Slot26(int x, int y) { // OFFSET: 0x00985380 // FUNCTION: fn_13364 -void UIMerchantItemMyShopWnd::Slot25(int x, int y) { +void UIMerchantItemMyShopWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIItemBaseWnd::Slot25(x, y); + UIItemBaseWnd::OnLBtnDown(x, y); } } // OFFSET: 0x009886C0 // FUNCTION: fn_13386 -void UIItemWnd::Slot19() { +void UIItemWnd::OnProcess() { if (this->unknown_0128) { - this->unknown_0128->Slot19(); + this->unknown_0128->OnProcess(); } } @@ -3036,19 +3036,19 @@ void UIItemWnd::RefreshOptionBox() { // OFFSET: 0x009886D0 // FUNCTION: fn_13387 -void UIMerchantItemMyShopWnd::Slot19() { +void UIMerchantItemMyShopWnd::OnProcess() { this->Invalidate(); } // OFFSET: 0x009886E0 // FUNCTION: fn_13388 -void UIMerchantItemShopWnd::Slot19() { +void UIMerchantItemShopWnd::OnProcess() { this->Invalidate(); } // OFFSET: 0x009886F0 // FUNCTION: fn_13389 -void UIMerchantShopMakeWnd::Slot19() { +void UIMerchantShopMakeWnd::OnProcess() { if (this->unknown_0128 && this->mode) { std::int64_t total = 0; for (unsigned index = 0; index < this->items.size(); ++index) { @@ -3137,7 +3137,7 @@ void UIMerchantShopMakeWnd::Slot19() { // OFFSET: 0x00988C20 // FUNCTION: fn_13390 -void UINoticeMessageBox_LockSellItem::Slot19() { +void UINoticeMessageBox_LockSellItem::OnProcess() { if (this->startTick + this->duration < timeGetTime()) { this->SendMsg(this, 6, 201, 0, 0, 0); } @@ -3145,7 +3145,7 @@ void UINoticeMessageBox_LockSellItem::Slot19() { // OFFSET: 0x00988D50 // FUNCTION: fn_13392 -void UIItemSellWnd2::Slot32(int x, int y) { +void UIItemSellWnd2::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -3155,7 +3155,7 @@ void UIItemSellWnd2::Slot32(int x, int y) { // OFFSET: 0x00988E10 // FUNCTION: fn_13393 -void UIItemSellWnd::Slot32(int x, int y) { +void UIItemSellWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -3165,7 +3165,7 @@ void UIItemSellWnd::Slot32(int x, int y) { // OFFSET: 0x00988ED0 // FUNCTION: fn_13394 -void UIItemShopWnd2::Slot32(int x, int y) { +void UIItemShopWnd2::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -3176,7 +3176,7 @@ void UIItemShopWnd2::Slot32(int x, int y) { // OFFSET: 0x009898A0 // FUNCTION: fn_13400 -void UIMerchantItemMyShopWnd::Slot32(int x, int y) { +void UIMerchantItemMyShopWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { @@ -3187,7 +3187,7 @@ void UIMerchantItemMyShopWnd::Slot32(int x, int y) { // OFFSET: 0x0098A220 // FUNCTION: fn_13407 -void UISkillListWnd::Slot33(int, int) { +void UISkillListWnd::OnRBtnUp(int, int) { this->SendMsg(nullptr, 49, 0, 0, 0, 0); } @@ -3217,7 +3217,7 @@ int UISkillListWnd::SkillAt(int x, int y) { // OFFSET: 0x0098A1E0 // FUNCTION: fn_13406 -void UISkillListWnd::Slot32(int x, int y) { +void UISkillListWnd::OnRBtnDown(int x, int y) { const int previous = this->hovered; this->hovered = this->SkillAt(x, y); @@ -3228,13 +3228,13 @@ void UISkillListWnd::Slot32(int x, int y) { // OFFSET: 0x00974560 // FUNCTION: fn_13302 -bool UISkillListWnd::Slot03() { +bool UISkillListWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x00974900 // FUNCTION: fn_13307 -void UIItemBaseWnd::Slot15(int, int) { +void UIItemBaseWnd::OnCreate(int, int) { } // OFFSET: 0x00973A20 @@ -3525,12 +3525,12 @@ void UIMerchantShopMakeWnd::SetSelection(short row, short column) { // OFFSET: 0x00995320 // FUNCTION: fn_13444 -void UIItemBaseWnd::Slot11() { +void UIItemBaseWnd::StoreInfo() { } // OFFSET: 0x00995330 // FUNCTION: fn_13445 -void UIItemPurchaseWnd::Slot11() { +void UIItemPurchaseWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3541,7 +3541,7 @@ void UIItemPurchaseWnd::Slot11() { // OFFSET: 0x00995370 // FUNCTION: fn_13446 -void UIItemSellWnd2::Slot11() { +void UIItemSellWnd2::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3552,7 +3552,7 @@ void UIItemSellWnd2::Slot11() { // OFFSET: 0x009953B0 // FUNCTION: fn_13447 -void UIItemSellWnd::Slot11() { +void UIItemSellWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3563,7 +3563,7 @@ void UIItemSellWnd::Slot11() { // OFFSET: 0x009953F0 // FUNCTION: fn_13448 -void UIItemShopWnd2::Slot11() { +void UIItemShopWnd2::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3574,7 +3574,7 @@ void UIItemShopWnd2::Slot11() { // OFFSET: 0x00995430 // FUNCTION: fn_13449 -void UIItemShopWnd::Slot11() { +void UIItemShopWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3585,7 +3585,7 @@ void UIItemShopWnd::Slot11() { // OFFSET: 0x00995470 // FUNCTION: fn_13450 -void UIItemStoreFindWnd::Slot11() { +void UIItemStoreFindWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3596,7 +3596,7 @@ void UIItemStoreFindWnd::Slot11() { // OFFSET: 0x009954B0 // FUNCTION: fn_13451 -void UIItemStoreSubWnd::Slot11() { +void UIItemStoreSubWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3607,7 +3607,7 @@ void UIItemStoreSubWnd::Slot11() { // OFFSET: 0x009954F0 // FUNCTION: fn_13452 -void UIItemStoreWnd::Slot11() { +void UIItemStoreWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3618,7 +3618,7 @@ void UIItemStoreWnd::Slot11() { // OFFSET: 0x00995530 // FUNCTION: fn_13453 -void UIItemWnd::Slot11() { +void UIItemWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -3634,7 +3634,7 @@ void UIItemWnd::Slot11() { // OFFSET: 0x009955C0 // FUNCTION: fn_13454 -void UIMerchantItemMyShopWnd::Slot11() { +void UIMerchantItemMyShopWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -3645,7 +3645,7 @@ void UIMerchantItemMyShopWnd::Slot11() { // OFFSET: 0x00995600 // FUNCTION: fn_13455 -void UIMerchantItemPurchaseWnd::Slot11() { +void UIMerchantItemPurchaseWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -3656,7 +3656,7 @@ void UIMerchantItemPurchaseWnd::Slot11() { // OFFSET: 0x00995640 // FUNCTION: fn_13456 -void UIMerchantItemShopWnd::Slot11() { +void UIMerchantItemShopWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -3667,7 +3667,7 @@ void UIMerchantItemShopWnd::Slot11() { // OFFSET: 0x00995680 // FUNCTION: fn_13457 -void UIMerchantItemWnd::Slot11() { +void UIMerchantItemWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -3678,7 +3678,7 @@ void UIMerchantItemWnd::Slot11() { // OFFSET: 0x009956C0 // FUNCTION: fn_13458 -void UIMerchantMirrorItemWnd::Slot11() { +void UIMerchantMirrorItemWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -3689,7 +3689,7 @@ void UIMerchantMirrorItemWnd::Slot11() { // OFFSET: 0x00995700 // FUNCTION: fn_13459 -void UIMerchantShopMakeWnd::Slot11() { +void UIMerchantShopMakeWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -3700,7 +3700,7 @@ void UIMerchantShopMakeWnd::Slot11() { // OFFSET: 0x00995740 // FUNCTION: fn_13460 -void UISkillListWnd::Slot11() { +void UISkillListWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -4084,15 +4084,15 @@ void UIMerchantShopMakeWnd::PrintBuyList() { // OFFSET: 0x00972100 // FUNCTION: fn_13266 -void UIItemBaseWnd::Slot10(int, int, std::intptr_t) { +void UIItemBaseWnd::DragAndDrop(int, int, std::intptr_t) { g_modeMgr.gameMode->SendMsg(18, 0, 0, 0, 0); } // OFFSET: 0x00972120 // FUNCTION: fn_13267 -void UIItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemPurchaseWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -4123,9 +4123,9 @@ void UIItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009721F0 // FUNCTION: fn_13268 -void UIItemSellWnd2::Slot10(int x, int y, std::intptr_t value) { +void UIItemSellWnd2::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -4145,9 +4145,9 @@ void UIItemSellWnd2::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009722A0 // FUNCTION: fn_13269 -void UIItemSellWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemSellWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -4167,9 +4167,9 @@ void UIItemSellWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972B50 // FUNCTION: fn_13277 -void UIMerchantItemShopWnd::Slot10(int x, int y, std::intptr_t value) { +void UIMerchantItemShopWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -4190,9 +4190,9 @@ void UIMerchantItemShopWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972C00 // FUNCTION: fn_13278 -void UIMerchantItemWnd::Slot10(int x, int y, std::intptr_t value) { +void UIMerchantItemWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011) || g_windowMgr.unknown_01F0 || g_windowMgr.unknown_01F8) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -4222,7 +4222,7 @@ void UIMerchantItemWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x0097BC00 // FUNCTION: fn_13321 -void UIMerchantItemShopWnd::Slot15(int width, int height) { +void UIMerchantItemShopWnd::OnCreate(int width, int height) { if (this->unknown_010C) { this->notice = new UIStaticText(); this->notice->SetSize(160, 15); @@ -4584,7 +4584,7 @@ void UIEditCtrl3::WrapLines(std::vector& lines) { // OFFSET: 0x00975CD0 // FUNCTION: fn_13310 -void UIItemSellWnd2::Slot15(int width, int height) { +void UIItemSellWnd2::OnCreate(int width, int height) { this->total = new UIStaticText(); this->total->SetSize(160, 15); this->total->SetTextAutoWidth(""); @@ -4634,7 +4634,7 @@ void UIItemSellWnd2::Slot15(int width, int height) { // OFFSET: 0x009768A0 // FUNCTION: fn_13311 -void UIItemSellWnd::Slot15(int width, int height) { +void UIItemSellWnd::OnCreate(int width, int height) { this->total = new UIStaticText(); this->total->SetSize(160, 15); char text[80]; @@ -4686,7 +4686,7 @@ void UIItemSellWnd::Slot15(int width, int height) { // OFFSET: 0x00977510 // FUNCTION: fn_13312 -void UIItemShopWnd2::Slot15(int width, int height) { +void UIItemShopWnd2::OnCreate(int width, int height) { this->title = new UIStaticText(); this->title->SetSize(70, 15); this->title->SetText(LookupMessage(167), 0); @@ -4721,7 +4721,7 @@ void UIItemShopWnd2::Slot15(int width, int height) { // OFFSET: 0x009777B0 // FUNCTION: fn_13313 -void UIItemShopWnd::Slot15(int width, int height) { +void UIItemShopWnd::OnCreate(int width, int height) { this->title = new UIStaticText(); this->title->SetSize(70, 15); this->title->SetText(LookupMessage(167), 0); @@ -4756,7 +4756,7 @@ void UIItemShopWnd::Slot15(int width, int height) { // OFFSET: 0x00977A50 // FUNCTION: fn_13314 -void UIItemStoreFindWnd::Slot15(int width, int height) { +void UIItemStoreFindWnd::OnCreate(int width, int height) { this->scrollBar = new UIScrollBar(); static_cast(this->scrollBar)->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -4784,7 +4784,7 @@ void UIItemStoreFindWnd::Slot15(int width, int height) { // OFFSET: 0x00977C40 // FUNCTION: fn_13315 -void UIItemStoreSubWnd::Slot15(int width, int height) { +void UIItemStoreSubWnd::OnCreate(int width, int height) { this->scrollBar = new UIScrollBar(); static_cast(this->scrollBar)->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->scrollBar); @@ -4809,7 +4809,7 @@ void UIItemStoreSubWnd::Slot15(int width, int height) { // OFFSET: 0x0097BD30 // FUNCTION: fn_13322 -void UIMerchantItemWnd::Slot15(int width, int height) { +void UIMerchantItemWnd::OnCreate(int width, int height) { UIStaticText* title = new UIStaticText(); title->SetSize(90, 15); title->SetText(LookupMessage(222), 0); @@ -4847,7 +4847,7 @@ void UIMerchantItemWnd::Slot15(int width, int height) { // OFFSET: 0x0097BFF0 // FUNCTION: fn_13323 -void UIMerchantMirrorItemWnd::Slot15(int width, int height) { +void UIMerchantMirrorItemWnd::OnCreate(int width, int height) { UIStaticText* title = new UIStaticText(); title->SetSize(150, 15); int messageId; @@ -4967,9 +4967,9 @@ void UIEditCtrl_Custom::Trim() { // OFFSET: 0x00972350 // FUNCTION: fn_13270 -void UIItemShopWnd2::Slot10(int x, int y, std::intptr_t value) { +void UIItemShopWnd2::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -4997,9 +4997,9 @@ void UIItemShopWnd2::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972410 // FUNCTION: fn_13271 -void UIItemShopWnd::Slot10(int x, int y, std::intptr_t value) { +void UIItemShopWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -5039,9 +5039,9 @@ void UIItemShopWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009729C0 // FUNCTION: fn_13276 -void UIMerchantItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { +void UIMerchantItemPurchaseWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -5090,9 +5090,9 @@ void UIMerchantItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972CE0 // FUNCTION: fn_13279 -void UIMerchantMirrorItemWnd::Slot10(int x, int y, std::intptr_t value) { +void UIMerchantMirrorItemWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -5125,9 +5125,9 @@ void UIMerchantMirrorItemWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00972DB0 // FUNCTION: fn_13280 -void UIMerchantShopMakeWnd::Slot10(int x, int y, std::intptr_t value) { +void UIMerchantShopMakeWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -5158,7 +5158,7 @@ static void AppendReplayRecord(std::vector& records, const std::v // OFFSET: 0x00972E60 // FUNCTION: fn_13281 -std::vector UIItemPurchaseWnd::Slot44() { +std::vector UIItemPurchaseWnd::GetReplayData() { std::vector records; AppendReplayRecord(records, BuildReplayTaggedRecord(0x50DC, nullptr, 0)); AppendReplayRecord(records, BuildReplayTaggedRecord(0x50DD, nullptr, 0)); @@ -5167,7 +5167,7 @@ std::vector UIItemPurchaseWnd::Slot44() { // OFFSET: 0x00972F50 // FUNCTION: fn_13282 -std::vector UIItemSellWnd2::Slot44() { +std::vector UIItemSellWnd2::GetReplayData() { std::vector records; AppendReplayRecord(records, BuildReplayTaggedRecord(20800, nullptr, 0)); AppendReplayRecord(records, BuildReplayTaggedRecord(20802, &this->unknown_00FC, 4)); @@ -5177,7 +5177,7 @@ std::vector UIItemSellWnd2::Slot44() { // OFFSET: 0x00973080 // FUNCTION: fn_13283 -std::vector UIItemSellWnd::Slot44() { +std::vector UIItemSellWnd::GetReplayData() { std::vector records; AppendReplayRecord(records, BuildReplayTaggedRecord(0x510E, nullptr, 0)); AppendReplayRecord(records, BuildReplayTaggedRecord(0x510F, nullptr, 0)); @@ -5186,7 +5186,7 @@ std::vector UIItemSellWnd::Slot44() { // OFFSET: 0x00973170 // FUNCTION: fn_13284 -std::vector UIItemStoreWnd::Slot44() { +std::vector UIItemStoreWnd::GetReplayData() { std::vector records; AppendReplayRecord(records, BuildReplayTaggedRecord(0x51A4, nullptr, 0)); AppendReplayRecord(records, BuildReplayTaggedRecord(0x51A5, nullptr, 0)); @@ -5223,7 +5223,7 @@ std::vector UIParaItemShopWnd::BuildReplayRecords() { // OFFSET: 0x009734E0 // FUNCTION: fn_13287 -std::vector UIMerchantItemShopWnd::Slot44() { +std::vector UIMerchantItemShopWnd::GetReplayData() { std::vector records; if (this->unknown_010C != 0) { AppendReplayRecord(records, BuildReplayTaggedRecord(21250, nullptr, 0)); @@ -5238,7 +5238,7 @@ std::vector UIMerchantItemShopWnd::Slot44() { // OFFSET: 0x00973670 // FUNCTION: fn_13288 -std::vector UIMerchantMirrorItemWnd::Slot44() { +std::vector UIMerchantMirrorItemWnd::GetReplayData() { std::vector records; AppendReplayRecord(records, BuildReplayTaggedRecord(0x5398, nullptr, 0)); AppendReplayRecord(records, BuildReplayTaggedRecord(0x5399, nullptr, 0)); @@ -5247,7 +5247,7 @@ std::vector UIMerchantMirrorItemWnd::Slot44() { // OFFSET: 0x00973760 // FUNCTION: fn_13289 -std::vector UIMerchantShopMakeWnd::Slot44() { +std::vector UIMerchantShopMakeWnd::GetReplayData() { std::vector records; if (this->mode != 0) { AppendReplayRecord(records, BuildReplayTaggedRecord(21350, nullptr, 0)); @@ -5293,7 +5293,7 @@ int UIItemBaseWnd::GetItemIndexAt(int x, int y) { // OFFSET: 0x00984050 // FUNCTION: fn_13349 -void UIItemShopWnd2::Slot26(int x, int y) { +void UIItemShopWnd2::OnLBtnDblClk(int x, int y) { if (this->unknown_00F8 == 0 || g_windowMgr.unknown_0064 == 0) { return; } @@ -5301,16 +5301,16 @@ void UIItemShopWnd2::Slot26(int x, int y) { UIWindow* target = reinterpret_cast(g_windowMgr.unknown_0260); if (target) { - this->Slot25(x, y); + this->OnLBtnDown(x, y); CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); this->RecordDrop(x, y, mode->drag, 161); - target->Slot10(x, y, reinterpret_cast(&mode->drag)); + target->DragAndDrop(x, y, reinterpret_cast(&mode->drag)); } } // OFFSET: 0x009840C0 // FUNCTION: fn_13350 -void UIItemShopWnd::Slot26(int x, int y) { +void UIItemShopWnd::OnLBtnDblClk(int x, int y) { if (this->unknown_00F8 == 0 || g_windowMgr.unknown_0064 == 0) { return; } @@ -5318,18 +5318,18 @@ void UIItemShopWnd::Slot26(int x, int y) { UIWindow* target = reinterpret_cast(g_windowMgr.unknown_025C); if (target) { - this->Slot25(x, y); + this->OnLBtnDown(x, y); CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); this->RecordDrop(x, y, mode->drag, 24); - target->Slot10(x, y, reinterpret_cast(&mode->drag)); + target->DragAndDrop(x, y, reinterpret_cast(&mode->drag)); } } // OFFSET: 0x00985AA0 // FUNCTION: fn_13370 -void UISkillListWnd::Slot25(int x, int y) { +void UISkillListWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -5356,9 +5356,9 @@ void UISkillListWnd::Slot25(int x, int y) { // OFFSET: 0x009844E0 // FUNCTION: fn_13354 -void UISkillListWnd::Slot26(int x, int y) { +void UISkillListWnd::OnLBtnDblClk(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -5373,9 +5373,9 @@ void UISkillListWnd::Slot26(int x, int y) { // OFFSET: 0x00985510 // FUNCTION: fn_13366 -void UIMerchantItemShopWnd::Slot25(int x, int y) { +void UIMerchantItemShopWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } if (this->unknown_010C == 0) { @@ -5396,7 +5396,7 @@ void UIMerchantItemShopWnd::Slot25(int x, int y) { // OFFSET: 0x00988C60 // FUNCTION: fn_13391 -void UIItemPurchaseWnd::Slot32(int x, int y) { +void UIItemPurchaseWnd::OnRBtnDown(int x, int y) { const int previous = this->hovered; this->hovered = this->GetItemIndexAt(x, y); @@ -5414,7 +5414,7 @@ void UIItemPurchaseWnd::Slot32(int x, int y) { // OFFSET: 0x00988F90 // FUNCTION: fn_13395 -void UIItemShopWnd::Slot32(int x, int y) { +void UIItemShopWnd::OnRBtnDown(int x, int y) { const int previous = this->hovered; this->hovered = this->GetItemIndexAt(x, y); @@ -5432,7 +5432,7 @@ void UIItemShopWnd::Slot32(int x, int y) { // OFFSET: 0x0098A260 // FUNCTION: fn_13409 -void UIItemBaseWnd::Slot35(int value) { +void UIItemBaseWnd::OnWheel(int value) { if (this->unknown_00E4) { const int step = std::min(this->visibleRows - 1, 3); this->SendMsg(this->scrollBar, 7, value < 0 ? step : -step, 0, 0, 0); @@ -5754,7 +5754,7 @@ int UISkillListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std: // OFFSET: 0x0097D300 // FUNCTION: fn_13326 -void UISkillListWnd::Slot15(int width, int height) { +void UISkillListWnd::OnCreate(int width, int height) { this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(3); @@ -5847,7 +5847,7 @@ void UISkillListWnd::Slot15(int width, int height) { // OFFSET: 0x0098A3A0 // FUNCTION: fn_13413 -void UISkillListWnd::Slot35(int value) { +void UISkillListWnd::OnWheel(int value) { if (this->unknown_0128) { const int step = std::min(this->visibleRows - 1, 3); this->SendMsg(this->scrollBar, 7, value < 0 ? step : -step, 0, 0, 0); @@ -5956,7 +5956,7 @@ void UIMerchantShopMakeWnd::UpdateLayout() { // OFFSET: 0x0098A2B0 // FUNCTION: fn_13410 -void UIItemStoreFindWnd::Slot35(int value) { +void UIItemStoreFindWnd::OnWheel(int value) { if (this->unknown_00E4) { const int step = std::min(this->visibleRows - 1, 3); this->SendMsg(this->scrollBar, 7, value < 0 ? step : -step, 0, 0, 0); @@ -5965,7 +5965,7 @@ void UIItemStoreFindWnd::Slot35(int value) { // OFFSET: 0x0098A300 // FUNCTION: fn_13411 -void UIItemStoreSubWnd::Slot35(int value) { +void UIItemStoreSubWnd::OnWheel(int value) { if (this->unknown_00E4) { const int step = std::min(this->visibleRows - 1, 3); this->SendMsg(this->scrollBar, 7, value < 0 ? step : -step, 0, 0, 0); @@ -5974,7 +5974,7 @@ void UIItemStoreSubWnd::Slot35(int value) { // OFFSET: 0x0098A350 // FUNCTION: fn_13412 -void UIMerchantShopMakeWnd::Slot35(int value) { +void UIMerchantShopMakeWnd::OnWheel(int value) { if (this->unknown_0144) { const int step = std::min(this->unknown_0140 - 1, 3); this->SendMsg(this->scrollBar, 7, value < 0 ? step : -step, 0, 0, 0); @@ -6772,7 +6772,7 @@ int UIMerchantItemShopWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x0097AA00 // FUNCTION: fn_13320 -void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { +void UIMerchantItemPurchaseWnd::OnCreate(int width, int height) { this->total = new UIStaticText(); this->total->SetSize(160, 15); char text[80]; @@ -6827,7 +6827,7 @@ void UIMerchantItemPurchaseWnd::Slot15(int width, int height) { // OFFSET: 0x00979920 // FUNCTION: fn_13318 -void UIMerchantItemMyShopWnd::Slot15(int width, int height) { +void UIMerchantItemMyShopWnd::OnCreate(int width, int height) { if (this->unknown_0100) { this->notice = new UIStaticText(); this->notice->SetSize(160, 15); @@ -6942,9 +6942,9 @@ int UIEditCtrl_Currency::SendMsg(UIWindow* sender, int message, std::intptr_t a, // OFFSET: 0x009845A0 // FUNCTION: fn_13355 -void UIItemPurchaseWnd::Slot25(int x, int y) { +void UIItemPurchaseWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -6969,9 +6969,9 @@ void UIItemPurchaseWnd::Slot25(int x, int y) { // OFFSET: 0x00984700 // FUNCTION: fn_13356 -void UIItemSellWnd2::Slot25(int x, int y) { +void UIItemSellWnd2::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -7004,9 +7004,9 @@ void UIItemSellWnd2::Slot25(int x, int y) { // OFFSET: 0x009848E0 // FUNCTION: fn_13357 -void UIItemSellWnd::Slot25(int x, int y) { +void UIItemSellWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -7039,9 +7039,9 @@ void UIItemSellWnd::Slot25(int x, int y) { // OFFSET: 0x00984AC0 // FUNCTION: fn_13358 -void UIItemShopWnd2::Slot25(int x, int y) { +void UIItemShopWnd2::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -7074,9 +7074,9 @@ void UIItemShopWnd2::Slot25(int x, int y) { // OFFSET: 0x00984CA0 // FUNCTION: fn_13359 -void UIItemShopWnd::Slot25(int x, int y) { +void UIItemShopWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -7101,9 +7101,9 @@ void UIItemShopWnd::Slot25(int x, int y) { // OFFSET: 0x00984DF0 // FUNCTION: fn_13360 -void UIItemStoreFindWnd::Slot25(int x, int y) { +void UIItemStoreFindWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } ITEM_INFO item = this->GetItemAt(x, y); @@ -7117,9 +7117,9 @@ void UIItemStoreFindWnd::Slot25(int x, int y) { // OFFSET: 0x00984F10 // FUNCTION: fn_13361 -void UIItemStoreSubWnd::Slot25(int x, int y) { +void UIItemStoreSubWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } ITEM_INFO item = this->GetItemAt(x, y); @@ -7133,9 +7133,9 @@ void UIItemStoreSubWnd::Slot25(int x, int y) { // OFFSET: 0x00985030 // FUNCTION: fn_13362 -void UIItemStoreWnd::Slot25(int x, int y) { +void UIItemStoreWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } if (g_replayAnimationScaling != 0) { @@ -7153,9 +7153,9 @@ void UIItemStoreWnd::Slot25(int x, int y) { // OFFSET: 0x009853A0 // FUNCTION: fn_13365 -void UIMerchantItemPurchaseWnd::Slot25(int x, int y) { +void UIMerchantItemPurchaseWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -7180,9 +7180,9 @@ void UIMerchantItemPurchaseWnd::Slot25(int x, int y) { // OFFSET: 0x00985830 // FUNCTION: fn_13368 -void UIMerchantMirrorItemWnd::Slot25(int x, int y) { +void UIMerchantMirrorItemWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } if (g_replayAnimationScaling != 0) { @@ -7202,9 +7202,9 @@ void UIMerchantMirrorItemWnd::Slot25(int x, int y) { // OFFSET: 0x00985970 // FUNCTION: fn_13369 -void UIMerchantShopMakeWnd::Slot25(int x, int y) { +void UIMerchantShopMakeWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -7223,7 +7223,7 @@ void UIMerchantShopMakeWnd::Slot25(int x, int y) { // OFFSET: 0x00985B90 // FUNCTION: fn_13371 -void UIItemPurchaseWnd::Slot28(int x, int y) { +void UIItemPurchaseWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7262,7 +7262,7 @@ void UIItemPurchaseWnd::Slot28(int x, int y) { // OFFSET: 0x00985ED0 // FUNCTION: fn_13372 -void UIItemSellWnd2::Slot28(int x, int y) { +void UIItemSellWnd2::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7285,7 +7285,7 @@ void UIItemSellWnd2::Slot28(int x, int y) { // OFFSET: 0x00986190 // FUNCTION: fn_13373 -void UIItemSellWnd::Slot28(int x, int y) { +void UIItemSellWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] == 0) { return; @@ -7320,7 +7320,7 @@ void UIItemSellWnd::Slot28(int x, int y) { // OFFSET: 0x009865C0 // FUNCTION: fn_13374 -void UIItemShopWnd2::Slot28(int x, int y) { +void UIItemShopWnd2::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] == 0) { return; @@ -7354,7 +7354,7 @@ void UIItemShopWnd2::Slot28(int x, int y) { // OFFSET: 0x00986970 // FUNCTION: fn_13375 -void UIItemShopWnd::Slot28(int x, int y) { +void UIItemShopWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7423,7 +7423,7 @@ void UIItemShopWnd::Slot28(int x, int y) { // OFFSET: 0x00987000 // FUNCTION: fn_13376 -void UIItemStoreFindWnd::Slot28(int x, int y) { +void UIItemStoreFindWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7442,7 +7442,7 @@ void UIItemStoreFindWnd::Slot28(int x, int y) { // OFFSET: 0x00987200 // FUNCTION: fn_13377 -void UIItemStoreSubWnd::Slot28(int x, int y) { +void UIItemStoreSubWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7461,7 +7461,7 @@ void UIItemStoreSubWnd::Slot28(int x, int y) { // OFFSET: 0x00987400 // FUNCTION: fn_13378 -void UIItemStoreWnd::Slot28(int x, int y) { +void UIItemStoreWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7480,7 +7480,7 @@ void UIItemStoreWnd::Slot28(int x, int y) { // OFFSET: 0x00987600 // FUNCTION: fn_13379 -void UIItemWnd::Slot28(int x, int y) { +void UIItemWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7501,7 +7501,7 @@ void UIItemWnd::Slot28(int x, int y) { // OFFSET: 0x00987850 // FUNCTION: fn_13380 -void UIMerchantItemMyShopWnd::Slot28(int x, int y) { +void UIMerchantItemMyShopWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7528,7 +7528,7 @@ void UIMerchantItemMyShopWnd::Slot28(int x, int y) { // OFFSET: 0x00987B90 // FUNCTION: fn_13381 -void UIMerchantItemPurchaseWnd::Slot28(int x, int y) { +void UIMerchantItemPurchaseWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7546,7 +7546,7 @@ void UIMerchantItemPurchaseWnd::Slot28(int x, int y) { // OFFSET: 0x00987D40 // FUNCTION: fn_13382 -void UIMerchantItemShopWnd::Slot28(int x, int y) { +void UIMerchantItemShopWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7583,7 +7583,7 @@ void UIMerchantItemShopWnd::Slot28(int x, int y) { // OFFSET: 0x009880F0 // FUNCTION: fn_13383 -void UIMerchantItemWnd::Slot28(int x, int y) { +void UIMerchantItemWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7604,7 +7604,7 @@ void UIMerchantItemWnd::Slot28(int x, int y) { // OFFSET: 0x00988340 // FUNCTION: fn_13384 -void UIMerchantMirrorItemWnd::Slot28(int x, int y) { +void UIMerchantMirrorItemWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -7811,7 +7811,7 @@ UIItemStoreWnd::UIItemStoreWnd() : UIItemBaseWnd() { // OFFSET: 0x00977E10 // FUNCTION: fn_13316 -void UIItemStoreWnd::Slot15(int width, int height) { +void UIItemStoreWnd::OnCreate(int width, int height) { this->title = new UIStaticText(); this->title->SetSize(70, 15); this->title->SetText(LookupMessage(g_unknown_01738268 ? 2500 : 169), 0); @@ -7921,7 +7921,7 @@ void UIItemStoreWnd::Slot15(int width, int height) { // OFFSET: 0x009792B0 // FUNCTION: fn_13317 -void UIItemWnd::Slot15(int width, int height) { +void UIItemWnd::OnCreate(int width, int height) { this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); @@ -10550,9 +10550,9 @@ void UIMerchantShopMakeWnd::PrintSellList() { // OFFSET: 0x00985160 // FUNCTION: fn_13363 -void UIItemWnd::Slot25(int x, int y) { +void UIItemWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } if (g_replayAnimationScaling != 0) { @@ -10588,9 +10588,9 @@ void UIItemWnd::Slot25(int x, int y) { // OFFSET: 0x00985610 // FUNCTION: fn_13367 -void UIMerchantItemWnd::Slot25(int x, int y) { +void UIMerchantItemWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } if (g_replayAnimationScaling != 0) { @@ -10624,7 +10624,7 @@ void UIMerchantItemWnd::Slot25(int x, int y) { // OFFSET: 0x00988590 // FUNCTION: fn_13385 -void UISkillListWnd::Slot28(int x, int y) { +void UISkillListWnd::OnMouseHover(int x, int y) { if (g_skillTooltipActive == 1) { const int elapsed = timeGetTime() - g_skillTooltipTick; if (elapsed > 1000 || elapsed < 0) { @@ -11085,7 +11085,7 @@ void UIItemWnd::Paint() { // OFFSET: 0x00974910 // FUNCTION: fn_13308 -void UIItemDropCntWnd::Slot15(int, int) { +void UIItemDropCntWnd::OnCreate(int, int) { this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(80, 16); this->m_edit->Move(15, 22); @@ -11134,7 +11134,7 @@ void UIItemDropCntWnd::Slot15(int, int) { // OFFSET: 0x00975050 // FUNCTION: fn_13309 -void UIItemPurchaseWnd::Slot15(int width, int height) { +void UIItemPurchaseWnd::OnCreate(int width, int height) { this->quantityEdit = new UIEditCtrl(); this->quantityEdit->SetSize(64, 16); this->quantityEdit->maximum = 9; diff --git a/Source/UI/Edit/UIEditCtrl.h b/Source/UI/Edit/UIEditCtrl.h index f7f0a8f69..cb5b840f2 100644 --- a/Source/UI/Edit/UIEditCtrl.h +++ b/Source/UI/Edit/UIEditCtrl.h @@ -24,14 +24,14 @@ public: UIEditCtrl(); UIEditCtrl(const UIEditCtrl& other); ~UIEditCtrl() override; - bool Slot05() override; + bool IsEditable() override; void Paint() override; - void Slot23() override; - void Slot24(int retained) override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnBeginEdit() override; + void OnFinishEdit(int retained) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - int Slot46() override; + int GetWindowType() override; virtual void SetText(const char* value); virtual void SelectAll(); virtual void PaintText(); @@ -94,7 +94,7 @@ class UIEditCtrlWheel : public UIEditCtrl { public: UIEditCtrlWheel(); ~UIEditCtrlWheel() override; - void Slot35(int value) override; + void OnWheel(int value) override; }; class UIEditCtrl2 : public UIEditCtrl { @@ -109,14 +109,14 @@ public: UIEditCtrl3(); UIEditCtrl3(const UIEditCtrl3& other); ~UIEditCtrl3() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Resize(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetText(const char* value) override; void PaintText() override; void SetLinkedText(const char* value); - void Slot35(int value) override; + void OnWheel(int value) override; void Trim() override; virtual void UpdateScrollBar(); virtual void DrawBlinkingCaret(const std::uint32_t& color); @@ -170,7 +170,7 @@ class UIEditCtrl4 : public UIEditCtrl { public: UIEditCtrl4(); ~UIEditCtrl4() override; - void Slot23() override; + void OnBeginEdit() override; void PaintText() override; void SetPlaceholderEnabled(bool enabled); void SetPlaceholderColor(std::uint32_t color); @@ -200,7 +200,7 @@ class UIChatEditCtrl : public UIEditCtrl { public: UIChatEditCtrl(); void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void InsertItemTag(int tagId); void InsertItemLink(const ITEM_INFO& item); @@ -217,7 +217,7 @@ class UIEditCtrl_OldList : public UIEditCtrl { public: UIEditCtrl_OldList(); void Paint() override; - void Slot35(int value) override; + void OnWheel(int value) 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 RecallHistory(int step); /* 011C */ std::string bitmapName; @@ -228,8 +228,8 @@ public: class UIWhisperEditCtrl : public UIEditCtrl { public: UIWhisperEditCtrl(); - void Slot23() override; - void Slot24(int retained) override; + void OnBeginEdit() override; + void OnFinishEdit(int retained) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetText(const char* value) override; void AddHistory(); @@ -241,8 +241,8 @@ class UIEditCtrlVarId : public UIEditCtrl { public: // INLINED UIEditCtrlVarId() : UIEditCtrl() {} - void Slot24(int retained) override; - void Slot35(int value) override; + void OnFinishEdit(int retained) override; + void OnWheel(int value) 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 SetText(const char* value) override; }; @@ -254,7 +254,7 @@ class UIShowAndEditTimeCtrl : public UIWindow { public: UIShowAndEditTimeCtrl(); void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; /* 007C */ UIEditCtrlVarId* fields[2]; diff --git a/Source/UI/Edit/UIEditCtrl_Currency.h b/Source/UI/Edit/UIEditCtrl_Currency.h index b057bea5d..e7368fe0b 100644 --- a/Source/UI/Edit/UIEditCtrl_Currency.h +++ b/Source/UI/Edit/UIEditCtrl_Currency.h @@ -23,7 +23,7 @@ public: class UIEditCtrl_Currency : public UIEditCtrl_Custom { public: UIEditCtrl_Currency(); - void Slot19() override; + void OnProcess() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 012C */ std::size_t formattedLength; diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index 51e048fd5..5d0f1fa9c 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -321,7 +321,7 @@ UIEditCtrl3::UIEditCtrl3() : UIEditCtrl2() { // FUNCTION: fn_10658 UIEditCtrl3::UIEditCtrl3(const UIEditCtrl3& other) : UIEditCtrl2(other) { this->unknown_0130 = 0; - this->UIEditCtrl3::Slot15(other.geometry.width, other.geometry.height); + this->UIEditCtrl3::OnCreate(other.geometry.width, other.geometry.height); this->unknown_0134 = other.unknown_0134; this->unknown_0138 = other.unknown_0138; @@ -373,7 +373,7 @@ UIEditCtrl3::~UIEditCtrl3() { // OFFSET: 0x0085AC40 // FUNCTION: fn_10786 -void UIEditCtrl3::Slot15(int width, int height) { +void UIEditCtrl3::OnCreate(int width, int height) { this->unknown_0130 = new UIScrollBar3(); static_cast(this->unknown_0130)->Configure(width - 10, 0, 1, height); this->AddChild(this->unknown_0130); @@ -398,7 +398,7 @@ int UIWhisperEditCtrl::SendMsg(UIWindow* sender, int message, std::intptr_t a, s --this->historyIndex; } this->SetText(this->history[this->historyIndex].c_str()); - this->Slot23(); + this->OnBeginEdit(); } break; case 19: @@ -406,10 +406,10 @@ int UIWhisperEditCtrl::SendMsg(UIWindow* sender, int message, std::intptr_t a, s ++this->historyIndex; if (this->historyIndex == static_cast(this->history.size())) { this->SetText(""); - this->Slot23(); + this->OnBeginEdit(); } else { this->SetText(this->history[this->historyIndex].c_str()); - this->Slot23(); + this->OnBeginEdit(); } } break; @@ -437,7 +437,7 @@ void UIEditCtrl_OldList::RecallHistory(int step) { } this->SetText(this->history[this->historyIndex].c_str()); - this->Slot23(); + this->OnBeginEdit(); this->Invalidate(); } @@ -754,7 +754,7 @@ UIEditCtrl4::~UIEditCtrl4() = default; // OFFSET: 0x0085AA40 // FUNCTION: fn_10782 -void UIEditCtrl4::Slot23() { +void UIEditCtrl4::OnBeginEdit() { this->text = ""; g_serverLanguage->ResetInput(); g_serverLanguage->ReplaceInput(this->text.c_str()); @@ -843,7 +843,7 @@ void UIEditCtrl3::Paint() { // OFFSET: 0x0085FF60 // FUNCTION: fn_10892 -void UIEditCtrl3::Slot35(int value) { +void UIEditCtrl3::OnWheel(int value) { if (this->unknown_0134 == 0) { return; } @@ -912,12 +912,12 @@ UIChatEditCtrl::UIChatEditCtrl() : UIEditCtrl(), historyLimit(30) { // OFFSET: 0x0085EB50 // FUNCTION: fn_10840 -void UIChatEditCtrl::Slot25(int x, int y) { +void UIChatEditCtrl::OnLBtnDown(int x, int y) { if (this->disabled == 0) { g_windowMgr.SetFocus(this); } - this->parent->Slot25(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnDown(x + this->geometry.x, y + this->geometry.y); } // OFFSET: 0x00863640 @@ -934,14 +934,14 @@ int UIChatEditCtrl::SendMsg(UIWindow* sender, int message, std::intptr_t a, std: } this->SetText(this->history[this->unknown_0140].c_str()); - this->Slot23(); + this->OnBeginEdit(); } break; case 19: if (this->history.size() != 0 && this->unknown_0140 < this->history.size()) { ++this->unknown_0140; this->SetText((this->unknown_0140 == this->history.size() ? this->pending : this->history[this->unknown_0140]).c_str()); - this->Slot23(); + this->OnBeginEdit(); } break; default: @@ -964,7 +964,7 @@ void UIEditCtrl_OldList::Paint() { // OFFSET: 0x0085FFC0 // FUNCTION: fn_10894 -void UIEditCtrl_OldList::Slot35(int value) { +void UIEditCtrl_OldList::OnWheel(int value) { if (value < 0) { this->SendMsg(nullptr, 19, 0, 0, 0, 0); } else { @@ -974,7 +974,7 @@ void UIEditCtrl_OldList::Slot35(int value) { // OFFSET: 0x0085E3D0 // FUNCTION: fn_10827 -void UIEditCtrlVarId::Slot24(int) { +void UIEditCtrlVarId::OnFinishEdit(int) { this->Synchronize(); this->Invalidate(); this->SendMsg(this, 0, 0, 0, 0, 0); @@ -982,9 +982,9 @@ void UIEditCtrlVarId::Slot24(int) { // OFFSET: 0x0085FFA0 // FUNCTION: fn_10893 -void UIEditCtrlVarId::Slot35(int value) { +void UIEditCtrlVarId::OnWheel(int value) { if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -1011,7 +1011,7 @@ void UIEditCtrlVarId::SetText(const char* value) { // OFFSET: 0x0085AB10 // FUNCTION: fn_10784 -void UIWhisperEditCtrl::Slot23() { +void UIWhisperEditCtrl::OnBeginEdit() { g_serverLanguage->ResetInput(); g_serverLanguage->ReplaceInput(this->text.c_str()); g_serverLanguage->SetPassword(this->mask != 0); @@ -1046,7 +1046,7 @@ int UIEditCtrl_OldList::SendMsg(UIWindow* sender, int message, std::intptr_t arg // OFFSET: 0x00886F90 // FUNCTION: fn_11330 -void UIShowAndEditTimeCtrl::Slot15(int, int) { +void UIShowAndEditTimeCtrl::OnCreate(int, int) { for (int i = 0; i < 2; ++i) { UIEditCtrlVarId*& field = this->fields[i]; field = new UIEditCtrlVarId(); diff --git a/Source/UI/Emotion/UIEmotionWnd.cpp b/Source/UI/Emotion/UIEmotionWnd.cpp index accd8dd37..256876635 100644 --- a/Source/UI/Emotion/UIEmotionWnd.cpp +++ b/Source/UI/Emotion/UIEmotionWnd.cpp @@ -42,7 +42,7 @@ UIBitmapButton* UIEmotionWnd::AddCloseButton(const char* tooltip, int width) { // OFFSET: 0x008A2980 // FUNCTION: fn_11644 -void UIEmotionWnd::Slot15(int, int) { +void UIEmotionWnd::OnCreate(int, int) { int y = 23; auto* emotions = &g_session.m_emotionHotkeys; char buffer[16]; @@ -103,9 +103,9 @@ void UIEmotionWnd::Paint() { // OFFSET: 0x008A3040 // FUNCTION: fn_11646 -void UIEmotionWnd::Slot25(int x, int y) { +void UIEmotionWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } } @@ -164,7 +164,7 @@ void UIEmotionWnd::SetMacroText(const char* text, int index) { // OFFSET: 0x008A31E0 // FUNCTION: fn_11649 -void UIEmotionWnd::Slot11() { +void UIEmotionWnd::StoreInfo() { if (this->m_saved != nullptr) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; diff --git a/Source/UI/Emotion/UIEmotionWnd.h b/Source/UI/Emotion/UIEmotionWnd.h index e156bc35b..fd2a44f5f 100644 --- a/Source/UI/Emotion/UIEmotionWnd.h +++ b/Source/UI/Emotion/UIEmotionWnd.h @@ -19,10 +19,10 @@ public: UIEmotionWnd() : UIFrameWnd(0), m_labels(), m_edits(), m_saved(nullptr), viewButton(nullptr) { } - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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 SetMacroText(const char* text, int index); diff --git a/Source/UI/Enchant/EnchantUI.h b/Source/UI/Enchant/EnchantUI.h index 395f59c91..2ac6179e7 100644 --- a/Source/UI/Enchant/EnchantUI.h +++ b/Source/UI/Enchant/EnchantUI.h @@ -46,10 +46,10 @@ public: } ~CUIEnchantUI() override; bool CanHitTest() override; - __declspec(noinline) void Slot15(int width, int height) override; - void Slot16() override; - void Slot25(int x, int y) override; - virtual void Slot53(); + __declspec(noinline) void OnCreate(int width, int height) override; + void OnInit() override; + void OnLBtnDown(int x, int y) override; + virtual void Initialize(); void SetEnchantGroup(uint64_t group); void OnSelectTarget(EnchantUI::CUITargetItem* item, const ITEM_INFO& info); void OnClickClose(); @@ -68,9 +68,9 @@ public: /* 00E8 */ CUIGameItem* itemIcon; /* 00EC */ CUIStaticText* name; - void Slot15(int width, int height) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnCreate(int width, int height) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void SetFrozen(bool frozen) override; }; @@ -84,9 +84,9 @@ public: /* 00EC */ CUIStaticImage* unknown_00EC; /* 00F0 */ CUIStaticText* unknown_00F0; - void Slot15(int width, int height) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnCreate(int width, int height) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void SetSelected(bool selected) override; ITEM_INFO* GetItemInfo(); @@ -104,7 +104,7 @@ public: /* 008C */ CUIStaticText* ownedText; /* 0090 */ CUIStaticText* requiredText; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; __declspec(noinline) void SetMaterial(int itemId, int required); }; @@ -126,14 +126,14 @@ public: /* 00A8 */ uint64_t group; /* 00B0 */ int unknown_00B0; - void Slot15(int width, int height) override; - void Slot16() override; - virtual void Slot54(CUIEnchantItem* item, const CEnchantItemData& data); - virtual void Slot55() = 0; - virtual bool Slot56() = 0; - virtual void Slot57(); - virtual void Slot58(int value); - virtual void Slot59(int value); + void OnCreate(int width, int height) override; + void OnInit() override; + virtual void OnSelectEnchant(CUIEnchantItem* item, const CEnchantItemData& data); + virtual void RequestEnchant() = 0; + virtual bool LoadEnchantList() = 0; + virtual void UpdateEnchantInfo(); + virtual void OnSelectSlot(int value); + virtual void SetSlot(int value); __declspec(noinline) CUIIngredient* CreateIngredient(); void ResetSlots(); @@ -145,7 +145,7 @@ public: if (info && this->SetItem(item)) { this->group = targetGroup; this->enchantInfo = info; - this->Slot57(); + this->UpdateEnchantInfo(); } } @@ -159,50 +159,50 @@ class CUINormalRandom : public CUIEnchantPage { public: using CUIEnchantPage::CUIEnchantPage; - void Slot15(int width, int height) override; - void Slot16() override; - void Slot55() override; - bool Slot56() override; + void OnCreate(int width, int height) override; + void OnInit() override; + void RequestEnchant() override; + bool LoadEnchantList() override; }; class CUINormalPerfect : public CUIEnchantPage { public: using CUIEnchantPage::CUIEnchantPage; - void Slot15(int width, int height) override; - void Slot16() override; - void Slot54(CUIEnchantItem* item, const CEnchantItemData& data) override; - void Slot55() override; - bool Slot56() override; + void OnCreate(int width, int height) override; + void OnInit() override; + void OnSelectEnchant(CUIEnchantItem* item, const CEnchantItemData& data) override; + void RequestEnchant() override; + bool LoadEnchantList() override; }; class CUIReset : public CUIEnchantPage { public: using CUIEnchantPage::CUIEnchantPage; - void Slot15(int width, int height) override; - void Slot16() override; - void Slot55() override; - bool Slot56() override; - void Slot57() override; + void OnCreate(int width, int height) override; + void OnInit() override; + void RequestEnchant() override; + bool LoadEnchantList() override; + void UpdateEnchantInfo() override; }; class CUIUpgradeEnchantPage : public CUIEnchantPage { public: using CUIEnchantPage::CUIEnchantPage; - void Slot58(int value) override; - void Slot59(int value) override; + void OnSelectSlot(int value) override; + void SetSlot(int value) override; }; class CUIUpgradeRandom : public CUIUpgradeEnchantPage { public: using CUIUpgradeEnchantPage::CUIUpgradeEnchantPage; - void Slot15(int width, int height) override; - void Slot16() override; - void Slot55() override; - bool Slot56() override; + void OnCreate(int width, int height) override; + void OnInit() override; + void RequestEnchant() override; + bool LoadEnchantList() override; }; class CUIUpgradePerfect : public CUIUpgradeEnchantPage { @@ -211,10 +211,10 @@ public: /* 00B8 */ bool unknown_00B8 = false; - void Slot15(int width, int height) override; - void Slot54(CUIEnchantItem* item, const CEnchantItemData& data) override; - void Slot55() override; - bool Slot56() override; + void OnCreate(int width, int height) override; + void OnSelectEnchant(CUIEnchantItem* item, const CEnchantItemData& data) override; + void RequestEnchant() override; + bool LoadEnchantList() override; }; class CUIMainPage : public CUIControl { @@ -225,7 +225,7 @@ public: /* 0084 */ CUIEnchantPage* secondPage; /* 0088 */ CUITab* tab; - void Slot16() override; + void OnInit() override; // INLINED void LoadTarget(EnchantInfo* info, uint64_t targetGroup, const ITEM_INFO& item) { @@ -238,14 +238,14 @@ class CUINormal : public CUIMainPage { public: using CUIMainPage::CUIMainPage; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; class CUIUpgrade : public CUIMainPage { public: using CUIMainPage::CUIMainPage; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; class CEnchantItemData { @@ -264,10 +264,10 @@ public: /* 0084 */ CUIGameItem* itemIcon; /* 0088 */ CUITextViewer* description; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot32(int x, int y) override; + void OnRBtnDown(int x, int y) override; void SelectSlot(UIWindow* button); }; @@ -276,32 +276,32 @@ class CUISlot0 : public CUISlot { public: using CUISlot::CUISlot; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; }; class CUISlot1 : public CUISlot { public: using CUISlot::CUISlot; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; }; class CUISlot2 : public CUISlot { public: using CUISlot::CUISlot; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; }; class CUISlot3 : public CUISlot { public: using CUISlot::CUISlot; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; }; } diff --git a/Source/UI/Enchant/UIEnchantUI.cpp b/Source/UI/Enchant/UIEnchantUI.cpp index 2d0aee24f..ca6b7be73 100644 --- a/Source/UI/Enchant/UIEnchantUI.cpp +++ b/Source/UI/Enchant/UIEnchantUI.cpp @@ -78,20 +78,20 @@ CEnchantMgr* Singleton::s_instance = nullptr; // FUNCTION: fn_14814 // OFFSET: 0x009F9C10 // FUNCTION: fn_14815 -template void CUIListBoxEx::Slot15(int width, int height) { +template void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); this->AddChild(this->scrollBar); } -template void CUIListBoxEx::Slot15(int, int); -template void CUIListBoxEx::Slot15(int, int); +template void CUIListBoxEx::OnCreate(int, int); +template void CUIListBoxEx::OnCreate(int, int); template void CUIListBoxEx::Paint(); template void CUIListBoxEx::Paint(); -template void CUIListBoxEx::Slot35(int); -template void CUIListBoxEx::Slot35(int); +template void CUIListBoxEx::OnWheel(int); +template void CUIListBoxEx::OnWheel(int); template void CUIListBoxEx::OnScroll(int); template void CUIListBoxEx::OnScroll(int); template void CUIListBoxEx::ClearItems(); @@ -181,7 +181,7 @@ void CUIListBoxEx::AddNe // OFFSET: 0x00A022A0 // FUNCTION: fn_14839 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -279,7 +279,7 @@ void CUIListBoxEx::AddNewItem() { // OFFSET: 0x00A024B0 // FUNCTION: fn_14840 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -355,7 +355,7 @@ CUIListBoxEx::~CUIListBo namespace EnchantUI { // OFFSET: 0x009F9CE0 // FUNCTION: fn_14816 -void CUIEnchantItem::Slot15(int width, int height) { +void CUIEnchantItem::OnCreate(int width, int height) { this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); @@ -389,7 +389,7 @@ void CUIEnchantItem::Slot15(int width, int height) { // OFFSET: 0x00A00880 // FUNCTION: fn_14828 -void CUITargetItem::Slot15(int width, int height) { +void CUITargetItem::OnCreate(int width, int height) { this->itemIcon = new CUIGameItem(); this->itemIcon->SetMode(0); this->itemIcon->SetScale(100); @@ -441,7 +441,7 @@ void CUITargetItem::Slot15(int width, int height) { // OFFSET: 0x009F9880 // FUNCTION: fn_14809 -void CUIEnchantPage::Slot58(int) { +void CUIEnchantPage::OnSelectSlot(int) { } // OFFSET: 0x009F99B0 @@ -456,7 +456,7 @@ CUIIngredient* CUIEnchantPage::CreateIngredient() { // OFFSET: 0x009FB800 // FUNCTION: fn_14818 -void CUIIngredient::Slot15(int width, int height) { +void CUIIngredient::OnCreate(int width, int height) { this->unknown_0080 = new CUIStaticImage(); this->unknown_0080->SetSize(70, 50); this->unknown_0080->Move(0, 0); @@ -548,7 +548,7 @@ void CUIIngredient::Slot15(int width, int height) { // OFFSET: 0x009F9B30 // FUNCTION: fn_14813 -void CUIEnchantPage::Slot54(CUIEnchantItem* item, const CEnchantItemData& data) { +void CUIEnchantPage::OnSelectEnchant(CUIEnchantItem* item, const CEnchantItemData& data) { } } @@ -569,8 +569,8 @@ static bool s_registered = [] { namespace EnchantUI { // OFFSET: 0x009FD340 // FUNCTION: fn_14823 -void CUISlot0::Slot15(int width, int height) { - CUISlot::Slot15(width, height); +void CUISlot0::OnCreate(int width, int height) { + CUISlot::OnCreate(width, height); this->radioButton->Move(59, 1); this->radioButton->SetOnSelect([this](CUIRadioButton* button) { this->SelectSlot(button); }); { @@ -611,8 +611,8 @@ void CUISlot0::Slot15(int width, int height) { // OFFSET: 0x009FDC30 // FUNCTION: fn_14824 -void CUISlot1::Slot15(int width, int height) { - CUISlot::Slot15(width, height); +void CUISlot1::OnCreate(int width, int height) { + CUISlot::OnCreate(width, height); this->radioButton->Move(59, 1); this->radioButton->SetOnSelect([this](CUIRadioButton* button) { this->SelectSlot(button); }); { @@ -653,8 +653,8 @@ void CUISlot1::Slot15(int width, int height) { // OFFSET: 0x009FE520 // FUNCTION: fn_14825 -void CUISlot2::Slot15(int width, int height) { - CUISlot::Slot15(width, height); +void CUISlot2::OnCreate(int width, int height) { + CUISlot::OnCreate(width, height); this->radioButton->Move(3, 1); this->radioButton->SetOnSelect([this](CUIRadioButton* button) { this->SelectSlot(button); }); { @@ -695,8 +695,8 @@ void CUISlot2::Slot15(int width, int height) { // OFFSET: 0x009FEE10 // FUNCTION: fn_14826 -void CUISlot3::Slot15(int width, int height) { - CUISlot::Slot15(width, height); +void CUISlot3::OnCreate(int width, int height) { + CUISlot::OnCreate(width, height); this->radioButton->Move(3, 1); this->radioButton->SetOnSelect([this](CUIRadioButton* button) { this->SelectSlot(button); }); { @@ -740,7 +740,7 @@ void CUISlot3::Slot15(int width, int height) { namespace EnchantUI { // OFFSET: 0x009FC080 // FUNCTION: fn_14819 -void CUINormal::Slot15(int width, int height) { +void CUINormal::OnCreate(int width, int height) { this->firstPage = new CUINormalRandom; this->firstPage->SetSize(470, 377); this->firstPage->Move(0, 0); @@ -869,7 +869,7 @@ void CUINormal::Slot15(int width, int height) { // OFFSET: 0x009FF700 // FUNCTION: fn_14827 -void CUISlot::Slot15(int width, int height) { +void CUISlot::OnCreate(int width, int height) { this->radioButton = new CUIRadioButton(); this->radioButton->SetSize(44, 44); this->radioButton->Move(59, 1); @@ -1024,7 +1024,7 @@ void CUISlot::Slot15(int width, int height) { // OFFSET: 0x00A00D50 // FUNCTION: fn_14829 -void CUIUpgrade::Slot15(int width, int height) { +void CUIUpgrade::OnCreate(int width, int height) { this->firstPage = new CUIUpgradeRandom; this->firstPage->SetSize(470, 377); this->firstPage->Move(0, 0); @@ -1161,22 +1161,22 @@ void CUIRadioButton::SetOnSelect(std::function callback) namespace EnchantUI { // OFFSET: 0x00A02D80 // FUNCTION: fn_14845 -void CUIEnchantPage::Slot59(int value) { +void CUIEnchantPage::SetSlot(int value) { this->unknown_00B0 = value; } // OFFSET: 0x00A05190 // FUNCTION: fn_14970 -void CUIUpgradeEnchantPage::Slot58(int value) { +void CUIUpgradeEnchantPage::OnSelectSlot(int value) { if (CUIMainPage* mainPage = dynamic_cast(this->parent)) { - mainPage->firstPage->Slot59(value); - mainPage->secondPage->Slot59(value); + mainPage->firstPage->SetSlot(value); + mainPage->secondPage->SetSlot(value); } } // OFFSET: 0x00A06B00 // FUNCTION: fn_15006 -void CUIUpgradeEnchantPage::Slot59(int value) { +void CUIUpgradeEnchantPage::SetSlot(int value) { this->unknown_00B0 = value; for (const auto& slot : this->unknown_0088) { const bool selected = value == slot.first; @@ -1186,7 +1186,7 @@ void CUIUpgradeEnchantPage::Slot59(int value) { slot.second->description->SetBold(selected); slot.second->description->Relayout(); } - this->Slot57(); + this->UpdateEnchantInfo(); } // OFFSET: 0x00A05290 @@ -1236,42 +1236,42 @@ void CUISlot::Paint() { // OFFSET: 0x00A05DF0 // FUNCTION: fn_14983 -void CUIEnchantUI::Slot16() { +void CUIEnchantUI::OnInit() { this->Move((g_renderer->viewport.width - this->geometry.width) / 2, (g_renderer->viewport.height - this->geometry.height) / 2); } namespace EnchantUI { // OFFSET: 0x00A06050 // FUNCTION: fn_14988 -void CUISlot0::Slot16() { - CUISlot::Slot16(); +void CUISlot0::OnInit() { + CUISlot::OnInit(); this->radioButton->SetId(0); } // OFFSET: 0x00A06090 // FUNCTION: fn_14989 -void CUISlot1::Slot16() { - CUISlot::Slot16(); +void CUISlot1::OnInit() { + CUISlot::OnInit(); this->radioButton->SetId(1); } // OFFSET: 0x00A060D0 // FUNCTION: fn_14990 -void CUISlot2::Slot16() { - CUISlot::Slot16(); +void CUISlot2::OnInit() { + CUISlot::OnInit(); this->radioButton->SetId(2); } // OFFSET: 0x00A06110 // FUNCTION: fn_14991 -void CUISlot3::Slot16() { - CUISlot::Slot16(); +void CUISlot3::OnInit() { + CUISlot::OnInit(); this->radioButton->SetId(3); } // OFFSET: 0x00A06150 // FUNCTION: fn_14992 -void CUISlot::Slot16() { +void CUISlot::OnInit() { this->itemIcon->hitEnabled = 0; this->description->scrollBar->SetHidden(1); } @@ -1279,50 +1279,50 @@ void CUISlot::Slot16() { // OFFSET: 0x00A06190 // FUNCTION: fn_14994 -void CUIEnchantUI::Slot25(int x, int y) { +void CUIEnchantUI::OnLBtnDown(int x, int y) { if (this->titleBar->IsPointInside(x, y)) { - CUIFrameWnd::Slot25(x, y); + CUIFrameWnd::OnLBtnDown(x, y); } } namespace EnchantUI { // OFFSET: 0x00A061C0 // FUNCTION: fn_14995 -void CUIEnchantItem::Slot28(int x, int y) { - this->itemIcon->Slot28(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); +void CUIEnchantItem::OnMouseHover(int x, int y) { + this->itemIcon->OnMouseHover(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } // OFFSET: 0x00A061F0 // FUNCTION: fn_14996 -void CUITargetItem::Slot28(int x, int y) { - this->itemIcon->Slot28(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); +void CUITargetItem::OnMouseHover(int x, int y) { + this->itemIcon->OnMouseHover(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } // OFFSET: 0x00A06220 // FUNCTION: fn_14997 -void CUIEnchantItem::Slot32(int x, int y) { - this->itemIcon->Slot32(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); +void CUIEnchantItem::OnRBtnDown(int x, int y) { + this->itemIcon->OnRBtnDown(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } // OFFSET: 0x00A06250 // FUNCTION: fn_14998 -void CUISlot::Slot32(int x, int y) { +void CUISlot::OnRBtnDown(int x, int y) { if (this->itemIcon->IsPointInside(x, y)) { - this->itemIcon->Slot32(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); + this->itemIcon->OnRBtnDown(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } } // OFFSET: 0x00A06290 // FUNCTION: fn_14999 -void CUITargetItem::Slot32(int x, int y) { - this->itemIcon->Slot32(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); +void CUITargetItem::OnRBtnDown(int x, int y) { + this->itemIcon->OnRBtnDown(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } // OFFSET: 0x00A062C0 // FUNCTION: fn_15000 void CUISlot::SelectSlot(UIWindow* button) { if (CUIEnchantPage* page = dynamic_cast(this->parent)) { - page->Slot58(button->geometry.id); + page->OnSelectSlot(button->geometry.id); } } @@ -1345,7 +1345,7 @@ void CUITargetItem::SetSelected(bool selected) { // OFFSET: 0x00A04D70 // FUNCTION: fn_14965 -void CUINormalPerfect::Slot55() { +void CUINormalPerfect::RequestEnchant() { CUIListBoxEx* list = this->enchantList; if (static_cast(list->selected) >= 0 && list->selected < list->data.size()) { auto it = list->data.begin(); @@ -1360,7 +1360,7 @@ void CUINormalPerfect::Slot55() { // OFFSET: 0x00A04E60 // FUNCTION: fn_14966 -void CUINormalRandom::Slot55() { +void CUINormalRandom::RequestEnchant() { CEnchantMgr::GetInstance()->RequestRandomEnchant( this->group, static_cast(this->gameItem->GetItemInfo()->unknown_0000[1]), static_cast(this->unknown_00B0) ); @@ -1368,13 +1368,13 @@ void CUINormalRandom::Slot55() { // OFFSET: 0x00A04F10 // FUNCTION: fn_14967 -void CUIReset::Slot55() { +void CUIReset::RequestEnchant() { CEnchantMgr::GetInstance()->RequestResetEnchant(this->group, static_cast(this->gameItem->GetItemInfo()->unknown_0000[1])); } // OFFSET: 0x00A04FB0 // FUNCTION: fn_14968 -void CUIUpgradePerfect::Slot55() { +void CUIUpgradePerfect::RequestEnchant() { if (this->unknown_00B8) { CEnchantMgr::GetInstance()->RequestUpgradeEnchant( this->group, static_cast(this->gameItem->GetItemInfo()->unknown_0000[1]), static_cast(this->unknown_00B0) @@ -1394,7 +1394,7 @@ void CUIUpgradePerfect::Slot55() { // OFFSET: 0x00A050E0 // FUNCTION: fn_14969 -void CUIUpgradeRandom::Slot55() { +void CUIUpgradeRandom::RequestEnchant() { CEnchantMgr::GetInstance()->RequestUpgradeRandomEnchant( this->group, static_cast(this->gameItem->GetItemInfo()->unknown_0000[1]), static_cast(this->unknown_00B0) ); @@ -1509,7 +1509,7 @@ void UpdateTargetItem(CUITargetItem* item, ITEM_INFO* info) { } // OFFSET: 0x00A05E20 // FUNCTION: fn_14984 -void CUIMainPage::Slot16() { +void CUIMainPage::OnInit() { CUITabButton* button = this->tab->FindButton(this->firstPage); if (button != nullptr) { button->disabled = 1; @@ -1526,19 +1526,19 @@ void CUIMainPage::Slot16() { // OFFSET: 0x009F3160 // FUNCTION: fn_14752 -void CUIEnchantUI::Slot53() { +void CUIEnchantUI::Initialize() { this->unknown_00B4 = 0; this->m_resolveSkin = true; this->Resize(690, 470); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A06170 // FUNCTION: fn_14993 -void EnchantUI::CUIUpgradeRandom::Slot16() { - EnchantUI::CUIEnchantPage::Slot16(); +void EnchantUI::CUIUpgradeRandom::OnInit() { + EnchantUI::CUIEnchantPage::OnInit(); auto* const list = this->enchantList; list->unknown_00C4 = 1; list->Invalidate(); @@ -1547,7 +1547,7 @@ void EnchantUI::CUIUpgradeRandom::Slot16() { namespace EnchantUI { // OFFSET: 0x00A05CF0 // FUNCTION: fn_14981 -void CUIEnchantPage::Slot16() { +void CUIEnchantPage::OnInit() { for (int i = 0; i < 8; ++i) { CUIIngredient* ingredient = this->CreateIngredient(); ingredient->Move(ingredient->geometry.x + i % 4 * 74, ingredient->geometry.y + i / 4 * 52); @@ -1559,8 +1559,8 @@ void CUIEnchantPage::Slot16() { // OFFSET: 0x00A05E80 // FUNCTION: fn_14985 -void CUINormalPerfect::Slot16() { - CUIEnchantPage::Slot16(); +void CUINormalPerfect::OnInit() { + CUIEnchantPage::OnInit(); for (const auto& slot : this->unknown_0088) { auto* const radioButton = slot.second->radioButton; radioButton->disabled = 1; @@ -1570,8 +1570,8 @@ void CUINormalPerfect::Slot16() { // OFFSET: 0x00A05F10 // FUNCTION: fn_14986 -void CUINormalRandom::Slot16() { - CUIEnchantPage::Slot16(); +void CUINormalRandom::OnInit() { + CUIEnchantPage::OnInit(); for (const auto& slot : this->unknown_0088) { auto* const radioButton = slot.second->radioButton; radioButton->disabled = 1; @@ -1585,8 +1585,8 @@ void CUINormalRandom::Slot16() { // OFFSET: 0x00A05FB0 // FUNCTION: fn_14987 -void CUIReset::Slot16() { - CUIEnchantPage::Slot16(); +void CUIReset::OnInit() { + CUIEnchantPage::OnInit(); for (const auto& slot : this->unknown_0088) { auto* const radioButton = slot.second->radioButton; radioButton->disabled = 1; @@ -1600,7 +1600,7 @@ void CUIReset::Slot16() { // OFFSET: 0x00A06350 // FUNCTION: fn_15002 -void CUIEnchantPage::Slot57() { +void CUIEnchantPage::UpdateEnchantInfo() { this->enchantList->ClearData(); for (CUIIngredient* ingredient : this->unknown_0090) { ingredient->Show(0); @@ -1613,7 +1613,7 @@ void CUIEnchantPage::Slot57() { button->Invalidate(); } - const bool ready = this->Slot56(); + const bool ready = this->LoadEnchantList(); if (CUIMainPage* mainPage = dynamic_cast(this->parent)) { if (CUITabButton* button = mainPage->tab->FindButton(this)) { button->disabled = !ready; @@ -1624,7 +1624,7 @@ void CUIEnchantPage::Slot57() { // OFFSET: 0x00A06520 // FUNCTION: fn_15003 -void CUIReset::Slot57() { +void CUIReset::UpdateEnchantInfo() { for (CUIIngredient* ingredient : this->unknown_0090) { ingredient->Show(0); } @@ -1636,7 +1636,7 @@ void CUIReset::Slot57() { button->Invalidate(); } this->enchantList->ClearData(); - this->Slot56(); + this->LoadEnchantList(); } // OFFSET: 0x00A06800 @@ -1657,12 +1657,12 @@ void CUIEnchantPage::ResetSlots() { button->disabled = 1; button->Invalidate(); } - this->Slot59(-1); + this->SetSlot(-1); } // OFFSET: 0x00A06F80 // FUNCTION: fn_15009 -bool CUINormalPerfect::Slot56() { +bool CUINormalPerfect::LoadEnchantList() { const int slot = this->FindEmptySlot(); if (slot == -1) { return false; @@ -1673,7 +1673,7 @@ bool CUINormalPerfect::Slot56() { return false; } - this->Slot59(slot); + this->SetSlot(slot); if ((*option)->perfectEnchants.size() == 0) { return false; } @@ -1694,7 +1694,7 @@ bool CUINormalPerfect::Slot56() { namespace EnchantUI { // OFFSET: 0x00A05470 // FUNCTION: fn_14975 -void CUINormalPerfect::Slot54(CUIEnchantItem* item, const CEnchantItemData& data) { +void CUINormalPerfect::OnSelectEnchant(CUIEnchantItem* item, const CEnchantItemData& data) { for (CUIIngredient* ingredient : this->unknown_0090) { ingredient->Show(0); } @@ -1713,7 +1713,7 @@ void CUINormalPerfect::Slot54(CUIEnchantItem* item, const CEnchantItemData& data // OFFSET: 0x00A05640 // FUNCTION: fn_14976 -void CUIUpgradePerfect::Slot54(CUIEnchantItem* item, const CEnchantItemData& data) { +void CUIUpgradePerfect::OnSelectEnchant(CUIEnchantItem* item, const CEnchantItemData& data) { for (CUIIngredient* ingredient : this->unknown_0090) { ingredient->Show(0); } @@ -1736,7 +1736,7 @@ void CUIUpgradePerfect::Slot54(CUIEnchantItem* item, const CEnchantItemData& dat // OFFSET: 0x00A072E0 // FUNCTION: fn_15011 -bool CUIReset::Slot56() { +bool CUIReset::LoadEnchantList() { this->SetCost(*reinterpret_cast(&this->enchantInfo->resetCost)); if (!this->enchantInfo->resetEnabled) { { @@ -1846,7 +1846,7 @@ void CUIEnchantPage::SetCost(const EnchantPerfectInfo& info) { // OFFSET: 0x00A07100 // FUNCTION: fn_15010 -bool CUINormalRandom::Slot56() { +bool CUINormalRandom::LoadEnchantList() { const int slot = this->FindEmptySlot(); if (slot == -1) { return false; @@ -1857,7 +1857,7 @@ bool CUINormalRandom::Slot56() { return false; } - this->Slot59(slot); + this->SetSlot(slot); if ((*option)->enchants.size() == 0) { return false; } @@ -1882,7 +1882,7 @@ bool CUINormalRandom::Slot56() { // OFFSET: 0x00A075E0 // FUNCTION: fn_15013 -bool CUIUpgradeRandom::Slot56() { +bool CUIUpgradeRandom::LoadEnchantList() { if (this->unknown_00B0 == -1) { return false; } @@ -1913,7 +1913,7 @@ bool CUIUpgradeRandom::Slot56() { // OFFSET: 0x00A07440 // FUNCTION: fn_15012 -bool CUIUpgradePerfect::Slot56() { +bool CUIUpgradePerfect::LoadEnchantList() { if (this->unknown_00B0 == -1) { return false; } @@ -1948,7 +1948,7 @@ bool CUIUpgradePerfect::Slot56() { // OFFSET: 0x009F9FE0 // FUNCTION: fn_14817 -void CUIEnchantPage::Slot15(int width, int height) { +void CUIEnchantPage::OnCreate(int width, int height) { this->background = new CUIStaticImage; this->background->SetSize(470, 377); this->background->Move(0, 0); @@ -2005,7 +2005,7 @@ void CUIEnchantPage::Slot15(int width, int height) { enchantList->rowHeight = 30; enchantList->SetSize(169, 377); this->enchantList->Move(300, 0); - this->enchantList->SetOnSelect([this](CUIEnchantItem* item, const CEnchantItemData& data) { this->Slot54(item, data); }); + this->enchantList->SetOnSelect([this](CUIEnchantItem* item, const CEnchantItemData& data) { this->OnSelectEnchant(item, data); }); this->enchantList->SetBinder([this](CUIEnchantItem* item, const CEnchantItemData& data) { this->UpdateEnchantItem(item, data); }); { this->enchantList->SetImages(std::string([]() { @@ -2132,7 +2132,7 @@ void CUIEnchantPage::Slot15(int width, int height) { this->unknown_00A0 = new CUIImageButton; this->unknown_00A0->SetSize(140, 40); this->unknown_00A0->Move(80, 330); - this->unknown_00A0->SetOnClick([this]() { this->Slot55(); }); + this->unknown_00A0->SetOnClick([this]() { this->RequestEnchant(); }); { CUIImageButton* button = this->unknown_00A0; button->disabled = 0; @@ -2147,8 +2147,8 @@ void CUIEnchantPage::Slot15(int width, int height) { // OFFSET: 0x009FCDE0 // FUNCTION: fn_14820 -void CUINormalPerfect::Slot15(int width, int height) { - CUIEnchantPage::Slot15(width, height); +void CUINormalPerfect::OnCreate(int width, int height) { + CUIEnchantPage::OnCreate(width, height); { this->background->SetImage(std::string([]() { constexpr std::uint8_t bytes[] = { @@ -2166,8 +2166,8 @@ void CUINormalPerfect::Slot15(int width, int height) { // OFFSET: 0x009FCFB0 // FUNCTION: fn_14821 -void CUINormalRandom::Slot15(int width, int height) { - CUIEnchantPage::Slot15(width, height); +void CUINormalRandom::OnCreate(int width, int height) { + CUIEnchantPage::OnCreate(width, height); { this->background->SetImage(std::string([]() { constexpr std::uint8_t bytes[] = { @@ -2185,8 +2185,8 @@ void CUINormalRandom::Slot15(int width, int height) { // OFFSET: 0x009FD180 // FUNCTION: fn_14822 -void CUIReset::Slot15(int width, int height) { - CUIEnchantPage::Slot15(width, height); +void CUIReset::OnCreate(int width, int height) { + CUIEnchantPage::OnCreate(width, height); { this->background->SetImage(std::string([]() { constexpr std::uint8_t bytes[] = { @@ -2204,8 +2204,8 @@ void CUIReset::Slot15(int width, int height) { // OFFSET: 0x00A01AD0 // FUNCTION: fn_14830 -void CUIUpgradePerfect::Slot15(int width, int height) { - CUIUpgradeEnchantPage::Slot15(width, height); +void CUIUpgradePerfect::OnCreate(int width, int height) { + CUIUpgradeEnchantPage::OnCreate(width, height); { this->background->SetImage(std::string([]() { constexpr std::uint8_t bytes[] = { @@ -2223,8 +2223,8 @@ void CUIUpgradePerfect::Slot15(int width, int height) { // OFFSET: 0x00A01CA0 // FUNCTION: fn_14831 -void CUIUpgradeRandom::Slot15(int width, int height) { - CUIUpgradeEnchantPage::Slot15(width, height); +void CUIUpgradeRandom::OnCreate(int width, int height) { + CUIUpgradeEnchantPage::OnCreate(width, height); { this->background->SetImage(std::string([]() { constexpr std::uint8_t bytes[] = { @@ -2243,7 +2243,7 @@ void CUIUpgradeRandom::Slot15(int width, int height) { // OFFSET: 0x009F31B0 // FUNCTION: fn_14753 -void CUIEnchantUI::Slot15(int width, int height) { +void CUIEnchantUI::OnCreate(int width, int height) { this->background = new CUIStaticImage; this->background->SetSize(690, 470); this->background->Move(0, 0); diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index d1edd0cd9..d1688aaa1 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -35,7 +35,7 @@ UIEntryQueueHelpWnd::UIEntryQueueHelpWnd() : UIFrameWnd(0), m_viewer(nullptr), m // OFFSET: 0x00BA4260 // FUNCTION: fn_19680 -void UIEntryQueueHelpWnd::Slot18() { +void UIEntryQueueHelpWnd::OnDestroy() { } // OFFSET: 0x00BA4270 @@ -47,7 +47,7 @@ void UIEntryQueueHelpWnd::Paint() { // OFFSET: 0x00BA42A0 // FUNCTION: fn_19682 -void UIEntryQueueHelpWnd::Slot19() { +void UIEntryQueueHelpWnd::OnProcess() { } // OFFSET: 0x00BA42B0 @@ -92,7 +92,7 @@ int UIEntryQueueListBox::EntryValue(int index) { // OFFSET: 0x00BA4770 // FUNCTION: fn_19688 -void UIEntryQueueListBox::Slot31(int x, int y) { +void UIEntryQueueListBox::OnLBtnUp(int x, int y) { if (this->selected != -1) { this->parent->SendMsg(this, 135, this->geometry.id, this->selected, 0, 0); } @@ -116,8 +116,8 @@ bool UIEntryQueueRequestWnd::Create() { this->AddBaseButton(); this->AddCloseButton("", 0); this->SetSize(300, 250); - this->Slot15(300, 250); - this->Slot22(300, 250); + this->OnCreate(300, 250); + this->OnSize(300, 250); this->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); this->m_viewer = new UITextViewer(); @@ -172,7 +172,7 @@ bool UIEntryQueueRequestWnd::Create() { // OFFSET: 0x00BA5380 // FUNCTION: fn_19692 -void UIEntryQueueRequestWnd::Slot18() { +void UIEntryQueueRequestWnd::OnDestroy() { } // OFFSET: 0x00BA5390 @@ -194,7 +194,7 @@ void UIEntryQueueRequestWnd::Paint() { // OFFSET: 0x00BA5460 // FUNCTION: fn_19694 -void UIEntryQueueRequestWnd::Slot19() { +void UIEntryQueueRequestWnd::OnProcess() { const DWORD now = GetTickCount(); const unsigned delta = now - this->m_lastTick; this->m_delta = delta; @@ -246,8 +246,8 @@ bool UIEntryQueueStandByWnd::Create() { this->Resize(280, 120); this->AddBaseButton(); this->SetSize(280, 120); - this->Slot15(280, 120); - this->Slot22(280, 120); + this->OnCreate(280, 120); + this->OnSize(280, 120); this->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); this->m_viewer = new UITextViewer(); @@ -282,7 +282,7 @@ bool UIEntryQueueStandByWnd::Create() { // OFFSET: 0x00BA5E50 // FUNCTION: fn_19699 -void UIEntryQueueStandByWnd::Slot18() { +void UIEntryQueueStandByWnd::OnDestroy() { } // OFFSET: 0x00BA5E60 @@ -294,7 +294,7 @@ void UIEntryQueueStandByWnd::Paint() { // OFFSET: 0x00BA5E90 // FUNCTION: fn_19701 -void UIEntryQueueStandByWnd::Slot19() { +void UIEntryQueueStandByWnd::OnProcess() { } // OFFSET: 0x00BA5EA0 @@ -357,7 +357,7 @@ int UIEntryQueueWnd::SelectedIndex() { // OFFSET: 0x00BA6420 // FUNCTION: fn_19707 -void UIEntryQueueWnd::Slot15(int width, int height) { +void UIEntryQueueWnd::OnCreate(int width, int height) { this->Resize(350, 350); this->AddBaseButton(); @@ -629,7 +629,7 @@ bool UIEntryQueueWnd::ConfirmApply(const char* type) { // OFFSET: 0x00BA7B90 // FUNCTION: fn_19713 -void UIEntryQueueWnd::Slot11() { +void UIEntryQueueWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -640,7 +640,7 @@ void UIEntryQueueWnd::Slot11() { // OFFSET: 0x00BA3A50 // FUNCTION: fn_19679 -void UIEntryQueueHelpWnd::Slot15(int width, int height) { +void UIEntryQueueHelpWnd::OnCreate(int width, int height) { this->Resize(280, 280); this->m_viewer = new UITextViewer(); diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.h b/Source/UI/EntryQueue/UIEntryQueueWnd.h index 5f819856a..9224993e5 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.h +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.h @@ -18,9 +18,9 @@ class UITextViewer; class UIEntryQueueHelpWnd : public UIFrameWnd { public: UIEntryQueueHelpWnd(); - void Slot15(int width, int height) override; - void Slot18() override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -35,7 +35,7 @@ class UIEntryQueueListBox : public UIListBox { public: UIEntryQueueListBox(); ~UIEntryQueueListBox() override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; virtual void AddEntry(const char* name, int value); virtual int EntryValue(int index); @@ -46,8 +46,8 @@ class UIEntryQueueRequestWnd : public UIFrameWnd { public: UIEntryQueueRequestWnd(); ~UIEntryQueueRequestWnd() override; - void Slot18() override; - void Slot19() override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; bool Create(); @@ -69,8 +69,8 @@ class UIEntryQueueStandByWnd : public UIFrameWnd { public: UIEntryQueueStandByWnd(); ~UIEntryQueueStandByWnd() override; - void Slot18() override; - void Slot19() override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; bool Create(); @@ -94,8 +94,8 @@ class UIEntryQueueWnd : public UIFrameWnd { public: UIEntryQueueWnd(); ~UIEntryQueueWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; int SelectedIndex(); diff --git a/Source/UI/Exchange/UIExchangeUI.cpp b/Source/UI/Exchange/UIExchangeUI.cpp index 540ed1114..940bf3efc 100644 --- a/Source/UI/Exchange/UIExchangeUI.cpp +++ b/Source/UI/Exchange/UIExchangeUI.cpp @@ -40,13 +40,13 @@ void CUIListBoxEx::UpdateScrollBar() template <> void CUIListBoxEx::Paint(); template <> -void CUIListBoxEx::Slot35(int value); +void CUIListBoxEx::OnWheel(int value); template <> void CUIListBoxEx::OnScroll(int position); template <> void CUIListBoxEx::AddNewItem(); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); @@ -103,19 +103,19 @@ void CUIListBoxEx::ClearItems() { // OFFSET: 0x00A10140 // FUNCTION: fn_15189 -void CUIExchangeUI::Slot53() { +void CUIExchangeUI::Initialize() { this->unknown_00B4 = 0; this->m_resolveSkin = true; this->Resize(560, 377); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A101E0 // FUNCTION: fn_15190 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -132,11 +132,11 @@ void CUIListBoxEx::Paint() { // OFFSET: 0x00A15160 // FUNCTION: fn_15194 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -282,7 +282,7 @@ void CUIListBoxEx::ClearData() { // OFFSET: 0x00A175C0 // FUNCTION: fn_15291 -void CUIExchangeUI::Slot10(int x, int y, std::intptr_t value) { +void CUIExchangeUI::DragAndDrop(int x, int y, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); if (mode == nullptr) { return; @@ -339,7 +339,7 @@ void ExchangeUI::CUIItem::Paint() { // OFFSET: 0x00A17730 // FUNCTION: fn_15298 -void CUIExchangeUI::Slot16() { +void CUIExchangeUI::OnInit() { this->Move((g_renderer->viewport.width - 640) / 2 + 100, g_renderer->viewport.height * 100 / 480); { @@ -369,7 +369,7 @@ void CUIExchangeUI::Slot16() { // OFFSET: 0x00A17BD0 // FUNCTION: fn_15299 -void ExchangeUI::CUIItem::Slot16() { +void ExchangeUI::CUIItem::OnInit() { CUIGameItem* icon = this->itemIcon; icon->showOverlay = 1; icon->Invalidate(); @@ -377,14 +377,14 @@ void ExchangeUI::CUIItem::Slot16() { // OFFSET: 0x00A17BF0 // FUNCTION: fn_15300 -void ExchangeUI::CUIItem::Slot28(int x, int y) { - this->itemIcon->Slot28(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); +void ExchangeUI::CUIItem::OnMouseHover(int x, int y) { + this->itemIcon->OnMouseHover(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } // OFFSET: 0x00A17C20 // FUNCTION: fn_15301 -void CUIExchangeUI::Slot19() { - if (this->zenyEdit->Slot06() != g_windowMgr.GetHoverWindow()) { +void CUIExchangeUI::OnProcess() { + if (this->zenyEdit->GetEditWindow() != g_windowMgr.GetHoverWindow()) { return; } @@ -415,8 +415,8 @@ void CUIExchangeUI::Slot19() { // OFFSET: 0x00A17F30 // FUNCTION: fn_15302 -void ExchangeUI::CUIItem::Slot32(int x, int y) { - this->itemIcon->Slot32(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); +void ExchangeUI::CUIItem::OnRBtnDown(int x, int y) { + this->itemIcon->OnRBtnDown(x - this->itemIcon->geometry.x, y - this->itemIcon->geometry.y); } // OFFSET: 0x00A17F60 @@ -627,7 +627,7 @@ private: // OFFSET: 0x00A149B0 // FUNCTION: fn_15192 -void ExchangeUI::CUIItem::Slot15(int width, int height) { +void ExchangeUI::CUIItem::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticImage(); this->unknown_00E8->SetSize(32, 32); this->unknown_00E8->Move(9, 0); @@ -675,7 +675,7 @@ void ExchangeUI::CUIItem::Slot15(int width, int height) { // OFFSET: 0x00A103F0 // FUNCTION: fn_15191 -void CUIExchangeUI::Slot15(int width, int height) { +void CUIExchangeUI::OnCreate(int width, int height) { this->titleBar = new CUITitleBar(); this->titleBar->SetSize(560, 17); this->titleBar->Move(0, 0); @@ -1376,7 +1376,7 @@ void CUIListBoxEx::AddNewItem() { // OFFSET: 0x00A15530 // FUNCTION: fn_15198 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); diff --git a/Source/UI/Exchange/UIExchangeUI.h b/Source/UI/Exchange/UIExchangeUI.h index 3cba32a01..8ab0050ac 100644 --- a/Source/UI/Exchange/UIExchangeUI.h +++ b/Source/UI/Exchange/UIExchangeUI.h @@ -23,11 +23,11 @@ public: /* 00F4 */ CUIStaticText* unknown_00F4; CUIItem(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot16() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnInit() override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; }; class CItemData { @@ -66,12 +66,12 @@ public: /* 0134 */ std::string zenyText; __declspec(noinline) CUIExchangeUI(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot16() override; - void Slot19() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnInit() override; + void OnProcess() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - virtual void Slot53(); + virtual void Initialize(); void Cancel(); void Conclude(); diff --git a/Source/UI/FrameSkin.cpp b/Source/UI/FrameSkin.cpp index d8e6f27bc..c3ba029d4 100644 --- a/Source/UI/FrameSkin.cpp +++ b/Source/UI/FrameSkin.cpp @@ -54,7 +54,7 @@ void CUIFrameWnd::RefreshSkinColors() { } for (UIWindow* child : this->m_children) { - child->Slot52(this->m_resolveSkin); + child->ApplySkin(this->m_resolveSkin); } } diff --git a/Source/UI/FrameSkin.h b/Source/UI/FrameSkin.h index 2c8a3d26b..69601d217 100644 --- a/Source/UI/FrameSkin.h +++ b/Source/UI/FrameSkin.h @@ -18,7 +18,7 @@ public: ~CUIFrameWnd() override; void Paint() override; - virtual void Slot53() = 0; + virtual void Initialize() = 0; void RefreshSkinColors(); void SetSkinColors(int backgroundColumn, int backgroundRow, int borderColumn, int borderRow); diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index 75457c799..07e9a13fb 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -137,15 +137,15 @@ void CUIListBoxEx::AddNewItem(); template <> void CUIListBoxEx::AddNewItem(); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> void CUIListBoxEx::Resize(int width, int height); template <> @@ -160,7 +160,7 @@ void CUIListBoxEx::Resize(int width, in void SetComboItemSkinText(GameSettingsUI::CUIComboItem* item, const std::string& name); // OFFSET: 0x00A2C3C0 // FUNCTION: fn_15400 -void GameSettingsUI::CUIGroupSkin::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupSkin::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(75, 13); this->m_title->Move(19, 12); @@ -458,55 +458,55 @@ void CUIListBoxEx::Paint() { // OFFSET: 0x00A345E0 // FUNCTION: fn_15416 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x00A34620 // FUNCTION: fn_15417 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x00A34660 // FUNCTION: fn_15418 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x00A346A0 // FUNCTION: fn_15419 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x00A346E0 // FUNCTION: fn_15420 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -519,7 +519,7 @@ void CUICheckBox::SetOnCheck(std::function callback) { // OFFSET: 0x00A354A0 // FUNCTION: fn_15427 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -533,7 +533,7 @@ void CUIListBoxEx::Slot53(int resol // OFFSET: 0x00A356B0 // FUNCTION: fn_15428 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -547,7 +547,7 @@ void CUIListBoxEx::Slot53(int resolve // OFFSET: 0x00A358C0 // FUNCTION: fn_15429 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -561,7 +561,7 @@ void CUIListBoxEx::Slot53(int resol // OFFSET: 0x00A35AD0 // FUNCTION: fn_15430 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -575,7 +575,7 @@ void CUIListBoxEx::Slot53(int resolve // OFFSET: 0x00A35CE0 // FUNCTION: fn_15431 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -1192,7 +1192,7 @@ void CUIListBoxEx::OnScroll(int positio // OFFSET: 0x00A1F210 // FUNCTION: fn_15384 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -1202,7 +1202,7 @@ void CUIListBoxEx::Slot15(int width // OFFSET: 0x00A1F2E0 // FUNCTION: fn_15385 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -1212,7 +1212,7 @@ void CUIListBoxEx::Slot15(int width, // OFFSET: 0x00A1F3B0 // FUNCTION: fn_15386 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -1222,7 +1222,7 @@ void CUIListBoxEx::Slot15(int width // OFFSET: 0x00A1F480 // FUNCTION: fn_15387 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -1232,7 +1232,7 @@ void CUIListBoxEx::Slot15(int width, // OFFSET: 0x00A1F550 // FUNCTION: fn_15388 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -1628,22 +1628,22 @@ std::string CUIListPage::GetHotkeyText(int tab, int index) { // OFFSET: 0x00A40C30 // FUNCTION: fn_15985 -void CUIComboItem::Slot16() { +void CUIComboItem::OnInit() { } // OFFSET: 0x00A41D80 // FUNCTION: fn_15999 -void CUIListPage::Slot16() { +void CUIListPage::OnInit() { } // OFFSET: 0x00A41D90 // FUNCTION: fn_16000 -void CUIOptionItem::Slot16() { +void CUIOptionItem::OnInit() { } // OFFSET: 0x00A41DA0 // FUNCTION: fn_16001 -void CUIPage::Slot16() { +void CUIPage::OnInit() { int y = 0; for (UIWindow* child : this->m_children) { child->Move(child->geometry.x, y); @@ -1730,7 +1730,7 @@ bool CUIGraphicsPage::IsModified() { // OFFSET: 0x00A40270 // FUNCTION: fn_15968 -void CUIListPage::Slot54(CUIOptionItem* item, const TALKTYPE& type) { +void CUIListPage::OnSelectOption(CUIOptionItem* item, const TALKTYPE& type) { } // OFFSET: 0x00A41E30 @@ -1919,22 +1919,22 @@ CUIGameSettingsUI::CUIGameSettingsUI() // OFFSET: 0x00A1EE20 // FUNCTION: fn_15383 -void CUIGameSettingsUI::Slot53() { +void CUIGameSettingsUI::Initialize() { this->unknown_00B4 = 1; this->m_resolveSkin = true; this->Resize(400, 350); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); this->SetSkinColors(0, 0, 3, 1); this->m_buttonBarStyle = 3; } // OFFSET: 0x00A41DE0 // FUNCTION: fn_16002 -void CUIGameSettingsUI::Slot25(int x, int y) { +void CUIGameSettingsUI::OnLBtnDown(int x, int y) { if (this->m_titleBar->IsPointInside(x, y)) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } @@ -2102,13 +2102,13 @@ void SetComboItemSkinText(GameSettingsUI::CUIComboItem* item, const std::string& // OFFSET: 0x00A41C60 // FUNCTION: fn_15996 -void GameSettingsUI::CUIGroupSpriteDetailLevel::Slot16() { +void GameSettingsUI::CUIGroupSpriteDetailLevel::OnInit() { this->m_title->SetText(LookupMessage(0x144)); } // OFFSET: 0x00A41CA0 // FUNCTION: fn_15997 -void GameSettingsUI::CUIGroupTextureDetailLevel::Slot16() { +void GameSettingsUI::CUIGroupTextureDetailLevel::OnInit() { this->m_title->SetText(LookupMessage(0x145)); } @@ -2257,7 +2257,7 @@ __declspec(noinline) void CUIGameSettingsUI::RefreshOption(int id) { // OFFSET: 0x00A41120 // FUNCTION: fn_15987 -void GameSettingsUI::CUIGroupEmblem::Slot16() { +void GameSettingsUI::CUIGroupEmblem::OnInit() { this->m_title->SetText(LookupMessage(0x1032)); this->m_onText->SetText(LookupMessage(0x1035)); this->m_offText->SetText(LookupMessage(0x1036)); @@ -2265,7 +2265,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot16() { // OFFSET: 0x00A411C0 // FUNCTION: fn_15988 -void GameSettingsUI::CUIGroupFullscreen::Slot16() { +void GameSettingsUI::CUIGroupFullscreen::OnInit() { this->m_title->SetText(LookupMessage(0x1057)); this->m_onText->SetText(LookupMessage(0x1058)); this->m_offText->SetText(LookupMessage(0x1059)); @@ -2273,7 +2273,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot16() { // OFFSET: 0x00A41260 // FUNCTION: fn_15989 -void GameSettingsUI::CUIGroupGraphics::Slot16() { +void GameSettingsUI::CUIGroupGraphics::OnInit() { this->m_title->SetText(LookupMessage(0xc6d)); this->m_modeText->SetText(LookupMessage(0xc6e)); GetRenderSystemHolder(); @@ -2289,7 +2289,7 @@ void GameSettingsUI::CUIGroupGraphics::Slot16() { // OFFSET: 0x00A41510 // FUNCTION: fn_15990 -void GameSettingsUI::CUIGroupGraphicsAPI::Slot16() { +void GameSettingsUI::CUIGroupGraphicsAPI::OnInit() { this->m_title->SetText(LookupMessage(0x1001)); const int backend = GetRenderSystemHolder()->Backend(); this->m_pendingBackend = backend; @@ -2298,7 +2298,7 @@ void GameSettingsUI::CUIGroupGraphicsAPI::Slot16() { // OFFSET: 0x00A41710 // FUNCTION: fn_15992 -void GameSettingsUI::CUIGroupProcessPriority::Slot16() { +void GameSettingsUI::CUIGroupProcessPriority::OnInit() { this->m_title->SetText(LookupMessage(0x1039)); this->m_highText->SetText(LookupMessage(0x103A)); const char* highTooltip = LookupMessage(0x103B); @@ -2313,7 +2313,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot16() { // OFFSET: 0x00A41870 // FUNCTION: fn_15993 -void GameSettingsUI::CUIGroupRodexSpam::Slot16() { +void GameSettingsUI::CUIGroupRodexSpam::OnInit() { this->m_title->SetText(LookupMessage(0xC40)); this->m_onText->SetText(LookupMessage(0x1038)); this->m_offText->SetText(LookupMessage(0x1037)); @@ -2321,7 +2321,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot16() { // OFFSET: 0x00A41CE0 // FUNCTION: fn_15998 -void GameSettingsUI::CUIGroupTrilinear::Slot16() { +void GameSettingsUI::CUIGroupTrilinear::OnInit() { this->m_title->SetText(LookupMessage(0x105A)); this->m_onText->SetText(LookupMessage(0x1033)); this->m_offText->SetText(LookupMessage(0x1034)); @@ -2369,7 +2369,7 @@ __declspec(noinline) CUIListBoxEx::CUIL // OFFSET: 0x00A41B60 // FUNCTION: fn_15995 -void GameSettingsUI::CUIGroupSound::Slot16() { +void GameSettingsUI::CUIGroupSound::OnInit() { this->m_title->SetText(LookupMessage(0x5CD)); this->m_bgmText->SetText(LookupMessage(0x5D7)); this->unknown_0090->SetText(LookupMessage(0x1034)); @@ -2379,7 +2379,7 @@ void GameSettingsUI::CUIGroupSound::Slot16() { // OFFSET: 0x00A41560 // FUNCTION: fn_15991 -void GameSettingsUI::CUIGroupLogInOut::Slot16() { +void GameSettingsUI::CUIGroupLogInOut::OnInit() { this->m_title->SetText(LookupMessage(0x107D)); this->m_onText->SetText(LookupMessage(0x1033)); this->m_offText->SetText(LookupMessage(0x1034)); @@ -2394,7 +2394,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot16() { // OFFSET: 0x00A1F890 // FUNCTION: fn_15390 -void GameSettingsUI::CUIComboItem::Slot15(int width, int height) { +void GameSettingsUI::CUIComboItem::OnCreate(int width, int height) { this->m_text = new CUIStaticText(); this->m_text->SetSize(155, 16); this->m_text->Move(3, 0); @@ -2432,7 +2432,7 @@ void GameSettingsUI::CUIGroupGraphics::OnModeSelect(CUIComboItem* item, const Di // OFFSET: 0x00A41910 // FUNCTION: fn_15994 -void GameSettingsUI::CUIGroupSkin::Slot16() { +void GameSettingsUI::CUIGroupSkin::OnInit() { this->m_title->SetText(LookupMessage(0x5D9)); this->m_combo->AddItem(std::string(LookupMessage(0xC12)), false); for (int index = 0; index < static_cast(g_skinInfo.prefixes.size()); ++index) { @@ -2564,7 +2564,7 @@ GameSettingsUI::CUIListPage::CUIListPage() : CUIControl(), m_optionList(nullptr) // OFFSET: 0x00A1F620 // FUNCTION: fn_15389 -void GameSettingsUI::CUIBasicPage::Slot15(int width, int height) { +void GameSettingsUI::CUIBasicPage::OnCreate(int width, int height) { this->m_skin = new CUIGroupSkin(); this->m_skin->SetSize(400, 36); this->m_skin->Move(0, 0); @@ -2593,14 +2593,14 @@ void GameSettingsUI::CUIBasicPage::Slot15(int width, int height) { // OFFSET: 0x00A32550 // FUNCTION: fn_15405 -void GameSettingsUI::CUIListPage::Slot15(int width, int height) { +void GameSettingsUI::CUIListPage::OnCreate(int width, int height) { auto* const optionList = new CUIListBoxEx; this->m_optionList = optionList; optionList->itemWidth = 387; optionList->rowHeight = 26; optionList->SetSize(400, 286); this->m_optionList->Move(0, 1); - this->m_optionList->SetOnSelect([this](CUIOptionItem* item, const TALKTYPE& type) { this->CUIListPage::Slot54(item, type); }); + this->m_optionList->SetOnSelect([this](CUIOptionItem* item, const TALKTYPE& type) { this->CUIListPage::OnSelectOption(item, type); }); this->m_optionList->SetBinder([this](CUIOptionItem* item, const TALKTYPE& type) { this->BindOption(item, type); }); this->m_optionList->SetImages("", "", "", ""); { @@ -2662,7 +2662,7 @@ inline CUIHScrollBar::CUIHScrollBar() : CUIVScrollBar() { // OFFSET: 0x00A22E00 // FUNCTION: fn_15392 -void GameSettingsUI::CUIGraphicsPage::Slot15(int width, int height) { +void GameSettingsUI::CUIGraphicsPage::OnCreate(int width, int height) { this->m_graphicsApi = new CUIGroupGraphicsAPI(); this->m_graphicsApi->SetSize(400, 32); this->m_graphicsApi->Move(0, 0); @@ -2696,7 +2696,7 @@ void GameSettingsUI::CUIGraphicsPage::Slot15(int width, int height) { // OFFSET: 0x00A23070 // FUNCTION: fn_15393 -void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupEmblem::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(85, 13); this->m_title->Move(19, 12); @@ -2842,7 +2842,7 @@ void GameSettingsUI::CUIGroupEmblem::Slot15(int width, int height) { // OFFSET: 0x00A24510 // FUNCTION: fn_15394 -void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupFullscreen::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); @@ -2988,7 +2988,7 @@ void GameSettingsUI::CUIGroupFullscreen::Slot15(int width, int height) { // OFFSET: 0x00A259E0 // FUNCTION: fn_15395 -void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupGraphics::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); @@ -3102,7 +3102,7 @@ void GameSettingsUI::CUIGroupGraphics::Slot15(int width, int height) { // OFFSET: 0x00A27130 // FUNCTION: fn_15396 -void GameSettingsUI::CUIGroupGraphicsAPI::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupGraphicsAPI::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); @@ -3161,7 +3161,7 @@ void GameSettingsUI::CUIGroupGraphicsAPI::Slot15(int width, int height) { // OFFSET: 0x00A27D00 // FUNCTION: fn_15397 -void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupLogInOut::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(100, 12); this->m_title->Move(19, 12); @@ -3307,7 +3307,7 @@ void GameSettingsUI::CUIGroupLogInOut::Slot15(int width, int height) { // OFFSET: 0x00A29180 // FUNCTION: fn_15398 -void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupProcessPriority::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(100, 13); this->m_title->Move(19, 12); @@ -3512,7 +3512,7 @@ void GameSettingsUI::CUIGroupProcessPriority::Slot15(int width, int height) { // OFFSET: 0x00A2AEC0 // FUNCTION: fn_15399 -void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupRodexSpam::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(70, 13); this->m_title->Move(19, 12); @@ -3658,7 +3658,7 @@ void GameSettingsUI::CUIGroupRodexSpam::Slot15(int width, int height) { // OFFSET: 0x00A2CF80 // FUNCTION: fn_15401 -void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupSound::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(75, 13); this->m_title->Move(19, 12); @@ -3920,7 +3920,7 @@ void GameSettingsUI::CUIGroupSound::Slot15(int width, int height) { // OFFSET: 0x00A2F880 // FUNCTION: fn_15402 -void GameSettingsUI::CUIGroupSpriteDetailLevel::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupSpriteDetailLevel::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); @@ -3989,7 +3989,7 @@ void GameSettingsUI::CUIGroupSpriteDetailLevel::Slot15(int width, int height) { // OFFSET: 0x00A30490 // FUNCTION: fn_15403 -void GameSettingsUI::CUIGroupTextureDetailLevel::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupTextureDetailLevel::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); @@ -4058,7 +4058,7 @@ void GameSettingsUI::CUIGroupTextureDetailLevel::Slot15(int width, int height) { // OFFSET: 0x00A31070 // FUNCTION: fn_15404 -void GameSettingsUI::CUIGroupTrilinear::Slot15(int width, int height) { +void GameSettingsUI::CUIGroupTrilinear::OnCreate(int width, int height) { this->m_title = new CUIStaticText(); this->m_title->SetSize(130, 13); this->m_title->Move(19, 12); @@ -4491,7 +4491,7 @@ void GameSettingsUI::CUIGraphicsPage::ApplySettings() { // OFFSET: 0x00A1FB10 // FUNCTION: fn_15391 -void CUIGameSettingsUI::Slot15(int width, int height) { +void CUIGameSettingsUI::OnCreate(int width, int height) { this->m_titleBar = new CUITitleBar(); this->m_titleBar->SetSize(400, 17); this->m_titleBar->Move(0, 0); @@ -4954,7 +4954,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { // OFFSET: 0x00A40C40 // FUNCTION: fn_15986 -void CUIGameSettingsUI::Slot16() { +void CUIGameSettingsUI::OnInit() { this->Move((g_renderer->viewport.width - this->geometry.width) / 2, (g_renderer->viewport.height - this->geometry.height) / 2); static_cast(this->m_titleBar)->SetTitle(LookupMessage(0x946)); static_cast(this->m_tab->FindChildById(0))->SetText(LookupMessage(0x102E)); @@ -4976,7 +4976,7 @@ void CUIGameSettingsUI::Slot16() { // OFFSET: 0x00A33250 // FUNCTION: fn_15406 -void GameSettingsUI::CUIOptionItem::Slot15(int width, int height) { +void GameSettingsUI::CUIOptionItem::OnCreate(int width, int height) { this->m_check = new CUICheckBox(); this->m_check->SetSize(34, 15); this->m_check->Move(8, 5); diff --git a/Source/UI/GameSettings/GameSettingsUI.h b/Source/UI/GameSettings/GameSettingsUI.h index f58c5c944..c9eda397e 100644 --- a/Source/UI/GameSettings/GameSettingsUI.h +++ b/Source/UI/GameSettings/GameSettingsUI.h @@ -82,8 +82,8 @@ public: class CUIGroupEmblem : public CUIGroup { public: __declspec(noinline) CUIGroupEmblem(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Apply() override; void Refresh() override; __declspec(noinline) void SetEnabled(bool enabled); @@ -98,8 +98,8 @@ public: class CUIGroupFullscreen : public CUIGroup { public: __declspec(noinline) CUIGroupFullscreen(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Refresh() override; /* 0084 */ CUIRadioButton* m_onButton; @@ -111,8 +111,8 @@ public: class CUIGroupGraphics : public CUIGroup { public: __declspec(noinline) CUIGroupGraphics(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Refresh() override; int GetPendingBackend(); void LoadAdapters(); @@ -132,8 +132,8 @@ public: class CUIGroupGraphicsAPI : public CUIGroup { public: __declspec(noinline) CUIGroupGraphicsAPI(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Apply() override; void Refresh() override; void LoadBackends(); @@ -147,8 +147,8 @@ public: class CUIGroupLogInOut : public CUIGroup { public: __declspec(noinline) CUIGroupLogInOut(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Apply() override; void Refresh() override; __declspec(noinline) void SetEnabled(bool enabled); @@ -163,8 +163,8 @@ public: class CUIGroupProcessPriority : public CUIGroup { public: __declspec(noinline) CUIGroupProcessPriority(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Refresh() override; void OnSelect(CUIRadioButton* button); @@ -179,8 +179,8 @@ public: class CUIGroupRodexSpam : public CUIGroup { public: __declspec(noinline) CUIGroupRodexSpam(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Apply() override; void Refresh() override; void OnSelect(CUIRadioButton* button); @@ -194,8 +194,8 @@ public: class CUIGroupSkin : public CUIGroup { public: __declspec(noinline) CUIGroupSkin(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Apply() override; void Refresh() override; void OnSelect(CUIComboItem* item, const std::string& name); @@ -206,8 +206,8 @@ public: class CUIGroupSound : public CUIGroup { public: __declspec(noinline) CUIGroupSound(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Apply() override; void Paint() override; void Refresh() override; @@ -232,8 +232,8 @@ public: class CUIGroupSpriteDetailLevel : public CUIGroup { public: __declspec(noinline) CUIGroupSpriteDetailLevel(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; void Refresh() override; @@ -243,8 +243,8 @@ public: class CUIGroupTextureDetailLevel : public CUIGroup { public: __declspec(noinline) CUIGroupTextureDetailLevel(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; void Refresh() override; @@ -254,8 +254,8 @@ public: class CUIGroupTrilinear : public CUIGroup { public: __declspec(noinline) CUIGroupTrilinear(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Refresh() override; /* 0084 */ CUIRadioButton* m_onButton; @@ -270,7 +270,7 @@ public: explicit CUIPage() : CUIControl() { } - void Slot16() override; + void OnInit() override; void Paint() override; virtual void Apply(); virtual void Refresh(); @@ -279,7 +279,7 @@ public: class CUIBasicPage : public CUIPage { public: __declspec(noinline) CUIBasicPage(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; /* 0080 */ CUIGroupSkin* m_skin; /* 0084 */ CUIGroupSound* m_sound; @@ -292,7 +292,7 @@ public: class CUIGraphicsPage : public CUIPage { public: __declspec(noinline) CUIGraphicsPage(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; __declspec(noinline) bool IsModified(); void ApplySettings(); int GetPendingBackend(); @@ -309,10 +309,10 @@ public: class CUIListPage : public CUIControl { public: __declspec(noinline) CUIListPage(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - virtual void Slot54(CUIOptionItem* item, const TALKTYPE& type); + virtual void OnSelectOption(CUIOptionItem* item, const TALKTYPE& type); bool SetOptionChecked(int id); void BindOption(CUIOptionItem* item, const TALKTYPE& id); void LoadOptions(int tab); @@ -326,8 +326,8 @@ public: class CUIComboItem : public CUIListItem { public: CUIComboItem(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; /* 00E8 */ CUIStaticText* m_text; }; @@ -335,8 +335,8 @@ public: class CUIOptionItem : public CUIListItem { public: CUIOptionItem(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; void RunFunction(); void OnCheck(bool checked); @@ -355,10 +355,10 @@ class CUIGameSettingsUI : public CUIFrameWnd { public: __declspec(noinline) CUIGameSettingsUI(); - void Slot15(int width, int height) override; - void Slot16() override; - void Slot25(int x, int y) override; - void Slot53() override; + void OnCreate(int width, int height) override; + void OnInit() override; + void OnLBtnDown(int x, int y) override; + void Initialize() override; void OnApply(); void OnCloseButton(); diff --git a/Source/UI/Gauges/UIPcGage.h b/Source/UI/Gauges/UIPcGage.h index ce39aca02..569982890 100644 --- a/Source/UI/Gauges/UIPcGage.h +++ b/Source/UI/Gauges/UIPcGage.h @@ -43,7 +43,7 @@ public: class UIPlayerGage : public UIGage { public: UIPlayerGage(); - bool Slot03() override; + bool NeedsFrameRefresh() override; void Paint() override; void SetFirstValues(std::function current, std::function maximum); void SetSecondValues(std::function current, std::function maximum); diff --git a/Source/UI/Gauges/UIPlayerGage.cpp b/Source/UI/Gauges/UIPlayerGage.cpp index ac64f421e..92bbe8e7c 100644 --- a/Source/UI/Gauges/UIPlayerGage.cpp +++ b/Source/UI/Gauges/UIPlayerGage.cpp @@ -42,7 +42,7 @@ UIMonsterGage::UIMonsterGage() { // OFFSET: 0x00882450 // FUNCTION: fn_11304 -bool UIPlayerGage::Slot03() { +bool UIPlayerGage::NeedsFrameRefresh() { return true; } diff --git a/Source/UI/Guild/UIAgitWnd.cpp b/Source/UI/Guild/UIAgitWnd.cpp index 8e4e93281..8298a9b6f 100644 --- a/Source/UI/Guild/UIAgitWnd.cpp +++ b/Source/UI/Guild/UIAgitWnd.cpp @@ -54,24 +54,24 @@ int UIAgitMessageBox::SendMsg(UIWindow*, int message, std::intptr_t a, std::intp // OFFSET: 0x0095D570 // FUNCTION: fn_13067 -void UIListBoxAgit::Slot15(int width, int height) { - UIListBox::Slot15(width, height); +void UIListBoxAgit::OnCreate(int width, int height) { + UIListBox::OnCreate(width, height); } // OFFSET: 0x00960090 // FUNCTION: fn_13092 -void UIListBoxAgit::Slot25(int x, int y) { +void UIListBoxAgit::OnLBtnDown(int x, int y) { if (this->parent) { - UIListBox::Slot25(x, y); + UIListBox::OnLBtnDown(x, y); this->parent->SendMsg(nullptr, 163, 0, 0, 0, 0); } } // OFFSET: 0x009604B0 // FUNCTION: fn_13106 -void UIListBoxAgit::Slot32(int x, int y) { +void UIListBoxAgit::OnRBtnDown(int x, int y) { if (this->parent) { - UIListBox::Slot25(x, y); + UIListBox::OnLBtnDown(x, y); if (this->selected < 0) { this->parent->SendMsg(nullptr, 163, 0, 0, 0, 0); return; @@ -109,8 +109,8 @@ void UIListBoxAgitMenu::Paint() { // OFFSET: 0x009600D0 // FUNCTION: fn_13093 -void UIListBoxAgitMenu::Slot25(int x, int y) { - UIListBox::Slot25(x, y); +void UIListBoxAgitMenu::OnLBtnDown(int x, int y) { + UIListBox::OnLBtnDown(x, y); this->SendMsg(nullptr, 48, this->selected, 0, 0, 0); if (this->parent) { this->parent->SendMsg(nullptr, 163, 0, 0, 0, 0); @@ -119,7 +119,7 @@ void UIListBoxAgitMenu::Slot25(int x, int y) { // OFFSET: 0x00960160 // FUNCTION: fn_13096 -void UIListBoxAgitMenu::Slot28(int x, int y) { +void UIListBoxAgitMenu::OnMouseHover(int x, int y) { const int previous = this->selected; int line; if (x < 0 || x >= this->geometry.width || y < 0 || y >= this->geometry.height) { diff --git a/Source/UI/Guild/UIAgitWnd.h b/Source/UI/Guild/UIAgitWnd.h index 15385ff6d..54ad14146 100644 --- a/Source/UI/Guild/UIAgitWnd.h +++ b/Source/UI/Guild/UIAgitWnd.h @@ -19,9 +19,9 @@ public: class UIListBoxAgit : public UIListBox { public: using UIListBox::UIListBox; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot32(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnRBtnDown(int x, int y) override; }; class UIListBoxAgitMenu : public UIListBox { @@ -29,8 +29,8 @@ public: UIListBoxAgitMenu(); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; /* 00D4 */ int m_agitIndex; }; diff --git a/Source/UI/Guild/UIGuildHelperWnd.cpp b/Source/UI/Guild/UIGuildHelperWnd.cpp index 730c5c007..c4dc0b6c9 100644 --- a/Source/UI/Guild/UIGuildHelperWnd.cpp +++ b/Source/UI/Guild/UIGuildHelperWnd.cpp @@ -61,9 +61,9 @@ void UIGuildHelperWnd::Paint() { // OFFSET: 0x0095FCB0 // FUNCTION: fn_13084 -void UIGuildHelperWnd::Slot25(int x, int y) { +void UIGuildHelperWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); if (UIWindow* window = g_windowMgr.unknown_0438) { window->geometry.targetAlpha = 128; window->geometry.alphaStart = timeGetTime(); @@ -73,8 +73,8 @@ void UIGuildHelperWnd::Slot25(int x, int y) { // OFFSET: 0x00960130 // FUNCTION: fn_13095 -void UIGuildHelperWnd::Slot31(int x, int y) { - UIFrameWnd::Slot31(x, y); +void UIGuildHelperWnd::OnLBtnUp(int x, int y) { + UIFrameWnd::OnLBtnUp(x, y); if (UIWindow* window = g_windowMgr.unknown_0438) { window->geometry.targetAlpha = 255; window->geometry.alphaStart = timeGetTime(); @@ -83,8 +83,8 @@ void UIGuildHelperWnd::Slot31(int x, int y) { // OFFSET: 0x009601D0 // FUNCTION: fn_13098 -void UIGuildHelperWnd::Slot27(int x, int y) { - UIFrameWnd::Slot27(x, y); +void UIGuildHelperWnd::OnMouseMove(int x, int y) { + UIFrameWnd::OnMouseMove(x, y); if (g_windowMgr.unknown_0438) { x = 0; y = 0; @@ -105,17 +105,17 @@ void UICreateGuildWnd::Paint() { // OFFSET: 0x0095FBE0 // FUNCTION: fn_13082 -void UICreateGuildWnd::Slot25(int, int) { +void UICreateGuildWnd::OnLBtnDown(int, int) { } // OFFSET: 0x009601C0 // FUNCTION: fn_13097 -void UICreateGuildWnd::Slot27(int, int) { +void UICreateGuildWnd::OnMouseMove(int, int) { } // OFFSET: 0x00960120 // FUNCTION: fn_13094 -void UICreateGuildWnd::Slot31(int, int) { +void UICreateGuildWnd::OnLBtnUp(int, int) { } // OFFSET: 0x0095F420 @@ -134,12 +134,12 @@ void UIGuildLeaveReasonDescWnd::Paint() { // OFFSET: 0x00965650 // FUNCTION: fn_13138 -void UICreateGuildWnd::Slot11() { +void UICreateGuildWnd::StoreInfo() { } // OFFSET: 0x00965660 // FUNCTION: fn_13139 -void UIGuildHelperWnd::Slot11() { +void UIGuildHelperWnd::StoreInfo() { if (this->m_saved) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; @@ -270,7 +270,7 @@ int UIGuildTipWnd::SendMsg(UIWindow*, int message, std::intptr_t a1, std::intptr // OFFSET: 0x00958070 // FUNCTION: fn_13055 -void UICreateGuildWnd::Slot15(int, int) { +void UICreateGuildWnd::OnCreate(int, int) { this->m_nameEdit = new UIEditCtrl(); this->m_nameEdit->SetSize(124, 20); this->m_nameEdit->Move(13, 42); @@ -312,7 +312,7 @@ void UICreateGuildWnd::Slot15(int, int) { // OFFSET: 0x00958990 // FUNCTION: fn_13058 -void UIGuildHelperWnd::Slot15(int width, int height) { +void UIGuildHelperWnd::OnCreate(int width, int height) { const std::string prefix("유저인터페이스\\guild_helper\\"); const char* names[3][3] = {{"btn_help", "btn_help_a", "btn_help_b"}, {"create_guild", "create_guild_a", "create_guild_b"}, {"btn_ok", "btn_ok_a", "btn_ok_b"}}; int ids[3] = {343, 448, 184}; @@ -343,8 +343,8 @@ void UIGuildHelperWnd::Slot15(int width, int height) { // OFFSET: 0x00958700 // FUNCTION: fn_13056 -void UIGuildBanReasonDescWnd::Slot15(int width, int height) { - UIGuildLeaveReasonDescWnd::Slot15(width, height); +void UIGuildBanReasonDescWnd::OnCreate(int width, int height) { + UIGuildLeaveReasonDescWnd::OnCreate(width, height); if (this->m_reasonText != nullptr) { this->m_reasonText->SetText(LookupMessage(0x20C), 0); @@ -353,7 +353,7 @@ void UIGuildBanReasonDescWnd::Slot15(int width, int height) { // OFFSET: 0x009597E0 // FUNCTION: fn_13060 -void UIGuildLeaveReasonDescWnd::Slot15(int, int) { +void UIGuildLeaveReasonDescWnd::OnCreate(int, int) { this->m_reasonEdit = new UIEditCtrl(); this->m_reasonEdit->SetSize(this->geometry.width - 32, 16); this->m_reasonEdit->Move(15, 22); @@ -403,7 +403,7 @@ void UIGuildLeaveReasonDescWnd::Slot15(int, int) { // OFFSET: 0x0095CCD0 // FUNCTION: fn_13065 -void UIGuildTipWnd::Slot15(int width, int height) { +void UIGuildTipWnd::OnCreate(int width, int height) { this->m_textViewer = new UITextViewer(); this->m_textViewer->Configure(10, 22, width - 15, height - 55, 0); diff --git a/Source/UI/Guild/UIGuildHelperWnd.h b/Source/UI/Guild/UIGuildHelperWnd.h index a170e84c8..2beba38ea 100644 --- a/Source/UI/Guild/UIGuildHelperWnd.h +++ b/Source/UI/Guild/UIGuildHelperWnd.h @@ -18,12 +18,12 @@ struct GuildBanTarget { class UIGuildHelperWnd : public UIFrameWnd { public: UIGuildHelperWnd(); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(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; protected: @@ -34,12 +34,12 @@ protected: class UICreateGuildWnd : public UIGuildHelperWnd { public: explicit UICreateGuildWnd(int mode); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(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; protected: @@ -50,7 +50,7 @@ protected: class UIGuildTipWnd : public UIFrameWnd { public: UIGuildTipWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -62,7 +62,7 @@ protected: class UIGuildLeaveReasonDescWnd : public UIFrameWnd { public: UIGuildLeaveReasonDescWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -74,7 +74,7 @@ protected: class UIGuildBanReasonDescWnd : public UIGuildLeaveReasonDescWnd { public: UIGuildBanReasonDescWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index aa2537bb1..9fcca760d 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -126,9 +126,9 @@ void UIGuildWnd::Paint() { // OFFSET: 0x00960020 // FUNCTION: fn_13091 -void UIGuildWnd::Slot25(int x, int y) { +void UIGuildWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -144,13 +144,13 @@ void UIGuildWnd::Slot25(int x, int y) { // OFFSET: 0x0095FE10 // FUNCTION: fn_13087 -void UIGuildNoticeWnd::Slot25(int x, int y) { - UIGuildWnd::Slot25(x, y); +void UIGuildNoticeWnd::OnLBtnDown(int x, int y) { + UIGuildWnd::OnLBtnDown(x, y); } // OFFSET: 0x009602E0 // FUNCTION: fn_13100 -void UIGuildMemberManageWnd::Slot19() { +void UIGuildMemberManageWnd::OnProcess() { if (this->m_buttonTime != 0 && timeGetTime() > this->m_buttonTime + 400) { UIButton* button = this->m_button; this->m_buttonTime = 0; @@ -161,7 +161,7 @@ void UIGuildMemberManageWnd::Slot19() { // OFFSET: 0x00960330 // FUNCTION: fn_13101 -void UIGuildPositionManageWnd::Slot19() { +void UIGuildPositionManageWnd::OnProcess() { if (this->m_buttonTime != 0 && timeGetTime() > this->m_buttonTime + 400) { UIButton* button = this->m_button; this->m_buttonTime = 0; @@ -179,7 +179,7 @@ void UIGuildPositionManageWnd::Invalidate() { // OFFSET: 0x009603C0 // FUNCTION: fn_13103 -void UIGuildMemberManageWnd::Slot32(int x, int y) { +void UIGuildMemberManageWnd::OnRBtnDown(int x, int y) { const int previous = this->m_hoverRow; int row; if (static_cast(x - 5) <= 377 && static_cast(y - 66) <= 217) { @@ -199,19 +199,19 @@ void UIGuildMemberManageWnd::Slot32(int x, int y) { // OFFSET: 0x00960620 // FUNCTION: fn_13108 -void UIGuildMemberManageWnd::Slot33(int, int) { +void UIGuildMemberManageWnd::OnRBtnUp(int, int) { this->SendMsg(nullptr, 49, 0, 0, 0, 0); } // OFFSET: 0x00960640 // FUNCTION: fn_13109 -void UIGuildSkillWnd::Slot33(int, int) { +void UIGuildSkillWnd::OnRBtnUp(int, int) { this->SendMsg(nullptr, 49, 0, 0, 0, 0); } // OFFSET: 0x00960960 // FUNCTION: fn_13111 -void UIGuildBanishedMemberWnd::Slot35(int delta) { +void UIGuildBanishedMemberWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { const int step = std::min(this->m_visibleRows - 1, 3); this->SendMsg(this->m_scrollBar, 7, delta < 0 ? step : -step, 0, 0, 0); @@ -220,7 +220,7 @@ void UIGuildBanishedMemberWnd::Slot35(int delta) { // OFFSET: 0x009609B0 // FUNCTION: fn_13112 -void UIGuildMemberManageWnd::Slot35(int delta) { +void UIGuildMemberManageWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { const int step = std::min(this->m_visibleRows - 1, 3); this->SendMsg(this->m_scrollBar, 7, delta < 0 ? step : -step, 0, 0, 0); @@ -229,7 +229,7 @@ void UIGuildMemberManageWnd::Slot35(int delta) { // OFFSET: 0x00960A00 // FUNCTION: fn_13113 -void UIGuildPositionManageWnd::Slot35(int delta) { +void UIGuildPositionManageWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { const int step = std::min(this->m_visibleRows - 1, 3); this->SendMsg(this->m_scrollBar, 7, delta < 0 ? step : -step, 0, 0, 0); @@ -238,7 +238,7 @@ void UIGuildPositionManageWnd::Slot35(int delta) { // OFFSET: 0x00960A50 // FUNCTION: fn_13114 -void UIGuildSkillWnd::Slot35(int delta) { +void UIGuildSkillWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { const int step = std::min(this->m_visibleRows - 1, 3); this->SendMsg(this->m_scrollBar, 7, delta < 0 ? step : -step, 0, 0, 0); @@ -247,7 +247,7 @@ void UIGuildSkillWnd::Slot35(int delta) { // OFFSET: 0x00960AA0 // FUNCTION: fn_13115 -void UIGuildTotalInfoWnd::Slot35(int delta) { +void UIGuildTotalInfoWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { const int step = std::min(this->m_visibleRows - 1, 3); this->SendMsg(this->m_scrollBar, 7, delta < 0 ? step : -step, 0, 0, 0); @@ -422,8 +422,8 @@ CSkillInfo UIGuildSkillWnd::VisibleSkillAt(int row) { // OFFSET: 0x0095FE20 // FUNCTION: fn_13088 -void UIGuildPositionManageWnd::Slot25(int x, int y) { - UIGuildWnd::Slot25(x, y); +void UIGuildPositionManageWnd::OnLBtnDown(int x, int y) { + UIGuildWnd::OnLBtnDown(x, y); const int previous = this->m_hoverIndex; this->m_hoverIndex = this->PositionIndexAt(x, y); if (previous != this->m_hoverIndex) { @@ -433,7 +433,7 @@ void UIGuildPositionManageWnd::Slot25(int x, int y) { // OFFSET: 0x00960430 // FUNCTION: fn_13104 -void UIGuildPositionManageWnd::Slot32(int x, int y) { +void UIGuildPositionManageWnd::OnRBtnDown(int x, int y) { const int previous = this->m_hoverIndex; this->m_hoverIndex = this->PositionIndexAt(x, y); if (previous != this->m_hoverIndex) { @@ -443,7 +443,7 @@ void UIGuildPositionManageWnd::Slot32(int x, int y) { // OFFSET: 0x00960470 // FUNCTION: fn_13105 -void UIGuildSkillWnd::Slot32(int x, int y) { +void UIGuildSkillWnd::OnRBtnDown(int x, int y) { const int previous = this->m_hoverIndex; this->m_hoverIndex = this->SkillIndexAt(x, y); if (previous != this->m_hoverIndex) { @@ -562,7 +562,7 @@ void UIGuildSkillWnd::UpdateScroll() { // OFFSET: 0x00960230 // FUNCTION: fn_13099 -void UIGuildInfoManageWnd::Slot19() { +void UIGuildInfoManageWnd::OnProcess() { const std::string name = g_guildMgr->GetEmblemFilename(this->m_guildId); CEmblemRes* emblem = static_cast(ResourceMgr::Instance().Load(name)); if (emblem && emblem->gif.frameChanged == true) { @@ -572,7 +572,7 @@ void UIGuildInfoManageWnd::Slot19() { // OFFSET: 0x009656A0 // FUNCTION: fn_13140 -void UIGuildWnd::Slot11() { +void UIGuildWnd::StoreInfo() { if (this->m_saved) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; @@ -716,8 +716,8 @@ void UIGuildBanishedMemberWnd::UpdateScroll() { // OFFSET: 0x0095FBF0 // FUNCTION: fn_13083 -void UIGuildBanishedMemberWnd::Slot25(int x, int y) { - UIGuildWnd::Slot25(x, y); +void UIGuildBanishedMemberWnd::OnLBtnDown(int x, int y) { + UIGuildWnd::OnLBtnDown(x, y); const int previous = this->m_hoverRow; int hover = -1; if (x <= this->geometry.width - 14 && x >= 4 && y >= g_guildBanishedRowHeight + 46 && y < (this->m_visibleRows + 1) * g_guildBanishedRowHeight + 46) { @@ -818,8 +818,8 @@ void UIGuildTotalInfoWnd::UpdateScroll() { // OFFSET: 0x0095FF60 // FUNCTION: fn_13090 -void UIGuildTotalInfoWnd::Slot25(int x, int y) { - UIGuildWnd::Slot25(x, y); +void UIGuildTotalInfoWnd::OnLBtnDown(int x, int y) { + UIGuildWnd::OnLBtnDown(x, y); const int previous = this->m_hoverRow; int hover = -1; if (x <= this->geometry.width - 14 && x >= 4 && y >= g_guildTotalInfoRowHeight + 46 && y < (this->m_visibleRows + 1) * g_guildTotalInfoRowHeight + 46) { @@ -877,7 +877,7 @@ int UIGuildTotalInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a1 // OFFSET: 0x0095D3A0 // FUNCTION: fn_13066 -void UIGuildTotalInfoWnd::Slot15(int, int) { +void UIGuildTotalInfoWnd::OnCreate(int, int) { this->CreateTabs(); if (std::strcmp(g_guildInfo.unknown_0018.c_str(), "") == 0) { g_modeMgr.gameMode->SendMsg(107, 0, 0, 0, 0); @@ -907,7 +907,7 @@ void UIGuildTotalInfoWnd::Slot15(int, int) { // OFFSET: 0x00958740 // FUNCTION: fn_13057 -void UIGuildBanishedMemberWnd::Slot15(int, int) { +void UIGuildBanishedMemberWnd::OnCreate(int, int) { this->CreateTabs(); if (std::strcmp(g_guildInfo.unknown_0018.c_str(), "") == 0) { g_modeMgr.gameMode->SendMsg(107, 0, 0, 0, 0); @@ -943,7 +943,7 @@ void UIGuildBanishedMemberWnd::Slot15(int, int) { // OFFSET: 0x00958FF0 // FUNCTION: fn_13059 -void UIGuildInfoManageWnd::Slot15(int, int) { +void UIGuildInfoManageWnd::OnCreate(int, int) { this->CreateTabs(); this->m_allyRow = -1; this->m_hostileRow = -1; @@ -1016,20 +1016,20 @@ void UIGuildInfoManageWnd::HideAgitMenu() { // OFFSET: 0x00960380 // FUNCTION: fn_13102 -void UIGuildInfoManageWnd::Slot32(int, int) { +void UIGuildInfoManageWnd::OnRBtnDown(int, int) { this->HideAgitMenu(); } // OFFSET: 0x0095FCF0 // FUNCTION: fn_13085 -void UIGuildInfoManageWnd::Slot25(int x, int y) { - UIGuildWnd::Slot25(x, y); +void UIGuildInfoManageWnd::OnLBtnDown(int x, int y) { + UIGuildWnd::OnLBtnDown(x, y); this->HideAgitMenu(); } // OFFSET: 0x00960540 // FUNCTION: fn_13107 -void UIGuildInfoManageWnd::Slot33(int x, int y) { +void UIGuildInfoManageWnd::OnRBtnUp(int x, int y) { if (x < 201 || x > 287) { return; } @@ -1239,8 +1239,8 @@ void UIGuildMemberManageWnd::SortMembers(int column) { // OFFSET: 0x0095FD40 // FUNCTION: fn_13086 -void UIGuildMemberManageWnd::Slot25(int x, int y) { - UIGuildWnd::Slot25(x, y); +void UIGuildMemberManageWnd::OnLBtnDown(int x, int y) { + UIGuildWnd::OnLBtnDown(x, y); if (x >= 6 && x <= 381 && y >= 47 && y <= 66) { int left = 6; for (int column = 0; column < 6; ++column) { @@ -1571,7 +1571,7 @@ void UIGuildInfoManageWnd::Paint() { // OFFSET: 0x0095FE70 // FUNCTION: fn_13089 -void UIGuildSkillWnd::Slot25(int x, int y) { +void UIGuildSkillWnd::OnLBtnDown(int x, int y) { const int previous = this->m_hoverIndex; this->m_hoverIndex = this->SkillIndexAt(x, y); if (previous != this->m_hoverIndex) { @@ -1593,7 +1593,7 @@ void UIGuildSkillWnd::Slot25(int x, int y) { } } - UIGuildWnd::Slot25(x, y); + UIGuildWnd::OnLBtnDown(x, y); } } @@ -1670,7 +1670,7 @@ void UIGuildTotalInfoWnd::Paint() { // OFFSET: 0x00959F10 // FUNCTION: fn_13061 -void UIGuildMemberManageWnd::Slot15(int, int) { +void UIGuildMemberManageWnd::OnCreate(int, int) { this->CreateTabs(); if (std::strcmp(g_guildInfo.unknown_0018.c_str(), "") == 0) { g_modeMgr.gameMode->SendMsg(107, 0, 0, 0, 0); @@ -1761,8 +1761,8 @@ void UIGuildMemberManageWnd::Slot15(int, int) { // FUNCTION: fn_13036 void UIAgitMessageBox::InitializeMessageBox(const char* text, int width, int height) { this->SetSize(width, height); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); UITextViewer* viewer = new UITextViewer(); viewer->Configure(10, 22, width - 20, height - 55, 0); @@ -1963,7 +1963,7 @@ bool UIGuildMemberManageWnd::DrawMember(GuildInfo::Member& member, int& index, i // OFFSET: 0x0095ACC0 // FUNCTION: fn_13062 -void UIGuildNoticeWnd::Slot15(int, int) { +void UIGuildNoticeWnd::OnCreate(int, int) { this->CreateTabs(); if (std::strcmp(g_guildInfo.unknown_0018.c_str(), "") == 0) { @@ -2235,7 +2235,7 @@ UIListBoxAgitMenu::UIListBoxAgitMenu() : UIListBox() { // OFFSET: 0x0095BF90 // FUNCTION: fn_13064 -void UIGuildSkillWnd::Slot15(int, int height) { +void UIGuildSkillWnd::OnCreate(int, int height) { this->CreateTabs(); if (std::strcmp(g_guildInfo.unknown_0018.c_str(), "") == 0) { g_modeMgr.gameMode->SendMsg(107, 0, 0, 0, 0); @@ -2863,7 +2863,7 @@ int UIGuildMemberManageWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x0095B380 // FUNCTION: fn_13063 -void UIGuildPositionManageWnd::Slot15(int, int) { +void UIGuildPositionManageWnd::OnCreate(int, int) { this->CreateTabs(); this->m_positions = reinterpret_cast&>(g_guildInfo.unknown_00D4); if (std::strcmp(g_guildInfo.unknown_0018.c_str(), "") == 0) { diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index 1bb0dfaf0..cf4e32c16 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -59,9 +59,9 @@ struct GuildPositionEntry { class UIGuildWnd : public UIFrameWnd { public: UIGuildWnd(); - void Slot11() override; + void StoreInfo() override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; virtual int Tab() = 0; @@ -77,10 +77,10 @@ class UIGuildBanishedMemberWnd : public UIGuildWnd { public: UIGuildBanishedMemberWnd(); int Tab() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnWheel(int delta) 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 UpdateScroll(); @@ -99,12 +99,12 @@ class UIGuildInfoManageWnd : public UIGuildWnd { public: UIGuildInfoManageWnd(); int Tab() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(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; protected: @@ -128,13 +128,13 @@ class UIGuildMemberManageWnd : public UIGuildWnd { public: UIGuildMemberManageWnd(); int Tab() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) 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 UpdateScroll(); @@ -170,9 +170,9 @@ public: int Tab() override { return 5; } - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; protected: @@ -188,13 +188,13 @@ public: int Tab() override { return 2; } - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Invalidate() override; - void Slot35(int delta) override; + void OnWheel(int delta) 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 UpdateScroll(); @@ -225,12 +225,12 @@ class UIGuildSkillWnd : public UIGuildWnd { public: UIGuildSkillWnd(); int Tab() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) 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 UpdateScroll(); @@ -259,10 +259,10 @@ class UIGuildTotalInfoWnd : public UIGuildWnd { public: UIGuildTotalInfoWnd(); int Tab() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnWheel(int delta) 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 UpdateScroll(); diff --git a/Source/UI/Guild/UIGuild_Storage_Log.h b/Source/UI/Guild/UIGuild_Storage_Log.h index 608071f96..9c86ec5fb 100644 --- a/Source/UI/Guild/UIGuild_Storage_Log.h +++ b/Source/UI/Guild/UIGuild_Storage_Log.h @@ -30,7 +30,7 @@ extern std::vector g_guildStorageLogs[3]; class UIGuild_Storage_Log : public UIFrameWnd { public: UIGuild_Storage_Log(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp index 86f291b4c..0c3d85216 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp @@ -40,7 +40,7 @@ inline CEquipmentPropertiesMgr* EquipmentPropertiesMgr() { } template void CUIListBoxEx::Paint(); -template void CUIListBoxEx::Slot35(int); +template void CUIListBoxEx::OnWheel(int); template void CUIListBoxEx::ClearItems(); // OFFSET: 0x00A0EBF0 @@ -123,7 +123,7 @@ void CUIListBoxEx -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -206,19 +206,19 @@ void CUIListBoxExResize(300, 308); this->unknown_00B4 = 0x101; this->m_resolveSkin = true; this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); this->SetSkinColors(0, 0, 3, 1); this->m_buttonBarStyle = 1; } @@ -253,7 +253,7 @@ void CUIEquipmentPropertiesWnd::Slot53() { // OFFSET: 0x00A08F20 // FUNCTION: fn_15034 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -296,7 +296,7 @@ private: // OFFSET: 0x00A09130 // FUNCTION: fn_15035 -void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { +void CUIEquipmentPropertiesWnd::OnCreate(int width, int height) { this->titleBar = new CUITitleBar(); this->titleBar->SetSize(300, 17); this->titleBar->Move(0, 0); @@ -878,7 +878,7 @@ void CUIEquipmentPropertiesWnd::Slot15(int width, int height) { // OFFSET: 0x00A0C9C0 // FUNCTION: fn_15036 -void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Slot15(int width, int height) { +void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(44, 12); this->unknown_00E8->Move(0, 4); @@ -1014,14 +1014,14 @@ void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Paint() { // OFFSET: 0x00A0F1F0 // FUNCTION: fn_15167 -void CUIEquipmentPropertiesWnd::Slot16() { +void CUIEquipmentPropertiesWnd::OnInit() { EquipmentProperties::EquipmentPropertiesMgr()->SetWindow(this); } // OFFSET: 0x00A0F270 // FUNCTION: fn_15168 -void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Slot16() { - this->Slot53(1); +void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::OnInit() { + this->LoadSkin(1); } // OFFSET: 0x00A0F280 @@ -1035,7 +1035,7 @@ void CUIEquipmentPropertiesWnd::Grow(int width, int height) { // OFFSET: 0x00A0F2F0 // FUNCTION: fn_15170 -void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Slot53(int resolveSkin) { +void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::LoadSkin(int resolveSkin) { unsigned red, green, blue; SkinPaletteChannels(ResourceMgr::Instance(), 2, 2, red, green, blue); this->evenRowColor = RGB(red, green, blue); diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.h b/Source/UI/Item/UIEquipmentPropertiesWnd.h index cecce92dc..a3806a529 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.h +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.h @@ -18,10 +18,10 @@ public: /* 00F0 */ std::uint32_t evenRowColor; /* 00F4 */ std::uint32_t oddRowColor; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot53(int resolveSkin) override; + void LoadSkin(int resolveSkin) override; }; } @@ -34,11 +34,11 @@ public: /* 00E4 */ CUIResizer* resizer; /* 00E8 */ int currentTab; - bool Slot02() override; - bool Slot03() override; - bool Slot08() override; - void Slot15(int width, int height) override; - virtual void Slot53(); + bool IsFrameWnd() override; + bool NeedsFrameRefresh() override; + bool IsTransmitMouseInput() override; + void OnCreate(int width, int height) override; + virtual void Initialize(); void Grow(int width, int height) override; void Paint() override; void OnClickButton1(); @@ -53,7 +53,7 @@ public: void OnClickClose(); void OnSelectLine(EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine* line, const std::string& text); void BindLine(EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine* line, const std::string& text); - void Slot16() override; + void OnInit() 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 SetTab(const int& tab); void OnChangeTab(CUITabButton* button); @@ -64,13 +64,13 @@ CUIListBoxEx CUIListBoxEx::~CUIListBoxEx(); template <> -void CUIListBoxEx::Slot15(int width, int height); +void CUIListBoxEx::OnCreate(int width, int height); template <> void CUIListBoxEx::AddNewItem(); template <> void CUIListBoxEx::Resize(int width, int height); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine) == 0xF8); diff --git a/Source/UI/Item/UIItemBaseWnd.h b/Source/UI/Item/UIItemBaseWnd.h index be51fc161..62c809dd4 100644 --- a/Source/UI/Item/UIItemBaseWnd.h +++ b/Source/UI/Item/UIItemBaseWnd.h @@ -10,11 +10,11 @@ class UIItemBaseWnd : public UIFrameWnd { public: UIItemBaseWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot35(int value) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; int GetItemIndexAt(int x, int y); diff --git a/Source/UI/Item/UIItemPurchaseWnd.h b/Source/UI/Item/UIItemPurchaseWnd.h index 8ffdb53fa..63bd53b8b 100644 --- a/Source/UI/Item/UIItemPurchaseWnd.h +++ b/Source/UI/Item/UIItemPurchaseWnd.h @@ -11,14 +11,14 @@ class UIStaticText; class UIItemPurchaseWnd : public UIItemBaseWnd { public: - std::vector Slot44() override; + std::vector GetReplayData() override; UIItemPurchaseWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() 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; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Item/UIItemSellWnd.h b/Source/UI/Item/UIItemSellWnd.h index e3ed1fcb1..bc8b346f5 100644 --- a/Source/UI/Item/UIItemSellWnd.h +++ b/Source/UI/Item/UIItemSellWnd.h @@ -10,15 +10,15 @@ class UIStaticText; class UIItemSellWnd : public UIItemBaseWnd { public: - std::vector Slot44() override; + std::vector GetReplayData() override; UIItemSellWnd(); - void Slot11() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Item/UIItemSellWnd2.h b/Source/UI/Item/UIItemSellWnd2.h index d0999fab9..5dafd831a 100644 --- a/Source/UI/Item/UIItemSellWnd2.h +++ b/Source/UI/Item/UIItemSellWnd2.h @@ -12,16 +12,16 @@ class UIStaticText; class UIItemSellWnd2 : public UIItemBaseWnd { public: UIItemSellWnd2(); - std::vector Slot44() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; + std::vector GetReplayData() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; protected: /* 00F0 */ UIStaticText* total; diff --git a/Source/UI/Item/UIItemShopWnd.h b/Source/UI/Item/UIItemShopWnd.h index 0b81c0da4..5d87008e0 100644 --- a/Source/UI/Item/UIItemShopWnd.h +++ b/Source/UI/Item/UIItemShopWnd.h @@ -15,13 +15,13 @@ class UIItemShopWnd : public UIItemBaseWnd { public: UIItemShopWnd(); std::vector BuildReplayRecords(); - void Slot11() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Item/UIItemShopWnd2.h b/Source/UI/Item/UIItemShopWnd2.h index a095d68bb..d30038168 100644 --- a/Source/UI/Item/UIItemShopWnd2.h +++ b/Source/UI/Item/UIItemShopWnd2.h @@ -13,14 +13,14 @@ class UIStaticText; class UIItemShopWnd2 : public UIItemBaseWnd { public: UIItemShopWnd2(); - void Slot11() override; + void StoreInfo() override; void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot15(int width, int height) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: diff --git a/Source/UI/Item/UIItemStoreFindWnd.h b/Source/UI/Item/UIItemStoreFindWnd.h index c95e5b0e4..e357cf6db 100644 --- a/Source/UI/Item/UIItemStoreFindWnd.h +++ b/Source/UI/Item/UIItemStoreFindWnd.h @@ -14,19 +14,19 @@ class UIStaticText; class UIItemStoreFindWnd : public UIItemBaseWnd { public: UIItemStoreFindWnd(); - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot35(int value) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int value) override; void Paint() override; __declspec(noinline) ITEM_INFO GetItemAt(int x, int y); void SetTitle(std::string title); void SetSearchText(std::string text); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00F0 */ unsigned char unknown_00F0[0xC]; diff --git a/Source/UI/Item/UIItemStoreSubWnd.h b/Source/UI/Item/UIItemStoreSubWnd.h index d4d28f241..728cc239b 100644 --- a/Source/UI/Item/UIItemStoreSubWnd.h +++ b/Source/UI/Item/UIItemStoreSubWnd.h @@ -13,13 +13,13 @@ class UIStaticText; class UIItemStoreSubWnd : public UIItemBaseWnd { public: UIItemStoreSubWnd(); - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot35(int value) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int value) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -38,7 +38,7 @@ public: bool FilterByName1(std::string query); bool FilterByName2(std::string query); bool FilterByName3(std::string query); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; /* 00F0 */ unsigned char unknown_00F0[0x20]; /* 0110 */ UIResizer* resizeHandle; diff --git a/Source/UI/Item/UIItemStoreWnd.h b/Source/UI/Item/UIItemStoreWnd.h index 5a628612c..ffa57263d 100644 --- a/Source/UI/Item/UIItemStoreWnd.h +++ b/Source/UI/Item/UIItemStoreWnd.h @@ -15,16 +15,16 @@ class UITab; class UIItemStoreWnd : public UIItemBaseWnd { public: - std::vector Slot44() override; + std::vector GetReplayData() override; UIItemStoreWnd(); __declspec(noinline) ~UIItemStoreWnd() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot11() override; - void Slot25(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void StoreInfo() override; + void OnLBtnDown(int x, int y) override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; __declspec(noinline) ITEM_INFO GetItemAt(int x, int y); void SetTabChecked(int index, bool checked); diff --git a/Source/UI/Item/UIItemWnd.h b/Source/UI/Item/UIItemWnd.h index 541656050..6b7343679 100644 --- a/Source/UI/Item/UIItemWnd.h +++ b/Source/UI/Item/UIItemWnd.h @@ -17,19 +17,19 @@ public: UIItemWnd(); __declspec(noinline) ~UIItemWnd() override; // INLINED - bool Slot03() override { + bool NeedsFrameRefresh() override { return true; } - void Slot11() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot18() override; - void Slot19() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void StoreInfo() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnDestroy() override; + void OnProcess() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; ITEM_INFO GetItemAt(int x, int y); diff --git a/Source/UI/Item/UIMerchantItemLogWnd.cpp b/Source/UI/Item/UIMerchantItemLogWnd.cpp index 19224878e..837d81a6f 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.cpp +++ b/Source/UI/Item/UIMerchantItemLogWnd.cpp @@ -36,7 +36,7 @@ UIMerchantItemLogWnd::UIMerchantItemLogWnd(int mode) : UIItemBaseWnd() { // OFFSET: 0x0099E510 // FUNCTION: fn_13575 -void UIMerchantItemLogWnd::Slot15(int width, int height) { +void UIMerchantItemLogWnd::OnCreate(int width, int height) { UIStaticText* title = new UIStaticText(); title->SetSize(160, 15); title->SetText(LookupMessage(2559 + (this->unknown_00FC != 0)), 0); @@ -160,7 +160,7 @@ void UIMerchantItemLogWnd::Paint() { // OFFSET: 0x0099ED00 // FUNCTION: fn_13577 -void UIMerchantItemLogWnd::Slot28(int x, int y) { +void UIMerchantItemLogWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -181,7 +181,7 @@ void UIMerchantItemLogWnd::Slot28(int x, int y) { // OFFSET: 0x0099EF50 // FUNCTION: fn_13578 -void UIMerchantItemLogWnd::Slot19() { +void UIMerchantItemLogWnd::OnProcess() { bool changed = false; for (auto it = this->logs.begin(); it != this->logs.end(); ++it) { if (it->name.compare(LookupMessage(581)) == 0) { @@ -197,7 +197,7 @@ void UIMerchantItemLogWnd::Slot19() { // OFFSET: 0x0099F090 // FUNCTION: fn_13579 -void UIMerchantItemLogWnd::Slot32(int x, int y) { +void UIMerchantItemLogWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] > 0) { diff --git a/Source/UI/Item/UIMerchantItemLogWnd.h b/Source/UI/Item/UIMerchantItemLogWnd.h index 66ec1312e..31e8c93e1 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.h +++ b/Source/UI/Item/UIMerchantItemLogWnd.h @@ -24,11 +24,11 @@ public: }; UIMerchantItemLogWnd(int mode); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00F0 */ std::vector logs; diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Item/UIParaItemShopWnd.cpp index 70d32de4e..1bef8cde2 100644 --- a/Source/UI/Item/UIParaItemShopWnd.cpp +++ b/Source/UI/Item/UIParaItemShopWnd.cpp @@ -94,9 +94,9 @@ void UIParaResultWnd::AddItem(const ITEM_INFO& item) { // OFFSET: 0x009A81F0 // FUNCTION: fn_13747 -void UIParaItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { +void UIParaItemPurchaseWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -127,9 +127,9 @@ void UIParaItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009A82E0 // FUNCTION: fn_13748 -void UIParaItemShopWnd::Slot10(int x, int y, std::intptr_t value) { +void UIParaItemShopWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -150,14 +150,14 @@ void UIParaItemShopWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009A83B0 // FUNCTION: fn_13749 -void UIParaResultWnd::Slot10(int x, int y, std::intptr_t value) { +void UIParaResultWnd::DragAndDrop(int x, int y, std::intptr_t value) { } // OFFSET: 0x009A96C0 // FUNCTION: fn_13754 -void UIParaResultWnd::Slot25(int x, int y) { +void UIParaResultWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } int previousHovered = this->unknown_00F8; @@ -169,7 +169,7 @@ void UIParaResultWnd::Slot25(int x, int y) { // OFFSET: 0x009A9710 // FUNCTION: fn_13755 -void UIParaResultWnd::Slot28(int x, int y) { +void UIParaResultWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] != 0) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -193,7 +193,7 @@ void UIParaResultWnd::Slot28(int x, int y) { // OFFSET: 0x009A99C0 // FUNCTION: fn_13756 -void UIParaResultWnd::Slot32(int x, int y) { +void UIParaResultWnd::OnRBtnDown(int x, int y) { const int previousHovered = this->unknown_00F8; this->unknown_00F8 = this->GetItemIndexAt(x, y); if (previousHovered != this->unknown_00F8) { @@ -215,7 +215,7 @@ void __stdcall Nullsub344(int, int) { // OFFSET: 0x009A83C0 // FUNCTION: fn_13750 -void UIParaResultWnd::Slot15(int width, int height) { +void UIParaResultWnd::OnCreate(int width, int height) { this->total = new UIStaticText(); this->total->SetSize(160, 15); this->total->Move(12, this->geometry.height - 21); diff --git a/Source/UI/Item/UIParaItemShopWnd.h b/Source/UI/Item/UIParaItemShopWnd.h index b9417777a..95f16011b 100644 --- a/Source/UI/Item/UIParaItemShopWnd.h +++ b/Source/UI/Item/UIParaItemShopWnd.h @@ -17,7 +17,7 @@ extern int g_pendingGid; class UIParaItemPurchaseWnd : public UIItemPurchaseWnd { public: UIParaItemPurchaseWnd(); - void Slot10(int x, int y, std::intptr_t value) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -25,7 +25,7 @@ class UIParaItemShopWnd : public UIItemShopWnd { public: UIParaItemShopWnd(); std::vector BuildReplayRecords(); - void Slot10(int x, int y, std::intptr_t value) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -33,12 +33,12 @@ public: class UIParaResultWnd : public UIItemBaseWnd { public: UIParaResultWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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 AddItem(const RawItemBasic& item, int quantity); diff --git a/Source/UI/Items/MergeItemWnd.cpp b/Source/UI/Items/MergeItemWnd.cpp index 83b95464c..0e5be66cf 100644 --- a/Source/UI/Items/MergeItemWnd.cpp +++ b/Source/UI/Items/MergeItemWnd.cpp @@ -121,7 +121,7 @@ void CMergeItemWnd::CreateControls() { // OFFSET: 0x007DF830 // FUNCTION: fn_09665 -void CMergeItemWnd::Slot15(int, int) { +void CMergeItemWnd::OnCreate(int, int) { this->CreateControls(); this->FitToGrid(this->geometry.width, this->geometry.height); } @@ -170,9 +170,9 @@ void CMergeItemWnd::Paint() { // OFFSET: 0x007DFB20 // FUNCTION: fn_09667 -void CMergeItemWnd::Slot25(int x, int y) { +void CMergeItemWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -188,7 +188,7 @@ void CMergeItemWnd::Slot25(int x, int y) { // OFFSET: 0x007DFBA0 // FUNCTION: fn_09668 -void CMergeItemWnd::Slot28(int x, int y) { +void CMergeItemWnd::OnMouseHover(int x, int y) { const int id = this->ItemAt(x, y); int screenX = x; int screenY = y; @@ -202,12 +202,12 @@ void CMergeItemWnd::Slot28(int x, int y) { // OFFSET: 0x007DFD00 // FUNCTION: fn_09669 -void CMergeItemWnd::Slot19() { +void CMergeItemWnd::OnProcess() { } // OFFSET: 0x007DFD10 // FUNCTION: fn_09670 -void CMergeItemWnd::Slot35(int delta) { +void CMergeItemWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { int step = this->m_rows - 1; if (step > 3) { diff --git a/Source/UI/Items/MergeItemWnd.h b/Source/UI/Items/MergeItemWnd.h index 6574fd3e2..e6f97cd0f 100644 --- a/Source/UI/Items/MergeItemWnd.h +++ b/Source/UI/Items/MergeItemWnd.h @@ -16,12 +16,12 @@ public: CMergeItemWnd(); ~CMergeItemWnd() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; __declspec(noinline) void CreateControls(); void SelectSameItems(int id); diff --git a/Source/UI/Items/UICardItemIllustWnd.h b/Source/UI/Items/UICardItemIllustWnd.h index 92240708d..257ad15ff 100644 --- a/Source/UI/Items/UICardItemIllustWnd.h +++ b/Source/UI/Items/UICardItemIllustWnd.h @@ -8,7 +8,7 @@ class UICardItemIllustWnd : public UIFrameWnd { public: UICardItemIllustWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Items/UIEquipWnd.h b/Source/UI/Items/UIEquipWnd.h index bb7b23625..58d45baa3 100644 --- a/Source/UI/Items/UIEquipWnd.h +++ b/Source/UI/Items/UIEquipWnd.h @@ -13,12 +13,12 @@ class UICheckBox; class UIEquipWnd : public UIFrameWnd { public: UIEquipWnd(); - bool Slot03() override; + bool NeedsFrameRefresh() override; void Move(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; /* 00B4 */ int m_viewOther; /* 00B8 */ int m_highlight[3]; /* 00C4 */ int m_show; @@ -51,14 +51,14 @@ public: /* 016C */ std::vector m_damageSkinIcons; /* 0178 */ UIBitmapButton* unknown_0178; - void Slot19() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int delta) override; + void OnProcess() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void DrawDamageSkinPage(); diff --git a/Source/UI/Items/UIExchangeWnd.h b/Source/UI/Items/UIExchangeWnd.h index de2ff7de3..c19aa9dd3 100644 --- a/Source/UI/Items/UIExchangeWnd.h +++ b/Source/UI/Items/UIExchangeWnd.h @@ -35,15 +35,15 @@ public: /* 0120 */ int m_moneyLength; /* 0124 */ std::string m_moneyText; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() 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 Slot10(int x, int y, std::intptr_t value) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int delta) override; - void Slot19() override; - std::vector Slot44() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int delta) override; + void OnProcess() override; + std::vector GetReplayData() override; void LayoutButtons(); void CancelInput(); diff --git a/Source/UI/Items/UIGameItem.cpp b/Source/UI/Items/UIGameItem.cpp index 47bd1a647..3a3168c2c 100644 --- a/Source/UI/Items/UIGameItem.cpp +++ b/Source/UI/Items/UIGameItem.cpp @@ -83,17 +83,17 @@ void CUIGameItemWithNum::Paint() { // OFFSET: 0x009E75E0 // FUNCTION: fn_14481 -void CUIGameItem::Slot25(int x, int y) { +void CUIGameItem::OnLBtnDown(int x, int y) { if (this->onClick) { this->onClick(this); return; } - CUIControl::Slot25(x, y); + CUIControl::OnLBtnDown(x, y); } // OFFSET: 0x009E7610 // FUNCTION: fn_14482 -void CUIGameItem::Slot28(int x, int y) { +void CUIGameItem::OnMouseHover(int x, int y) { if (this->unknown_0084 == 0 || this->name.empty()) { return; } @@ -113,7 +113,7 @@ void CUIGameItem::Slot28(int x, int y) { // OFFSET: 0x009E7750 // FUNCTION: fn_14483 -void CUIGameItem::Slot26(int, int) { +void CUIGameItem::OnLBtnDblClk(int, int) { if (this->unknown_0085 == 0 || std::atoi(this->itemInfo.itemId.c_str()) <= 0) { return; } diff --git a/Source/UI/Items/UIGameItem.h b/Source/UI/Items/UIGameItem.h index 87f77feb3..bbad8aefb 100644 --- a/Source/UI/Items/UIGameItem.h +++ b/Source/UI/Items/UIGameItem.h @@ -24,9 +24,9 @@ public: /* 01B0 */ std::function onClick; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; virtual void SetMode(int mode); ITEM_INFO* GetItemInfo(); diff --git a/Source/UI/Items/UIIllustWnd.cpp b/Source/UI/Items/UIIllustWnd.cpp index 3a9f91bbe..e75bed7b8 100644 --- a/Source/UI/Items/UIIllustWnd.cpp +++ b/Source/UI/Items/UIIllustWnd.cpp @@ -27,15 +27,15 @@ UIMultiIllustWnd::UIMultiIllustWnd() : UIFrameWnd(0) { // OFFSET: 0x0096CBD0 // FUNCTION: fn_13181 -void UIIllustWnd::Slot15(int, int) {} +void UIIllustWnd::OnCreate(int, int) {} // OFFSET: 0x0096CBE0 // FUNCTION: fn_13182 -void UIMultiIllustWnd::Slot15(int, int) {} +void UIMultiIllustWnd::OnCreate(int, int) {} // OFFSET: 0x0096CBF0 // FUNCTION: fn_13183 -void UIIllustWnd::Slot18() { +void UIIllustWnd::OnDestroy() { if (this->m_bitmapName.size() != 0) { CRes* bitmap = ResourceMgr::Instance().Load(Resolve(this->m_bitmapName.c_str())); ResourceMgr::Instance().Remove(bitmap); @@ -44,7 +44,7 @@ void UIIllustWnd::Slot18() { // OFFSET: 0x0096CC40 // FUNCTION: fn_13184 -void UIMultiIllustWnd::Slot18() { +void UIMultiIllustWnd::OnDestroy() { if (this->m_bitmapName.size() != 0) { CRes* bitmap = ResourceMgr::Instance().Load(Resolve(this->m_bitmapName.c_str())); ResourceMgr::Instance().Remove(bitmap); @@ -77,21 +77,21 @@ void UIMultiIllustWnd::Paint() { // OFFSET: 0x0096CD70 // FUNCTION: fn_13187 -void UIMultiIllustWnd::Slot25(int, int) {} +void UIMultiIllustWnd::OnLBtnDown(int, int) {} // OFFSET: 0x0096CD80 // FUNCTION: fn_13188 -void UIIllustWnd::Slot27(int x, int y) { +void UIIllustWnd::OnMouseMove(int x, int y) { if (this->m_closable != 0) { - UIFrameWnd::Slot27(x, y); + UIFrameWnd::OnMouseMove(x, y); } } // OFFSET: 0x0096CDA0 // FUNCTION: fn_13189 -void UIMultiIllustWnd::Slot27(int x, int y) { +void UIMultiIllustWnd::OnMouseMove(int x, int y) { if (this->m_closable != 0) { - UIFrameWnd::Slot27(x, y); + UIFrameWnd::OnMouseMove(x, y); } } diff --git a/Source/UI/Items/UIIllustWnd.h b/Source/UI/Items/UIIllustWnd.h index 5c0a0165e..d6d5b8143 100644 --- a/Source/UI/Items/UIIllustWnd.h +++ b/Source/UI/Items/UIIllustWnd.h @@ -9,10 +9,10 @@ class UIIllustWnd : public UIFrameWnd { public: UIIllustWnd(); bool CanHitTest() override; - void Slot15(int width, int height) override; - void Slot18() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; void Paint() override; - void Slot27(int x, int y) override; + void OnMouseMove(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; protected: @@ -25,11 +25,11 @@ class UIMultiIllustWnd : public UIFrameWnd { public: UIMultiIllustWnd(); bool CanHitTest() override; - void Slot15(int width, int height) override; - void Slot18() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(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; protected: diff --git a/Source/UI/Items/UIItemCollectionWnd.h b/Source/UI/Items/UIItemCollectionWnd.h index c1324b691..24a05e407 100644 --- a/Source/UI/Items/UIItemCollectionWnd.h +++ b/Source/UI/Items/UIItemCollectionWnd.h @@ -20,8 +20,8 @@ class UIItemCollectionWnd : public UIFrameWnd { public: UIItemCollectionWnd(); ~UIItemCollectionWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; // INLINED std::string& ItemIdText() { @@ -59,25 +59,25 @@ public: /* 024C */ unsigned char unknown_024C[0x4]; void Move(int x, int y) override; - void Slot19() override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(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 SetHeight(int height); int CardSlotAt(int x, int y, int* slotX, int* slotY); - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; bool WrapText(std::string text, int width, std::list& lines); }; class UICombinedCardItemCollectionWnd : public UIItemCollectionWnd { public: UICombinedCardItemCollectionWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Move(int x, int y) override; - void Slot11() override; - void Slot31(int x, int y) override; + void StoreInfo() override; + void OnLBtnUp(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; /* 0250 */ CombinedCardItemCollectionWndInfo* m_cardPlacement; @@ -86,20 +86,20 @@ public: class UIItemCollection_ComparisonWnd : public UIItemCollectionWnd { public: UIItemCollection_ComparisonWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Move(int x, int y) override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(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 Slot32(int x, int y) override; + void OnRBtnDown(int x, int y) override; }; class UICombinedCardItemCollection_ComparisonWnd : public UIItemCollectionWnd { public: UICombinedCardItemCollection_ComparisonWnd(); - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(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; }; diff --git a/Source/UI/Items/UIItemIdentifyWnd.h b/Source/UI/Items/UIItemIdentifyWnd.h index 524ff750f..bc817142c 100644 --- a/Source/UI/Items/UIItemIdentifyWnd.h +++ b/Source/UI/Items/UIItemIdentifyWnd.h @@ -22,15 +22,15 @@ public: /* 00EC */ WindowPlacement* m_placement; UIItemIdentifyWnd(); - void Slot11() override; + void StoreInfo() override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void UpdateScroll(); - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; - std::vector Slot44() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) override; + std::vector GetReplayData() override; ITEM_INFO GetItem(int index, int* found); ITEM_INFO GetSelectedItem(int* found); int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -40,7 +40,7 @@ class UIMakingArrowListWnd : public UIItemIdentifyWnd { public: UIMakingArrowListWnd(); void Paint() override; - std::vector Slot44() override; + std::vector GetReplayData() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00F0 */ std::int16_t unknown_00F0; @@ -56,9 +56,9 @@ public: class UIItemCompositionWnd : public UIItemIdentifyWnd { public: UIItemCompositionWnd(); - void Slot11() override; - void Slot15(int width, int height) override; - std::vector Slot44() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + std::vector GetReplayData() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00F0 */ WindowPlacement* m_compositionPlacement; diff --git a/Source/UI/Items/UIItemParamChangeDisplayWnd.h b/Source/UI/Items/UIItemParamChangeDisplayWnd.h index 6c34ca78a..66fcb43cc 100644 --- a/Source/UI/Items/UIItemParamChangeDisplayWnd.h +++ b/Source/UI/Items/UIItemParamChangeDisplayWnd.h @@ -25,8 +25,8 @@ public: /* 00EC */ int unknown_00EC; /* 00F0 */ WindowPlacement* m_placement; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Items/UIItemRepairWnd.cpp b/Source/UI/Items/UIItemRepairWnd.cpp index 7df5a58aa..6aa9ab9c3 100644 --- a/Source/UI/Items/UIItemRepairWnd.cpp +++ b/Source/UI/Items/UIItemRepairWnd.cpp @@ -69,7 +69,7 @@ void UIMakeTargetResultWnd::Paint() { // OFFSET: 0x009A0B00 // FUNCTION: fn_13604 -void UIItemRepairWnd::Slot15(int width, int height) { +void UIItemRepairWnd::OnCreate(int width, int height) { const int listWidth = width - 24; const int listHeight = height - 55; this->m_list = new UIListBox(); @@ -101,7 +101,7 @@ void UIItemRepairWnd::Slot15(int width, int height) { // OFFSET: 0x009A1590 // FUNCTION: fn_13605 -void UIMakeTargetListWnd::Slot15(int width, int height) { +void UIMakeTargetListWnd::OnCreate(int width, int height) { const int listWidth = width - 24; const int listHeight = height - 55; this->m_list = new UIListBox(); @@ -133,7 +133,7 @@ void UIMakeTargetListWnd::Slot15(int width, int height) { // OFFSET: 0x009A2020 // FUNCTION: fn_13606 -void UIMakeTargetProcessWnd::Slot15(int width, int height) { +void UIMakeTargetProcessWnd::OnCreate(int width, int height) { const std::string prefix("유저인터페이스\\"); int positions[2][2] = {{width - 91, height - 24}, {width - 46, height - 24}}; const char* names[2][3] = {{"btn_ok", "btn_ok_a", "btn_ok_b"}, {"btn_cancel", "btn_cancel_a", "btn_cancel_b"}}; @@ -155,7 +155,7 @@ void UIMakeTargetProcessWnd::Slot15(int width, int height) { // OFFSET: 0x009A29B0 // FUNCTION: fn_13607 -void UIMakeTargetResultWnd::Slot15(int width, int height) { +void UIMakeTargetResultWnd::OnCreate(int width, int height) { const std::string prefix("유저인터페이스\\"); const int buttonX = width - 91; const int buttonY = height - 24; @@ -174,7 +174,7 @@ void UIMakeTargetResultWnd::Slot15(int width, int height) { // OFFSET: 0x009A2DD0 // FUNCTION: fn_13608 -void UIWeaponRefineWnd::Slot15(int width, int height) { +void UIWeaponRefineWnd::OnCreate(int width, int height) { const int listWidth = width - 24; const int listHeight = height - 55; this->m_list = new UIListBox(); @@ -371,7 +371,7 @@ UIItemRepairWnd::~UIItemRepairWnd() = default; // OFFSET: 0x009A0280 // FUNCTION: fn_13599 -std::vector UIItemRepairWnd::Slot44() { +std::vector UIItemRepairWnd::GetReplayData() { std::vector records; { const auto record = BuildReplayTaggedRecord(22150, nullptr, 0); diff --git a/Source/UI/Items/UIItemRepairWnd.h b/Source/UI/Items/UIItemRepairWnd.h index a657ac6f3..dba178dec 100644 --- a/Source/UI/Items/UIItemRepairWnd.h +++ b/Source/UI/Items/UIItemRepairWnd.h @@ -23,10 +23,10 @@ class UIItemRepairWnd : public UIFrameWnd { public: UIItemRepairWnd(); ~UIItemRepairWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; protected: diff --git a/Source/UI/Items/UIMakeTargetListWnd.cpp b/Source/UI/Items/UIMakeTargetListWnd.cpp index a968f03c4..ae1952780 100644 --- a/Source/UI/Items/UIMakeTargetListWnd.cpp +++ b/Source/UI/Items/UIMakeTargetListWnd.cpp @@ -20,7 +20,7 @@ // OFFSET: 0x009A0490 // FUNCTION: fn_13600 -std::vector UIMakeTargetListWnd::Slot44() { +std::vector UIMakeTargetListWnd::GetReplayData() { std::vector records; { const auto record = BuildReplayTaggedRecord(22050, nullptr, 0); diff --git a/Source/UI/Items/UIMakeTargetListWnd.h b/Source/UI/Items/UIMakeTargetListWnd.h index 8d2a98d9a..2616c3362 100644 --- a/Source/UI/Items/UIMakeTargetListWnd.h +++ b/Source/UI/Items/UIMakeTargetListWnd.h @@ -10,8 +10,8 @@ class UIListBox; class UIMakeTargetListWnd : public UIFrameWnd { public: UIMakeTargetListWnd(); - std::vector Slot44() override; - void Slot15(int width, int height) override; + std::vector GetReplayData() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Items/UIMakeTargetProcessWnd.cpp b/Source/UI/Items/UIMakeTargetProcessWnd.cpp index efdff905f..17516a3c1 100644 --- a/Source/UI/Items/UIMakeTargetProcessWnd.cpp +++ b/Source/UI/Items/UIMakeTargetProcessWnd.cpp @@ -21,7 +21,7 @@ // OFFSET: 0x009A0090 // FUNCTION: fn_13598 -void UIMakeTargetProcessWnd::Slot10(int x, int y, std::intptr_t value) { +void UIMakeTargetProcessWnd::DragAndDrop(int x, int y, std::intptr_t value) { switch (this->makeType) { case 994: case 995: @@ -65,7 +65,7 @@ void UIMakeTargetProcessWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x009A0690 // FUNCTION: fn_13601 -std::vector UIMakeTargetProcessWnd::Slot44() { +std::vector UIMakeTargetProcessWnd::GetReplayData() { std::vector records; { const auto record = BuildReplayTaggedRecord(22000, nullptr, 0); @@ -158,12 +158,12 @@ void UIMakeTargetProcessWnd::Paint() { // OFFSET: 0x009A3D10 // FUNCTION: fn_13614 -void UIMakeTargetProcessWnd::Slot25(int x, int y) { +void UIMakeTargetProcessWnd::OnLBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAt(x, y); if (item.unknown_0000[1] != 0) { g_modeMgr.gameMode->SendMsg(134, reinterpret_cast(item.itemId.c_str()), 0, 0, 0); } else { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } diff --git a/Source/UI/Items/UIMakeTargetProcessWnd.h b/Source/UI/Items/UIMakeTargetProcessWnd.h index 5ea1101b7..3d8efe9d5 100644 --- a/Source/UI/Items/UIMakeTargetProcessWnd.h +++ b/Source/UI/Items/UIMakeTargetProcessWnd.h @@ -10,11 +10,11 @@ class UIMakeTargetProcessWnd : public UIFrameWnd { public: UIMakeTargetProcessWnd(); void Paint() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - std::vector Slot44() override; + std::vector GetReplayData() override; ITEM_INFO GetItemAt(int x, int y); /* 00B4 */ int makeType; diff --git a/Source/UI/Items/UIMakeTargetResultWnd.h b/Source/UI/Items/UIMakeTargetResultWnd.h index 50b12e482..9bf826931 100644 --- a/Source/UI/Items/UIMakeTargetResultWnd.h +++ b/Source/UI/Items/UIMakeTargetResultWnd.h @@ -6,7 +6,7 @@ class UIMakeTargetResultWnd : public UIFrameWnd { public: UIMakeTargetResultWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Items/UINotifyItemObtainWnd.h b/Source/UI/Items/UINotifyItemObtainWnd.h index 8d3c8531b..0acee7347 100644 --- a/Source/UI/Items/UINotifyItemObtainWnd.h +++ b/Source/UI/Items/UINotifyItemObtainWnd.h @@ -15,8 +15,8 @@ public: /* 00E4 */ std::uint32_t m_shownTick; bool CanHitTest() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Items/UISwapEquipmentWnd.cpp b/Source/UI/Items/UISwapEquipmentWnd.cpp index 24dded243..2370bf913 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.cpp +++ b/Source/UI/Items/UISwapEquipmentWnd.cpp @@ -48,10 +48,10 @@ UISwapEquipmentWnd::UISwapEquipmentWnd() // OFFSET: 0x0082F990 // FUNCTION: fn_10390 -void UISwapEquipmentWnd::Slot10(int x, int y, std::intptr_t value) { +void UISwapEquipmentWnd::DragAndDrop(int x, int y, std::intptr_t value) { const ModeDragState* drag = reinterpret_cast(value); if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -178,7 +178,7 @@ void UISwapEquipmentWnd::DrawEquipmentSlots() { // OFFSET: 0x008315E0 // FUNCTION: fn_10400 -void UISwapEquipmentWnd::Slot32(int x, int y) { +void UISwapEquipmentWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->ItemAtPoint(x, y); if (item.unknown_0000[1] > 0) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&item), 0, 0, 0); @@ -286,7 +286,7 @@ ITEM_INFO UISwapEquipmentWnd::GetSlotItem(int slot) { // OFFSET: 0x00830760 // FUNCTION: fn_10394 -void UISwapEquipmentWnd::Slot15(int width, int height) { +void UISwapEquipmentWnd::OnCreate(int width, int height) { this->m_swapButton = new (std::nothrow) UISwapBitmapButton(); this->m_swapButton->SetBitmap("유저인터페이스\\swap_equipment\\btn_change2_normal.bmp", 0, 0); this->m_swapButton->SetBitmap("유저인터페이스\\swap_equipment\\btn_change2_over.bmp", 1, 0); @@ -374,7 +374,7 @@ void UISwapEquipmentWnd::Paint() { // OFFSET: 0x00830E20 // FUNCTION: fn_10397 -void UISwapEquipmentWnd::Slot26(int x, int y) { +void UISwapEquipmentWnd::OnLBtnDblClk(int x, int y) { if (y < 17) { this->SendMsg(this, 6, 0xCA, 0, 0, 0); } @@ -393,7 +393,7 @@ void UISwapEquipmentWnd::Slot26(int x, int y) { // OFFSET: 0x00830F40 // FUNCTION: fn_10398 -void UISwapEquipmentWnd::Slot25(int x, int y) { +void UISwapEquipmentWnd::OnLBtnDown(int x, int y) { ITEM_INFO item = this->ItemAtPoint(x, y); if (item.unknown_0000[1] <= 0 || item.quantity <= 0) { return; @@ -422,7 +422,7 @@ void UISwapEquipmentWnd::Slot25(int x, int y) { // OFFSET: 0x00831130 // FUNCTION: fn_10399 -void UISwapEquipmentWnd::Slot28(int x, int y) { +void UISwapEquipmentWnd::OnMouseHover(int x, int y) { { ITEM_INFO item = this->ItemAtPoint(x, y); if (item.unknown_0000[1] > 0) { diff --git a/Source/UI/Items/UISwapEquipmentWnd.h b/Source/UI/Items/UISwapEquipmentWnd.h index bda56656e..b7db394d2 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.h +++ b/Source/UI/Items/UISwapEquipmentWnd.h @@ -23,13 +23,13 @@ class UISwapEquipmentWnd : public UIFrameWnd { public: UISwapEquipmentWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; ITEM_INFO ItemAtPoint(int x, int y); __declspec(noinline) ITEM_INFO GetSlotItem(int slot); diff --git a/Source/UI/Items/UIWeaponRefineWnd.cpp b/Source/UI/Items/UIWeaponRefineWnd.cpp index f6826960a..7f9d2f676 100644 --- a/Source/UI/Items/UIWeaponRefineWnd.cpp +++ b/Source/UI/Items/UIWeaponRefineWnd.cpp @@ -19,7 +19,7 @@ // OFFSET: 0x009A07C0 // FUNCTION: fn_13602 -std::vector UIWeaponRefineWnd::Slot44() { +std::vector UIWeaponRefineWnd::GetReplayData() { std::vector records; { const auto record = BuildReplayTaggedRecord(22200, nullptr, 0); diff --git a/Source/UI/Items/UIWeaponRefineWnd.h b/Source/UI/Items/UIWeaponRefineWnd.h index c89fdbf55..447a7c7b0 100644 --- a/Source/UI/Items/UIWeaponRefineWnd.h +++ b/Source/UI/Items/UIWeaponRefineWnd.h @@ -10,8 +10,8 @@ class UIListBox; class UIWeaponRefineWnd : public UIFrameWnd { public: UIWeaponRefineWnd(); - std::vector Slot44() override; - void Slot15(int width, int height) override; + std::vector GetReplayData() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Layout/SnapMgr.cpp b/Source/UI/Layout/SnapMgr.cpp index dfd24c73d..dcf9dc90c 100644 --- a/Source/UI/Layout/SnapMgr.cpp +++ b/Source/UI/Layout/SnapMgr.cpp @@ -184,7 +184,7 @@ void CSnapMgr::CaptureOrigins(UIWindow* window) { for (auto entry = this->objects.begin(); entry != this->objects.end(); ++entry) { UIWindow* member = (*entry)->window; if (member && this->ConnectedToRoot(member)) { - member->Slot12(); + member->StoreMoveOrigin(); } } } @@ -205,7 +205,7 @@ void CSnapMgr::ConstrainGroup(UIWindow* window, int& dx, int& dy) { } const int savedY = member->geometry.y; - member->Slot13(dx, dy); + member->MoveFromOrigin(dx, dy); int x, y; g_windowMgr.ConstrainSnap(member, x, y, 1); @@ -234,7 +234,7 @@ void CSnapMgr::MoveConnected(UIWindow* window, int dx, int dy) { for (auto entry = this->objects.begin(); entry != this->objects.end(); ++entry) { UIWindow* member = (*entry)->window; if (this->ConnectedToRoot(member)) { - member->Slot13(dx, dy); + member->MoveFromOrigin(dx, dy); g_windowMgr.StoreSnapRectangle(member); } } diff --git a/Source/UI/Lists/TableBox.h b/Source/UI/Lists/TableBox.h index 3bbd35402..de340bdc2 100644 --- a/Source/UI/Lists/TableBox.h +++ b/Source/UI/Lists/TableBox.h @@ -6,7 +6,7 @@ class TableBox : public UIWindow { public: TableBox(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -17,7 +17,7 @@ public: class UITableBox : public UIWindow { public: UITableBox(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Lists/UIChatHisBox.h b/Source/UI/Lists/UIChatHisBox.h index 83423aa82..983cf29ef 100644 --- a/Source/UI/Lists/UIChatHisBox.h +++ b/Source/UI/Lists/UIChatHisBox.h @@ -14,14 +14,14 @@ class UIChatHisBox : public UIListBox { public: UIChatHisBox(); ~UIChatHisBox() override; - bool Slot08() override; + bool IsTransmitMouseInput() override; void Resize(int width, int height) override; void Show(int visible) override; void Paint() override; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot31(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnLBtnUp(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 Configure(int x, int y, int width, int height, unsigned char transparent) override; void Clear() override; diff --git a/Source/UI/Lists/UIComboBox.h b/Source/UI/Lists/UIComboBox.h index de21e9939..c85ba5146 100644 --- a/Source/UI/Lists/UIComboBox.h +++ b/Source/UI/Lists/UIComboBox.h @@ -9,13 +9,13 @@ class UIComboBox : public UIListBox { public: UIComboBox(); void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; void Configure(int x, int y, int width, int height, unsigned char transparent) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(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 Refresh() override; diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index 2082f3f59..f6c291093 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -46,7 +46,7 @@ UIComboBoxDefWnd::~UIComboBoxDefWnd() = default; // OFFSET: 0x00885920 // FUNCTION: fn_11319 -void UIComboBoxDefWnd::Slot15(int, int) { +void UIComboBoxDefWnd::OnCreate(int, int) { const std::string path = "유저인터페이스\\basic_interface\\"; this->button = new UIBitmapButton(); @@ -122,7 +122,7 @@ void UIComboBoxDefWnd::Paint() { // OFFSET: 0x00890B50 // FUNCTION: fn_11434 -void UIComboBoxDefWnd::Slot31(int, int) { +void UIComboBoxDefWnd::OnLBtnUp(int, int) { this->SendMsg(nullptr, 6, 273, 0, 0, 0); } @@ -263,7 +263,7 @@ UIComboBoxDef2Wnd::~UIComboBoxDef2Wnd() = default; // OFFSET: 0x00885250 // FUNCTION: fn_11318 -void UIComboBoxDef2Wnd::Slot15(int width, int) { +void UIComboBoxDef2Wnd::OnCreate(int width, int) { std::string path = "유저인터페이스\\UIadventurerAgency\\"; if (this->skin == 1) { path = "유저인터페이스\\login_interface\\"; @@ -319,7 +319,7 @@ void UIComboBoxDef2Wnd::Paint() { // OFFSET: 0x00886C30 // FUNCTION: fn_11329 -void UINewComboBoxCtrl::Slot15(int, int) { +void UINewComboBoxCtrl::OnCreate(int, int) { const std::string base = "유저인터페이스\\basic_interface\\txtbox_btn_"; this->button = new UIBitmapButton(); this->button->SetBitmap((base + "a.bmp").c_str(), 0, 0); diff --git a/Source/UI/Lists/UIComboBoxDefWnd.h b/Source/UI/Lists/UIComboBoxDefWnd.h index 8fe9f7e73..a8fd11a2a 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.h +++ b/Source/UI/Lists/UIComboBoxDefWnd.h @@ -11,9 +11,9 @@ class UIComboBoxDefWnd : public UIWindow { public: UIComboBoxDefWnd(); ~UIComboBoxDefWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void AddOption(std::string text, std::uint32_t color); void Select(int index); @@ -49,9 +49,9 @@ public: class UINewComboBoxCtrl : public UIWindow { public: UINewComboBoxCtrl(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot26(int x, int y) override; + void OnLBtnDblClk(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 Clear(); /* 007C */ UIBitmapButton* button; @@ -76,7 +76,7 @@ class UIComboBoxDef2Wnd : public UIComboBoxDefWnd { public: UIComboBoxDef2Wnd(); ~UIComboBoxDef2Wnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; /* 00A8 */ int skin; diff --git a/Source/UI/Lists/UIComboBoxEx.cpp b/Source/UI/Lists/UIComboBoxEx.cpp index f8f0d5617..9e6643770 100644 --- a/Source/UI/Lists/UIComboBoxEx.cpp +++ b/Source/UI/Lists/UIComboBoxEx.cpp @@ -39,14 +39,14 @@ void UIComboBoxEx::Configure(int x, int y, int width, int height, unsigned char this->transparent = value; this->UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x00886060 // FUNCTION: fn_11321 -void UIComboBoxEx::Slot15(int width, int height) { - this->UIListBoxEx::Slot15(width, height); +void UIComboBoxEx::OnCreate(int width, int height) { + this->UIListBoxEx::OnCreate(width, height); } // OFFSET: 0x00897580 @@ -64,17 +64,17 @@ void UIComboBoxEx::Resize(int width, int height) { // OFFSET: 0x00890460 // FUNCTION: fn_11414 -void UIComboBoxEx::Slot25(int, int) { +void UIComboBoxEx::OnLBtnDown(int, int) { } // OFFSET: 0x00890160 // FUNCTION: fn_11401 -void UIComboBoxEx::Slot26(int, int) { +void UIComboBoxEx::OnLBtnDblClk(int, int) { } // OFFSET: 0x008920A0 // FUNCTION: fn_11464 -void UIComboBoxEx::Slot27(int x, int y) { +void UIComboBoxEx::OnMouseMove(int x, int y) { const int previous = this->selected; this->selected = this->LineAt(x, y); @@ -85,7 +85,7 @@ void UIComboBoxEx::Slot27(int x, int y) { // OFFSET: 0x00890B70 // FUNCTION: fn_11435 -void UIComboBoxEx::Slot31(int x, int y) { +void UIComboBoxEx::OnLBtnUp(int x, int y) { this->selected = this->LineAt(x, y); auto& windows = g_windowMgr; @@ -286,15 +286,15 @@ UIComboBoxEx2::~UIComboBoxEx2() = default; // OFFSET: 0x00885EE0 // FUNCTION: fn_11320 -void UIComboBoxEx2::Slot15(int width, int height) { +void UIComboBoxEx2::OnCreate(int width, int height) { auto* vertical = new UIScrollBar_Navi(); this->verticalBar = vertical; const int thickness = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(thickness, height); vertical->Move((width - 7), 0); - vertical->Slot15(thickness, height); - vertical->Slot22(thickness, height); + vertical->OnCreate(thickness, height); + vertical->OnSize(thickness, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar(); @@ -303,8 +303,8 @@ void UIComboBoxEx2::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize((width - 7), horizontalHeight); horizontal->Move(0, (height - 7)); - horizontal->Slot15((width - 7), horizontalHeight); - horizontal->Slot22((width - 7), horizontalHeight); + horizontal->OnCreate((width - 7), horizontalHeight); + horizontal->OnSize((width - 7), horizontalHeight); this->AddChild(this->horizontalBar); this->lineHeight = 18; } diff --git a/Source/UI/Lists/UIComboBoxEx.h b/Source/UI/Lists/UIComboBoxEx.h index daf338d9d..cc6f37a9e 100644 --- a/Source/UI/Lists/UIComboBoxEx.h +++ b/Source/UI/Lists/UIComboBoxEx.h @@ -9,12 +9,12 @@ public: __declspec(noinline) UIComboBoxEx(); ~UIComboBoxEx() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void Configure(int x, int y, int width, int height, unsigned char transparent) override; void Refresh() override; @@ -30,7 +30,7 @@ public: UIComboBoxEx2(); ~UIComboBoxEx2() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; /* 00C4 */ int alignment; diff --git a/Source/UI/Lists/UIComboBoxV2Wnd.h b/Source/UI/Lists/UIComboBoxV2Wnd.h index c02cba58d..1acd74266 100644 --- a/Source/UI/Lists/UIComboBoxV2Wnd.h +++ b/Source/UI/Lists/UIComboBoxV2Wnd.h @@ -11,8 +11,8 @@ class UIComboBoxV2Wnd : public UIWindow { public: UIComboBoxV2Wnd(); void Paint() override; - void Slot31(int x, int y) override; - void Slot35(int value) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; std::string SelectedText(); diff --git a/Source/UI/Lists/UIComboBoxWnd.h b/Source/UI/Lists/UIComboBoxWnd.h index cfbd535b3..bace89005 100644 --- a/Source/UI/Lists/UIComboBoxWnd.h +++ b/Source/UI/Lists/UIComboBoxWnd.h @@ -13,7 +13,7 @@ public: /* 00B8 */ UIWindow* m_owner; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -27,7 +27,7 @@ public: /* 00B8 */ UIWindow* m_owner; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; diff --git a/Source/UI/Lists/UIImgMenu.h b/Source/UI/Lists/UIImgMenu.h index 525313278..03dd2af9c 100644 --- a/Source/UI/Lists/UIImgMenu.h +++ b/Source/UI/Lists/UIImgMenu.h @@ -10,10 +10,10 @@ public: int ItemAt(int x, int y); void Move(int x, int y) override; void Paint() override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(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; diff --git a/Source/UI/Lists/UIItemStoreComboBox.cpp b/Source/UI/Lists/UIItemStoreComboBox.cpp index a25f6ee74..c179855d6 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.cpp +++ b/Source/UI/Lists/UIItemStoreComboBox.cpp @@ -14,7 +14,7 @@ UIItemStoreComboBox::UIItemStoreComboBox() // OFFSET: 0x00886200 // FUNCTION: fn_11325 -void UIItemStoreComboBoxWnd::Slot15(int, int) { +void UIItemStoreComboBoxWnd::OnCreate(int, int) { std::string path = "유저인터페이스\\basic_interface\\"; const char* pressed = this->pink == 1 ? "combo_btn_pink_b" : "combo_btn_b"; const char* disabled = this->pink == 1 ? "combo_btn_pink_c" : "combo_btn_c"; diff --git a/Source/UI/Lists/UIItemStoreComboBox.h b/Source/UI/Lists/UIItemStoreComboBox.h index 5d0dd349f..8b4654eaf 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.h +++ b/Source/UI/Lists/UIItemStoreComboBox.h @@ -7,10 +7,10 @@ class UIItemStoreComboBox : public UIComboBoxEx { public: UIItemStoreComboBox(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; /* 00C4 */ bool pink; }; @@ -18,7 +18,7 @@ public: class UIItemStoreComboBoxWnd : public UIComboBoxDefWnd { public: UIItemStoreComboBoxWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index f40ffdb81..a24dc282e 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -81,8 +81,8 @@ void UIScrollBar::Configure(int x, int y, int length, int vertical, int arrowLen UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x0087B640 @@ -91,21 +91,21 @@ void UIListBox::Configure(int x, int y, int width, int height, unsigned char val this->transparent = value; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x00886840 // FUNCTION: fn_11326 -void UIListBox::Slot15(int width, int height) { +void UIListBox::OnCreate(int width, int height) { auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move((width - 13), 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar(); @@ -114,8 +114,8 @@ void UIListBox::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize((width - 13), horizontalHeight); horizontal->Move(0, (height - 13)); - horizontal->Slot15((width - 13), horizontalHeight); - horizontal->Slot22((width - 13), horizontalHeight); + horizontal->OnCreate((width - 13), horizontalHeight); + horizontal->OnSize((width - 13), horizontalHeight); this->AddChild(this->horizontalBar); } @@ -279,14 +279,14 @@ int UIListBox::LineAt(int x, int y) const { // OFFSET: 0x00890570 // FUNCTION: fn_11418 -void UIListBox::Slot25(int x, int y) { +void UIListBox::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); this->Invalidate(); } // OFFSET: 0x00890180 // FUNCTION: fn_11403 -void UIListBox::Slot26(int, int) { +void UIListBox::OnLBtnDblClk(int, int) { if (this->selected != -1) { this->parent->SendMsg(this, 6, this->geometry.id, this->selected, 0, 0); } @@ -294,12 +294,12 @@ void UIListBox::Slot26(int, int) { // OFFSET: 0x005C72F0 // FUNCTION: fn_03608 -void UIListBox::Slot32(int, int) { +void UIListBox::OnRBtnDown(int, int) { } // OFFSET: 0x00892E60 // FUNCTION: fn_11496 -void UIListBox::Slot35(int value) { +void UIListBox::OnWheel(int value) { if (this->verticalOverflow != 0) { if (value < 0) { this->SendMsg(this->verticalBar, 7, 3, 0, 0, 0); diff --git a/Source/UI/Lists/UIListBox.h b/Source/UI/Lists/UIListBox.h index e2ac5442b..6cada3682 100644 --- a/Source/UI/Lists/UIListBox.h +++ b/Source/UI/Lists/UIListBox.h @@ -16,12 +16,12 @@ public: __declspec(noinline) UIListBox(); ~UIListBox() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; virtual void Configure(int x, int y, int width, int height, unsigned char transparent); @@ -58,7 +58,7 @@ public: class UIServerListBox : public UIListBox { public: UIServerListBox(); - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; /* 00D4 */ std::vector balloonTexts; /* 00E0 */ UIColorTransBalloonText* balloon; diff --git a/Source/UI/Lists/UIListBoxEx.cpp b/Source/UI/Lists/UIListBoxEx.cpp index b6e9ace3e..866c9f0d8 100644 --- a/Source/UI/Lists/UIListBoxEx.cpp +++ b/Source/UI/Lists/UIListBoxEx.cpp @@ -29,21 +29,21 @@ void UIListBoxEx::Configure(int x, int y, int width, int height, unsigned char v this->transparent = value; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x00886990 // FUNCTION: fn_11327 -void UIListBoxEx::Slot15(int width, int height) { +void UIListBoxEx::OnCreate(int width, int height) { auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int thickness = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(thickness, height); vertical->Move((width - 13), 0); - vertical->Slot15(thickness, height); - vertical->Slot22(thickness, height); + vertical->OnCreate(thickness, height); + vertical->OnSize(thickness, height); this->AddChild(vertical); auto* horizontal = new UIScrollBar(); @@ -52,8 +52,8 @@ void UIListBoxEx::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize((width - 13), horizontalHeight); horizontal->Move(0, (height - 13)); - horizontal->Slot15((width - 13), horizontalHeight); - horizontal->Slot22((width - 13), horizontalHeight); + horizontal->OnCreate((width - 13), horizontalHeight); + horizontal->OnSize((width - 13), horizontalHeight); this->AddChild(horizontal); } @@ -122,14 +122,14 @@ void UIListBoxEx::Refresh() { // OFFSET: 0x008905A0 // FUNCTION: fn_11419 -void UIListBoxEx::Slot25(int x, int y) { +void UIListBoxEx::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); this->Invalidate(); } // OFFSET: 0x008901B0 // FUNCTION: fn_11404 -void UIListBoxEx::Slot26(int, int) { +void UIListBoxEx::OnLBtnDblClk(int, int) { if (this->selected != -1) { this->parent->SendMsg(this, 6, this->geometry.id, this->selected, 0, 0); } @@ -137,7 +137,7 @@ void UIListBoxEx::Slot26(int, int) { // OFFSET: 0x00892EA0 // FUNCTION: fn_11497 -void UIListBoxEx::Slot35(int value) { +void UIListBoxEx::OnWheel(int value) { if (this->verticalOverflow != 0) { if (value < 0) { this->SendMsg(this->verticalBar, 7, 3, 0, 0, 0); diff --git a/Source/UI/Lists/UIListBoxEx.h b/Source/UI/Lists/UIListBoxEx.h index 2edb888b2..d2d90ac9b 100644 --- a/Source/UI/Lists/UIListBoxEx.h +++ b/Source/UI/Lists/UIListBoxEx.h @@ -18,11 +18,11 @@ public: UIListBoxEx(); ~UIListBoxEx() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot35(int value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; virtual void Configure(int x, int y, int width, int height, unsigned char transparent); virtual void AddLine(const char* text, std::uint32_t color); diff --git a/Source/UI/Lists/UIListBoxID.cpp b/Source/UI/Lists/UIListBoxID.cpp index d8c35fadb..7795a27e6 100644 --- a/Source/UI/Lists/UIListBoxID.cpp +++ b/Source/UI/Lists/UIListBoxID.cpp @@ -19,8 +19,8 @@ void UIComboBoxID::Configure(int x, int y, int width, int height, unsigned char this->transparent = transparent; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x0087B6E0 @@ -29,21 +29,21 @@ void UIListBoxID::Configure(int x, int y, int width, int height, unsigned char t this->transparent = transparent; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x00886070 // FUNCTION: fn_11322 -void UIComboBoxID::Slot15(int width, int height) { +void UIComboBoxID::OnCreate(int width, int height) { auto* vertical = new UIScrollBar(); this->verticalBar = vertical; const int verticalWidth = vertical->thickness; vertical->vertical = 1; vertical->UIWindow::Resize(verticalWidth, height); vertical->Move(width - 13, 0); - vertical->Slot15(verticalWidth, height); - vertical->Slot22(verticalWidth, height); + vertical->OnCreate(verticalWidth, height); + vertical->OnSize(verticalWidth, height); this->AddChild(this->verticalBar); auto* horizontal = new UIScrollBar(); @@ -52,8 +52,8 @@ void UIComboBoxID::Slot15(int width, int height) { horizontal->vertical = 0; horizontal->UIWindow::Resize(width - 13, horizontalHeight); horizontal->Move(0, height - 13); - horizontal->Slot15(width - 13, horizontalHeight); - horizontal->Slot22(width - 13, horizontalHeight); + horizontal->OnCreate(width - 13, horizontalHeight); + horizontal->OnSize(width - 13, horizontalHeight); this->AddChild(this->horizontalBar); } diff --git a/Source/UI/Lists/UIListBoxID.h b/Source/UI/Lists/UIListBoxID.h index a68d945b7..e9cff7f4c 100644 --- a/Source/UI/Lists/UIListBoxID.h +++ b/Source/UI/Lists/UIListBoxID.h @@ -20,11 +20,11 @@ public: __declspec(noinline) UIListBoxID(); ~UIListBoxID() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot35(int value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; virtual void Configure(int x, int y, int width, int height, unsigned char transparent); virtual void AddLine(const char* text, int id); @@ -59,12 +59,12 @@ class UIComboBoxID : public UIListBoxID { public: UIComboBoxID(); void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; void Configure(int x, int y, int width, int height, unsigned char transparent) 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 Refresh() override; diff --git a/Source/UI/Lists/UIListBoxNavi.h b/Source/UI/Lists/UIListBoxNavi.h index d9750c559..ae9c6821d 100644 --- a/Source/UI/Lists/UIListBoxNavi.h +++ b/Source/UI/Lists/UIListBoxNavi.h @@ -10,7 +10,7 @@ class UIListBoxNavi : public UIListBox { public: UIListBoxNavi(); void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; void AddLine(const char* text) override; void Clear() override; /* 00D4 */ std::uint32_t defaultLineColor; diff --git a/Source/UI/Lists/UIListBoxNaviSearch.h b/Source/UI/Lists/UIListBoxNaviSearch.h index 7ca443ec0..8da43dbb2 100644 --- a/Source/UI/Lists/UIListBoxNaviSearch.h +++ b/Source/UI/Lists/UIListBoxNaviSearch.h @@ -10,11 +10,11 @@ public: UIListBox_NaviSearch(); void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot35(int value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int value) 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 Clear() override; void Refresh() override; diff --git a/Source/UI/Lists/UIListBoxTemplate.h b/Source/UI/Lists/UIListBoxTemplate.h index 763a746f7..13a278a4e 100644 --- a/Source/UI/Lists/UIListBoxTemplate.h +++ b/Source/UI/Lists/UIListBoxTemplate.h @@ -18,10 +18,10 @@ public: __declspec(noinline) CUIListItem(); ~CUIListItem() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; - void Slot47() override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnMouseEnter() override; void Paint() override; virtual void SetSelected(bool selected); virtual void SetHighlighted(bool highlighted); @@ -49,8 +49,8 @@ class CUIPage; class CUISubTab : public CUIListItem { public: CUISubTab(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; /* 00E8 */ CUIStaticText* unknown_00E8; /* 00EC */ CUIStaticImage* unknown_00EC; @@ -61,8 +61,8 @@ public: class CUITab : public CUIListItem { public: CUITab(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void SetSelected(bool selected) override; void OnSelectSubTab(CUISubTab* subTab); @@ -79,9 +79,9 @@ public: class CUIItemInfo : public CUIListItem { public: CUIItemInfo(); - void Slot15(int width, int height) override; - void Slot16() override; - void Slot32(int x, int y) override; + void OnCreate(int width, int height) override; + void OnInit() override; + void OnRBtnDown(int x, int y) override; void SetDescription(int type, const std::vector& description); @@ -104,8 +104,8 @@ public: class CUIMonsterInfo : public CUIListItem { public: CUIMonsterInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; void SetMonster(const std::string& title); @@ -119,8 +119,8 @@ public: class CUIQuestInfo : public CUIListItem { public: CUIQuestInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void SetTitle(int id); void SetTip(int id); void SetStatusLines(bool first, bool second, bool third); @@ -137,8 +137,8 @@ public: class CUITabInfo : public CUIListItem { public: CUITabInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; /* 00E8 */ CUIStaticText* unknown_00E8; /* 00EC */ CUIStaticText* unknown_00EC; @@ -193,7 +193,7 @@ public: } ~CUIListBox() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; // OFFSET: 0x009D23B0 // FUNCTION: fn_14011 // OFFSET: 0x009D23C0 @@ -206,11 +206,11 @@ public: // FUNCTION: fn_14017 // OFFSET: 0x009D2450 // FUNCTION: fn_14018 - void Slot35(int value) override { + void OnWheel(int value) override { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -244,7 +244,7 @@ public: this->scrollBar->SetPosition(this->scrollBar->position); } - void Slot53(int resolveSkin) override; + void LoadSkin(int resolveSkin) override; void SelectItem(CUIListItem* item); T* CreateItem(); @@ -260,7 +260,7 @@ public: this->imageNames[1] = hover; this->imageNames[2] = pressed; this->disabledName = disabled; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -290,7 +290,7 @@ template class CUIListBoxEx : public CUIControl { public: CUIListBoxEx(); ~CUIListBoxEx() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; // OFFSET: 0x00A01E70 // FUNCTION: fn_14832 // OFFSET: 0x00A01E80 @@ -311,11 +311,11 @@ public: // FUNCTION: fn_15038 // OFFSET: 0x00A638A0 // FUNCTION: fn_16438 - void Slot35(int value) override { + void OnWheel(int value) override { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -341,7 +341,7 @@ public: void Resize(int width, int height) override { UIWindow::Resize(width, height); } - void Slot53(int resolveSkin) override { + void LoadSkin(int resolveSkin) override { (void)resolveSkin; } @@ -384,7 +384,7 @@ public: this->imageNames[1] = hover; this->imageNames[2] = pressed; this->disabledName = disabled; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } diff --git a/Source/UI/Lists/UIMemberListBox.h b/Source/UI/Lists/UIMemberListBox.h index 4dfeb2f80..05a392988 100644 --- a/Source/UI/Lists/UIMemberListBox.h +++ b/Source/UI/Lists/UIMemberListBox.h @@ -6,11 +6,11 @@ class UIChatHisBox2 : public UIChatHisBox { public: UIChatHisBox2(); - bool Slot08() override; + bool IsTransmitMouseInput() override; void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Configure(int x, int y, int width, int height, unsigned char transparent) override; - void Slot33(int x, int y) override; + void OnRBtnUp(int x, int y) override; /* 0124 */ int backgroundRed; /* 0128 */ int backgroundGreen; @@ -21,7 +21,7 @@ class UIChatHisBox3 : public UIChatHisBox2 { public: UIChatHisBox3(); void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Resize(int width, int height) override; virtual void AddText(const char* text, int color); @@ -33,10 +33,10 @@ class UIMemberListBox : public UIChatHisBox2 { public: UIMemberListBox(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; }; #endif diff --git a/Source/UI/Lists/UIPackageBoxNameList.h b/Source/UI/Lists/UIPackageBoxNameList.h index 3190f1941..ce55f5b69 100644 --- a/Source/UI/Lists/UIPackageBoxNameList.h +++ b/Source/UI/Lists/UIPackageBoxNameList.h @@ -6,7 +6,7 @@ class UIPackageBoxNameList : public UIListBox { public: UIPackageBoxNameList(); - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; }; #endif diff --git a/Source/UI/Lists/UIReplayListBox.h b/Source/UI/Lists/UIReplayListBox.h index 954e94d9c..796bac4e5 100644 --- a/Source/UI/Lists/UIReplayListBox.h +++ b/Source/UI/Lists/UIReplayListBox.h @@ -9,7 +9,7 @@ public: UIReplayListBox() : UIListBox() { } - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; }; #endif diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index 88989ff28..4698748d7 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -118,7 +118,7 @@ void UIScrollBar::Resize(int width, int height) { case 0: height = this->thickness; UIWindow::Resize(width, height); - this->Slot22(width, height); + this->OnSize(width, height); break; case 1: width = this->thickness; @@ -126,14 +126,14 @@ void UIScrollBar::Resize(int width, int height) { } UIWindow::Resize(width, height); - this->Slot22(width, height); + this->OnSize(width, height); } // OFFSET: 0x00882430 // FUNCTION: fn_11303 -bool UIScrollBar::Slot08() { +bool UIScrollBar::IsTransmitMouseInput() { if (this->maximum == 0 && this->parent) { - return this->parent->Slot08(); + return this->parent->IsTransmitMouseInput(); } return false; } @@ -233,9 +233,9 @@ int UIScrollBar::Part(int x, int y) { // OFFSET: 0x00890720 // FUNCTION: fn_11425 -void UIScrollBar::Slot25(int x, int y) { +void UIScrollBar::OnLBtnDown(int x, int y) { if (this->maximum == 0) { - this->parent->Slot25((x + this->geometry.x), (y + this->geometry.y)); + this->parent->OnLBtnDown((x + this->geometry.x), (y + this->geometry.y)); return; } @@ -295,19 +295,19 @@ void UIScrollBar::Slot25(int x, int y) { // OFFSET: 0x00890260 // FUNCTION: fn_11407 -void UIScrollBar::Slot26(int x, int y) { - this->Slot25(x, y); +void UIScrollBar::OnLBtnDblClk(int x, int y) { + this->OnLBtnDown(x, y); if (this->maximum == 0) { - this->parent->Slot26((x + this->geometry.x), (y + this->geometry.y)); + this->parent->OnLBtnDblClk((x + this->geometry.x), (y + this->geometry.y)); } } // OFFSET: 0x008921D0 // FUNCTION: fn_11468 -void UIScrollBar::Slot27(int x, int y) { +void UIScrollBar::OnMouseMove(int x, int y) { if (this->maximum == 0) { - this->parent->Slot27((x + this->geometry.x), (y + this->geometry.y)); + this->parent->OnMouseMove((x + this->geometry.x), (y + this->geometry.y)); return; } @@ -374,9 +374,9 @@ void UIScrollBar::ResetCursor(int x, int y) { // OFFSET: 0x00890E90 // FUNCTION: fn_11440 -void UIScrollBar::Slot31(int x, int y) { +void UIScrollBar::OnLBtnUp(int x, int y) { if (this->maximum == 0) { - this->parent->Slot31(this->geometry.x + x, this->geometry.y + y); + this->parent->OnLBtnUp(this->geometry.x + x, this->geometry.y + y); } else if (g_windowMgr.Capture() == this) { g_windowMgr.ReleaseCapture(); } @@ -384,16 +384,16 @@ void UIScrollBar::Slot31(int x, int y) { // OFFSET: 0x00892C70 // FUNCTION: fn_11491 -void UIScrollBar::Slot33(int x, int y) { +void UIScrollBar::OnRBtnUp(int x, int y) { if (this->maximum == 0) { - this->parent->Slot33((x + this->geometry.x), (y + this->geometry.y)); + this->parent->OnRBtnUp((x + this->geometry.x), (y + this->geometry.y)); } } // OFFSET: 0x00892F20 // FUNCTION: fn_11499 -void UIScrollBar::Slot35(int value) { - this->parent->Slot35(value); +void UIScrollBar::OnWheel(int value) { + this->parent->OnWheel(value); } // OFFSET: 0x0088E310 @@ -493,8 +493,8 @@ void UIScrollBar::Configure(int x, int y, unsigned char vertical, int length) { this->UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x00880800 @@ -680,7 +680,7 @@ const char* UIChatHisBox::HistoryText(unsigned int index) { // OFFSET: 0x00882420 // FUNCTION: fn_11302 -bool UIChatHisBox::Slot08() { +bool UIChatHisBox::IsTransmitMouseInput() { return true; } @@ -845,7 +845,7 @@ void UIBasicItemCtrl::DrawItemIcon(int x, int y, int, bool compact) { // OFFSET: 0x008900D0 // FUNCTION: fn_11399 -void UIChatHisBox::Slot26(int, int) { +void UIChatHisBox::OnLBtnDblClk(int, int) { const unsigned int index = static_cast(this->selected); if (index != static_cast(-1) && index < this->history.size() && this->history[index].size() > 0 && this->history[index].c_str() != nullptr) { @@ -855,13 +855,13 @@ void UIChatHisBox::Slot26(int, int) { // OFFSET: 0x00890430 // FUNCTION: fn_11412 -void UIChatHisBox::Slot25(int x, int y) { +void UIChatHisBox::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); } // OFFSET: 0x00890AB0 // FUNCTION: fn_11432 -void UIChatHisBox::Slot31(int, int) { +void UIChatHisBox::OnLBtnUp(int, int) { } // OFFSET: 0x008973E0 @@ -938,7 +938,7 @@ void UIScrollBar::SetRange(int maximum, int visible, int total) { // OFFSET: 0x0087DF00 // FUNCTION: fn_11261 -void UIBasicItemCtrl::Slot10(int, int, std::intptr_t argument3) { +void UIBasicItemCtrl::DragAndDrop(int, int, std::intptr_t argument3) { const ModeDragState* drag = reinterpret_cast(argument3); if (!drag->skill && drag->identified == this->m_identified) { this->m_item = LookupClientItemByIdentity(g_session.m_inventoryItems, drag->id); @@ -961,7 +961,7 @@ void UIBasicItemCtrl::Slot10(int, int, std::intptr_t argument3) { // OFFSET: 0x0087E080 // FUNCTION: fn_11262 -void UIBasicSkillCtrl::Slot10(int, int, std::intptr_t argument3) { +void UIBasicSkillCtrl::DragAndDrop(int, int, std::intptr_t argument3) { const ModeDragState* drag = reinterpret_cast(argument3); if (drag->skill) { std::string name = drag->skillName; @@ -982,19 +982,19 @@ void UIBasicSkillCtrl::Slot10(int, int, std::intptr_t argument3) { // OFFSET: 0x0087E190 // FUNCTION: fn_11263 -void UIBitmapButton2::Slot10(int argument1, int argument2, std::intptr_t argument3) { +void UIBitmapButton2::DragAndDrop(int argument1, int argument2, std::intptr_t argument3) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(argument1, argument2, argument3); + UIWindow::DragAndDrop(argument1, argument2, argument3); } else if (this->parent) { - this->parent->Slot10(argument1, argument2, argument3); + this->parent->DragAndDrop(argument1, argument2, argument3); } } // OFFSET: 0x0087E1D0 // FUNCTION: fn_11264 -void UITabControl::Slot10(int argument1, int argument2, std::intptr_t argument3) { +void UITabControl::DragAndDrop(int argument1, int argument2, std::intptr_t argument3) { if (this->parent) { - this->parent->Slot10(argument1, argument2, argument3); + this->parent->DragAndDrop(argument1, argument2, argument3); } } @@ -1774,7 +1774,7 @@ void UITabControl::Configure( std::uint32_t inactiveFillColor, std::uint32_t activeBorderColor, std::uint32_t inactiveBorderColor, std::uint32_t activeTextColor, std::uint32_t inactiveTextColor ) { - this->Slot15(0, 0); + this->OnCreate(0, 0); this->layout = layout; this->tabHeight = tabHeight; diff --git a/Source/UI/Lists/UIScrollBar.h b/Source/UI/Lists/UIScrollBar.h index 78cd853bc..ad405b6b9 100644 --- a/Source/UI/Lists/UIScrollBar.h +++ b/Source/UI/Lists/UIScrollBar.h @@ -8,15 +8,15 @@ public: UIScrollBar(); ~UIScrollBar() override; void Resize(int width, int height) override; - bool Slot08() override; + bool IsTransmitMouseInput() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int value) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int value) override; virtual int ThumbLength(); int ThumbOffset(); int Position(); diff --git a/Source/UI/Lists/UITabControl.h b/Source/UI/Lists/UITabControl.h index 716016a08..0e2b2926e 100644 --- a/Source/UI/Lists/UITabControl.h +++ b/Source/UI/Lists/UITabControl.h @@ -32,12 +32,12 @@ public: ); int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; void Paint() override; - void Slot10(int argument1, int argument2, std::intptr_t argument3) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; + void DragAndDrop(int argument1, int argument2, std::intptr_t argument3) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; /* 007C */ int unknown_007C; /* 0080 */ int layout; diff --git a/Source/UI/Lists/UITagListBox.cpp b/Source/UI/Lists/UITagListBox.cpp index a083dd42b..f45f976ce 100644 --- a/Source/UI/Lists/UITagListBox.cpp +++ b/Source/UI/Lists/UITagListBox.cpp @@ -42,7 +42,7 @@ void UITagListBox::Clear() { // OFFSET: 0x009B9E80 // FUNCTION: fn_13879 -void UITagListBox::Slot25(int, int) { +void UITagListBox::OnLBtnDown(int, int) { } // OFFSET: 0x009B9CB0 @@ -103,12 +103,12 @@ void UITagListBox::Paint() { // OFFSET: 0x009B9E70 // FUNCTION: fn_13878 -void UITagListBox::Slot26(int, int) { +void UITagListBox::OnLBtnDblClk(int, int) { } // OFFSET: 0x009B9E90 // FUNCTION: fn_13880 -void UITagListBox::Slot31(int, int) { +void UITagListBox::OnLBtnUp(int, int) { } // OFFSET: 0x009B8210 diff --git a/Source/UI/Lists/UITagListBox.h b/Source/UI/Lists/UITagListBox.h index 42297e15a..0ee86c985 100644 --- a/Source/UI/Lists/UITagListBox.h +++ b/Source/UI/Lists/UITagListBox.h @@ -26,9 +26,9 @@ public: void AddLine(const char* text) override; void Clear() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnLBtnUp(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 AppendText(std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4); diff --git a/Source/UI/Lists/UIThumb.h b/Source/UI/Lists/UIThumb.h index ee81303f7..12e858ba2 100644 --- a/Source/UI/Lists/UIThumb.h +++ b/Source/UI/Lists/UIThumb.h @@ -12,8 +12,8 @@ public: CUIThumb(); ~CUIThumb() override; void ResetCursor(int x, int y) override; - void Slot28(int x, int y) override; - void Slot53(int resolveSkin) override; + void OnMouseHover(int x, int y) override; + void LoadSkin(int resolveSkin) override; __declspec(noinline) void SetImages(const std::string& top, const std::string& middle, const std::string& bottom); void SetImage(const std::string& name); @@ -36,18 +36,18 @@ class CUIVThumb : public CUIThumb { public: CUIVThumb(); void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; }; class CUIHThumb : public CUIVThumb { public: CUIHThumb(); void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Lists/UITreeView.h b/Source/UI/Lists/UITreeView.h index 6dc5f4aa4..b6612ddab 100644 --- a/Source/UI/Lists/UITreeView.h +++ b/Source/UI/Lists/UITreeView.h @@ -37,14 +37,14 @@ class UITreeView : public UIWindow { public: UITreeView(); void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int value) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - virtual void Slot53(); + virtual void UpdateScrollBar(); void HideNodes(std::list& nodes); bool DeleteChildNodes(UITreeNode* node); diff --git a/Source/UI/Lists/UIVScrollBar.h b/Source/UI/Lists/UIVScrollBar.h index 46c61be78..fe56386d5 100644 --- a/Source/UI/Lists/UIVScrollBar.h +++ b/Source/UI/Lists/UIVScrollBar.h @@ -14,13 +14,13 @@ public: ~CUIVScrollBar() override; void Resize(int width, int height) override; void Show(int visible) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot35(int value) override; - void Slot53(int resolveSkin) override; - virtual void Slot54(); - virtual void Slot55(int value); + void OnLBtnDown(int x, int y) override; + void OnWheel(int value) override; + void LoadSkin(int resolveSkin) override; + virtual void UpdateThumb(); + virtual void ScrollBy(int value); __declspec(noinline) void SetTotal(int value); __declspec(noinline) void SetVisible(int value); @@ -60,11 +60,11 @@ class CUIHScrollBar : public CUIVScrollBar { public: CUIHScrollBar(); void Resize(int width, int height) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot35(int value) override; - void Slot54() override; + void OnLBtnDown(int x, int y) override; + void OnWheel(int value) override; + void UpdateThumb() override; void SetButtonImages(const std::string& left, const std::string& right); void SetThumbImages(const std::string& top, const std::string& middle, const std::string& bottom); diff --git a/Source/UI/Menu/UIMenuIconWnd.cpp b/Source/UI/Menu/UIMenuIconWnd.cpp index a5c0f0bf4..14c3e3c72 100644 --- a/Source/UI/Menu/UIMenuIconWnd.cpp +++ b/Source/UI/Menu/UIMenuIconWnd.cpp @@ -92,7 +92,7 @@ UIWindow* UIMenuIconWnd::HitTest(int x, int y) { // OFFSET: 0x0084A960 // FUNCTION: fn_10614 -bool UIMenuIconWnd::Slot08() { +bool UIMenuIconWnd::IsTransmitMouseInput() { return true; } @@ -106,7 +106,7 @@ void UIMenuIconWnd::Move(int x, int y) { // OFFSET: 0x0084A9A0 // FUNCTION: fn_10616 -void UIMenuIconWnd::Slot15(int width, int height) { +void UIMenuIconWnd::OnCreate(int width, int height) { const int ids[24] = {192, 195, 194, 196, 379, 199, 373, 376, 361, 219, 430, 193, 461, 399, 476, 473, 511, 512, 370, 540, 544, 567, 581, 587}; std::string names[24] = { "status", "equip", "item", "skill", "booking", "party", "guild", "battle", "quest", "map", "navigation", "option", @@ -229,15 +229,15 @@ void UIMenuIconWnd::Paint() { // OFFSET: 0x0084BD20 // FUNCTION: fn_10618 -void UIMenuIconWnd::Slot25(int x, int y) {} +void UIMenuIconWnd::OnLBtnDown(int x, int y) {} // OFFSET: 0x0084BD30 // FUNCTION: fn_10619 -void UIMenuIconWnd::Slot31(int x, int y) {} +void UIMenuIconWnd::OnLBtnUp(int x, int y) {} // OFFSET: 0x0084BD40 // FUNCTION: fn_10620 -void UIMenuIcon::Slot27(int x, int y) { +void UIMenuIcon::OnMouseMove(int x, int y) { int behaviorId = 10041; int message = 4698; bool known = true; @@ -355,7 +355,7 @@ void UIMenuIcon::Slot27(int x, int y) { // OFFSET: 0x0084C250 // FUNCTION: fn_10621 -void UIMenuIconWnd::Slot27(int x, int y) {} +void UIMenuIconWnd::OnMouseMove(int x, int y) {} // OFFSET: 0x0084C260 // FUNCTION: fn_10622 diff --git a/Source/UI/Menu/UIMenuIconWnd.h b/Source/UI/Menu/UIMenuIconWnd.h index a522fcc38..7a4a975a2 100644 --- a/Source/UI/Menu/UIMenuIconWnd.h +++ b/Source/UI/Menu/UIMenuIconWnd.h @@ -11,7 +11,7 @@ class UIMenuIcon : public UIBitmapButton { public: UIMenuIcon(); - void Slot27(int x, int y) override; + void OnMouseMove(int x, int y) override; }; class UIMenuIconWnd : public UIFrameWnd { @@ -26,12 +26,12 @@ public: /* 00D4 */ UIBitmapButton* unknown_00D4; void Move(int x, int y) override; - bool Slot08() override; - void Slot15(int width, int height) override; + bool IsTransmitMouseInput() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; UIWindow* HitTest(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; diff --git a/Source/UI/Navigation/UINavigationV4Wnd.h b/Source/UI/Navigation/UINavigationV4Wnd.h index db6d915b7..942af5248 100644 --- a/Source/UI/Navigation/UINavigationV4Wnd.h +++ b/Source/UI/Navigation/UINavigationV4Wnd.h @@ -25,11 +25,11 @@ struct NavigationWindowInfo { class UINavigationV4Wnd : public UIFrameWnd { public: UINavigationV4Wnd(); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot31(int x, int y) override; + void OnLBtnUp(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; bool ClearRouteTexts(); void LayoutWithoutDetails(); @@ -81,9 +81,9 @@ class UIStaticBitmap; class UINavigationroadiconWnd : public UIFrameWnd { public: UINavigationroadiconWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00B4 */ UIStaticBitmap* icon; @@ -92,7 +92,7 @@ public: class UINavigationRuideWnd : public UIFrameWnd { public: UINavigationRuideWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void RefreshRoute(); diff --git a/Source/UI/Navigation/UIPrivateAirplaneWnd.h b/Source/UI/Navigation/UIPrivateAirplaneWnd.h index 50b363fe9..0a112c2c2 100644 --- a/Source/UI/Navigation/UIPrivateAirplaneWnd.h +++ b/Source/UI/Navigation/UIPrivateAirplaneWnd.h @@ -12,8 +12,8 @@ class UIPrivateAirplaneWnd : public UIFrameWnd { public: // INLINED UIPrivateAirplaneWnd() : UIFrameWnd(0) {} - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index a885649f1..a3be38359 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -46,7 +46,7 @@ UIAdvenPartyBoardWnd::~UIAdvenPartyBoardWnd() = default; // OFFSET: 0x007C23C0 // FUNCTION: fn_09324 -void UIAdvenPartyBoardWnd::Slot11() { +void UIAdvenPartyBoardWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -57,7 +57,7 @@ void UIAdvenPartyBoardWnd::Slot11() { // OFFSET: 0x007BC220 // FUNCTION: fn_09298 -void UIAdvenPartyBoardWnd::Slot15(int, int) { +void UIAdvenPartyBoardWnd::OnCreate(int, int) { const int level = g_session.m_level; this->minimum = new UIEditCtrl2(); this->minimum->SetSize(25, 14); diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.h b/Source/UI/Party/UIAdvenPartyBoardWnd.h index 4993b519a..2803d71d3 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.h +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.h @@ -27,8 +27,8 @@ class UIAdvenPartyBoardWnd : public UIFrameWnd { public: UIAdvenPartyBoardWnd(); ~UIAdvenPartyBoardWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void LoadPage(int page); diff --git a/Source/UI/Party/UIApplyForPartyWnd.cpp b/Source/UI/Party/UIApplyForPartyWnd.cpp index 0f2353f6b..b3acb4bd1 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.cpp +++ b/Source/UI/Party/UIApplyForPartyWnd.cpp @@ -33,7 +33,7 @@ UIApplyForPartyWnd::~UIApplyForPartyWnd() = default; // OFFSET: 0x007C2400 // FUNCTION: fn_09325 -void UIApplyForPartyWnd::Slot11() { +void UIApplyForPartyWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -44,7 +44,7 @@ void UIApplyForPartyWnd::Slot11() { // OFFSET: 0x007BD970 // FUNCTION: fn_09299 -void UIApplyForPartyWnd::Slot15(int, int) { +void UIApplyForPartyWnd::OnCreate(int, int) { UIBasicButton* button = new UIBasicButton(); button->Configure(this->TextWidth(LookupMessage(3374), 0, 0, 12, 0, 0) + 10, LookupMessage(3374)); button->Move(51, 165); @@ -116,7 +116,7 @@ void UIApplyForPartyWnd::Paint() { // OFFSET: 0x007BFCC0 // FUNCTION: fn_09309 -void UIApplyForPartyWnd::Slot28(int x, int y) { +void UIApplyForPartyWnd::OnMouseHover(int x, int y) { if (static_cast(y) - 95u > 16u) { return; } diff --git a/Source/UI/Party/UIApplyForPartyWnd.h b/Source/UI/Party/UIApplyForPartyWnd.h index 9718ba13f..1f0cabba4 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.h +++ b/Source/UI/Party/UIApplyForPartyWnd.h @@ -9,10 +9,10 @@ class UIApplyForPartyWnd : public UIFrameWnd { public: UIApplyForPartyWnd(); ~UIApplyForPartyWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetInfo(CAdvenPartyInfo value); diff --git a/Source/UI/Party/UIMiniPartyWnd.cpp b/Source/UI/Party/UIMiniPartyWnd.cpp index 7cb649685..e3cd2bc0c 100644 --- a/Source/UI/Party/UIMiniPartyWnd.cpp +++ b/Source/UI/Party/UIMiniPartyWnd.cpp @@ -46,7 +46,7 @@ void UIMiniPartyWnd::Move(int x, int y) { // OFFSET: 0x00742AC0 // FUNCTION: fn_07740 -void UIMiniPartyWnd::Slot15(int, int) { +void UIMiniPartyWnd::OnCreate(int, int) { UIMiniPartyInfoWnd* info = new UIMiniPartyInfoWnd(); this->m_infoWnd = info; info->m_owner = this; @@ -71,7 +71,7 @@ void UIMiniPartyWnd::Paint() { // OFFSET: 0x00742D80 // FUNCTION: fn_07742 -void UIMiniPartyWnd::Slot25(int x, int y) { +void UIMiniPartyWnd::OnLBtnDown(int x, int y) { if (g_windowMgr.lastWindowId != this->geometry.id) { g_windowMgr.BringToFront(this->geometry.id); g_windowMgr.lastWindowId = this->geometry.id; @@ -91,9 +91,9 @@ void UIMiniPartyWnd::Slot25(int x, int y) { // OFFSET: 0x00740B80 // FUNCTION: fn_07731 -void UIMiniPartyInfoWnd::Slot25(int x, int y) { +void UIMiniPartyInfoWnd::OnLBtnDown(int x, int y) { if (!g_session.m_lockMouse) { - this->m_owner->Slot25(x, y); + this->m_owner->OnLBtnDown(x, y); } if (this->m_owner->GetMember().valid && this->m_owner->GetMember().offline == 0) { @@ -106,15 +106,15 @@ void UIMiniPartyInfoWnd::Slot25(int x, int y) { // OFFSET: 0x00740D10 // FUNCTION: fn_07732 -void UIMiniPartyInfoWnd::Slot31(int x, int y) { +void UIMiniPartyInfoWnd::OnLBtnUp(int x, int y) { if (g_session.m_lockMouse != true && this == g_windowMgr.Capture()) { - this->m_owner->Slot31(x, y); + this->m_owner->OnLBtnUp(x, y); } } // OFFSET: 0x00740D40 // FUNCTION: fn_07733 -void UIMiniPartyInfoWnd::Slot28(int, int) { +void UIMiniPartyInfoWnd::OnMouseHover(int, int) { CMode* mode = g_modeMgr.GetGameMode(); if (!mode) { return; @@ -146,7 +146,7 @@ void UIMiniPartyInfoWnd::Slot28(int, int) { // OFFSET: 0x00741280 // FUNCTION: fn_07734 -void UIMiniPartyInfoWnd::Slot33(int, int) { +void UIMiniPartyInfoWnd::OnRBtnUp(int, int) { if (!g_session.m_lockMouse) { this->SendMsg(nullptr, 0x31, 0, 0, 0, 0); } @@ -399,7 +399,7 @@ int UIMiniPartyInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t arg // OFFSET: 0x00742E10 // FUNCTION: fn_07743 -void UIMiniPartyWnd::Slot31(int x, int y) { +void UIMiniPartyWnd::OnLBtnUp(int x, int y) { const int cell = reinterpret_cast(CMiniPartyWndAreaMgr::Instance())->FindCell(this->geometry.x, this->geometry.y); if (cell != -1) { UIMiniPartyWnd* other = static_cast(g_windowMgr.FindSnapExcludedWindow(cell)); @@ -419,7 +419,7 @@ void UIMiniPartyWnd::Slot31(int x, int y) { } } - UIFrameWnd::Slot31(x, y); + UIFrameWnd::OnLBtnUp(x, y); g_windowMgr.ArrangeMiniPartyWindows(); } diff --git a/Source/UI/Party/UIMiniPartyWnd.h b/Source/UI/Party/UIMiniPartyWnd.h index bcbff0427..9605e2841 100644 --- a/Source/UI/Party/UIMiniPartyWnd.h +++ b/Source/UI/Party/UIMiniPartyWnd.h @@ -20,12 +20,12 @@ struct MiniPartyInfoEntry { class UIMiniPartyInfoWnd : public UIFrameWnd { public: UIMiniPartyInfoWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(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; /* 00B4 */ std::vector m_entries; @@ -36,11 +36,11 @@ public: class UIMiniPartyWnd : public UIFrameWnd { public: UIMiniPartyWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Move(int x, int y) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(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; MessengerMember GetMember(); diff --git a/Source/UI/Party/UIPartyInfoWnd.cpp b/Source/UI/Party/UIPartyInfoWnd.cpp index 07ce5ca96..5933ba48e 100644 --- a/Source/UI/Party/UIPartyInfoWnd.cpp +++ b/Source/UI/Party/UIPartyInfoWnd.cpp @@ -125,15 +125,15 @@ void UIPartyInfoWnd::Paint() { // OFFSET: 0x007BFCA0 // FUNCTION: fn_09308 -void UIPartyInfoWnd::Slot31(int x, int y) { +void UIPartyInfoWnd::OnLBtnUp(int x, int y) { if (this->m_disabled == 0) { - this->UIButton::Slot31(x, y); + this->UIButton::OnLBtnUp(x, y); } } // OFFSET: 0x007BFE90 // FUNCTION: fn_09310 -void UIPartyInfoWnd::Slot33(int, int) { +void UIPartyInfoWnd::OnRBtnUp(int, int) { if (this->m_disabled != 0 || this->info.accountId == g_session.m_aid || this->info.characterId == g_session.m_gid) { return; } diff --git a/Source/UI/Party/UIPartyInfoWnd.h b/Source/UI/Party/UIPartyInfoWnd.h index d4370e652..2a280159b 100644 --- a/Source/UI/Party/UIPartyInfoWnd.h +++ b/Source/UI/Party/UIPartyInfoWnd.h @@ -9,8 +9,8 @@ public: UIPartyInfoWnd(); ~UIPartyInfoWnd() override; void Paint() override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; void SetInfo(const CAdvenPartyInfo& value); void Reset(); CAdvenPartyInfo* Info(); diff --git a/Source/UI/Party/UIPartySettingWnd.h b/Source/UI/Party/UIPartySettingWnd.h index 196aa112b..d1b81b328 100644 --- a/Source/UI/Party/UIPartySettingWnd.h +++ b/Source/UI/Party/UIPartySettingWnd.h @@ -10,7 +10,7 @@ struct WindowPlacement; class UIPartySettingWnd : public UIFrameWnd { public: UIPartySettingWnd(); - void Slot11() override; + void StoreInfo() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00B4 */ UIRadioBtn* m_expShareButtons[2]; /* 00BC */ int m_expShare; @@ -22,9 +22,9 @@ public: /* 00D8 */ UIEditCtrl* m_nameEdit; /* 00DC */ int m_mode; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; }; class UIPartyInvitationToWnd : public UIPartySettingWnd { @@ -33,7 +33,7 @@ public: void Paint() 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 Slot15(int width, int height) override; + void OnCreate(int width, int height) override; /* 00E0 */ UIEditCtrl* m_edit; }; diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index 7a56d19a6..affb2516e 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -44,7 +44,7 @@ UIRegisterPartyWnd::~UIRegisterPartyWnd() = default; // OFFSET: 0x007C2440 // FUNCTION: fn_09326 -void UIRegisterPartyWnd::Slot11() { +void UIRegisterPartyWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -55,7 +55,7 @@ void UIRegisterPartyWnd::Slot11() { // OFFSET: 0x007BDD10 // FUNCTION: fn_09300 -void UIRegisterPartyWnd::Slot15(int, int) { +void UIRegisterPartyWnd::OnCreate(int, int) { auto* title = new UIStaticText(); title->SetSize(40, 15); title->Move(10, 23); diff --git a/Source/UI/Party/UIRegisterPartyWnd.h b/Source/UI/Party/UIRegisterPartyWnd.h index 31a56faf2..804e547b1 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.h +++ b/Source/UI/Party/UIRegisterPartyWnd.h @@ -15,8 +15,8 @@ class UIRegisterPartyWnd : public UIFrameWnd { public: UIRegisterPartyWnd(); ~UIRegisterPartyWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetInfo(CAdvenPartyInfo value); diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp index dae739792..e2318a039 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp +++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp @@ -30,7 +30,7 @@ UIRequestJoinPartyWnd::~UIRequestJoinPartyWnd() = default; // OFFSET: 0x007BEFD0 // FUNCTION: fn_09301 -void UIRequestJoinPartyWnd::Slot15(int, int) { +void UIRequestJoinPartyWnd::OnCreate(int, int) { this->icon = new UIBitmapButton(); this->icon->SetSize(25, 25); diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.h b/Source/UI/Party/UIRequestJoinPartyWnd.h index d5bb3f739..e17c863ba 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.h +++ b/Source/UI/Party/UIRequestJoinPartyWnd.h @@ -16,7 +16,7 @@ class UIRequestJoinPartyWnd : public UIFrameWnd { public: UIRequestJoinPartyWnd(); ~UIRequestJoinPartyWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp index b5886568e..4acd10b93 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.cpp +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.cpp @@ -135,7 +135,7 @@ template <> void CUIListBoxEx::AddNewItem(); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> void CUIListBoxEx::Resize(int width, int height); @@ -200,18 +200,18 @@ void CUIListBoxEx::Clear // OFFSET: 0x00A487D0 // FUNCTION: fn_16116 -void CUIProbabilityTable::Slot53() { +void CUIProbabilityTable::Initialize() { this->unknown_00B4 = 0; this->Resize(345, 455); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A48860 // FUNCTION: fn_16117 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->onChange = [this](int position) { this->OnScroll(position); }; @@ -227,7 +227,7 @@ CUIItem::CUIItem() : CUIListItem(), nameText(nullptr), probabilityText(nullptr), // OFFSET: 0x00A48A70 // FUNCTION: fn_16118 -void CUIItem::Slot15(int width, int height) { +void CUIItem::OnCreate(int width, int height) { this->nameText = new CUITextViewer(); this->nameText->SetSize(231, 29); this->nameText->Move(1, 0); @@ -315,7 +315,7 @@ void CUIListBoxEx::AddNe // OFFSET: 0x00A4C2F0 // FUNCTION: fn_16123 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -349,11 +349,11 @@ void CUIListBoxEx::Paint // OFFSET: 0x00A4C000 // FUNCTION: fn_16121 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -528,7 +528,7 @@ void CUIProbabilityTable::Search() { // OFFSET: 0x00A4E280 // FUNCTION: fn_16203 -void CUIProbabilityTable::Slot16() { +void CUIProbabilityTable::OnInit() { UIWindow* anchor = g_windowMgr.LookupWindow(12); if (anchor) { this->Move(anchor->geometry.x + anchor->geometry.width, anchor->geometry.y); @@ -559,7 +559,7 @@ void CUIProbabilityTable::BindItem(ProbabilityTable::CUIItem* item, const Probab // OFFSET: 0x00A493D0 // FUNCTION: fn_16119 -void CUIProbabilityTable::Slot15(int width, int height) { +void CUIProbabilityTable::OnCreate(int width, int height) { this->m_titleBar = new CUITitleBar(); this->m_titleBar->SetSize(345, 17); this->m_titleBar->Move(0, 0); @@ -820,14 +820,14 @@ namespace ProbabilityTable { // OFFSET: 0x00A4E250 // FUNCTION: fn_16202 -void CUIItem::Slot16() { +void CUIItem::OnInit() { this->nameText->scrollBar->SetHidden(1); this->probabilityText->scrollBar->SetHidden(1); } // OFFSET: 0x00A4E350 // FUNCTION: fn_16204 -void CUIItem::Slot25(int, int) { +void CUIItem::OnLBtnDown(int, int) { } } diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.h b/Source/UI/ProbabilityTable/UIProbabilityTable.h index 07c694236..0ffa0c994 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.h +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.h @@ -22,10 +22,10 @@ public: class CUIItem : public CUIListItem { public: CUIItem(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; /* 00E8 */ CUITextViewer* nameText; /* 00EC */ CUITextViewer* probabilityText; @@ -42,10 +42,10 @@ class CUIProbabilityTable : public CUIFrameWnd { public: __declspec(noinline) CUIProbabilityTable(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - virtual void Slot53(); + virtual void Initialize(); int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; void OnButtonClick(); void OnClose(); diff --git a/Source/UI/Quest/UIOngoingQuestInfo.cpp b/Source/UI/Quest/UIOngoingQuestInfo.cpp index 01a026770..3491f5789 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.cpp +++ b/Source/UI/Quest/UIOngoingQuestInfo.cpp @@ -25,7 +25,7 @@ template <> void CUIListBoxEx::OnScroll(int position); -template <> void CUIListBoxEx::AddNewItem(); template <> void CUIListBoxEx::Slot53(int resolveSkin); template <> void CUIListBoxEx::Resize(int width, int height); +template <> void CUIListBoxEx::AddNewItem(); template <> void CUIListBoxEx::LoadSkin(int resolveSkin); template <> void CUIListBoxEx::Resize(int width, int height); // OFFSET: 0x00A4F580 // FUNCTION: fn_16213 bool UnusedTrueA4F580() { @@ -89,19 +89,19 @@ void CUIListBoxExunknown_00B4 = 0; this->m_resolveSkin = true; this->Resize(342, 412); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A4FF10 // FUNCTION: fn_16225 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -118,11 +118,11 @@ void CUIListBoxEx -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -227,18 +227,18 @@ void CUIScrollWindow::Paint() { // OFFSET: 0x00A558A0 // FUNCTION: fn_16307 -void CUIContents::Slot16() { +void CUIContents::OnInit() { } // OFFSET: 0x00A55940 // FUNCTION: fn_16309 -void CUIRewardItem::Slot16() { +void CUIRewardItem::OnInit() { } // OFFSET: 0x00A55B50 // FUNCTION: fn_16312 -void CUIScrollWindow::Slot35(int value) { - this->scrollBar->Slot35(value); +void CUIScrollWindow::OnWheel(int value) { + this->scrollBar->OnWheel(value); } // OFFSET: 0x00A55E10 @@ -308,7 +308,7 @@ void CUIRewards::OnBindItem(CUIRewardItem* item, const CRewardItemData& data) { // OFFSET: 0x00A558B0 // FUNCTION: fn_16308 -void CUIOngoingQuestInfo::Slot16() { +void CUIOngoingQuestInfo::OnInit() { const char* title = LookupMessage(0xD48); this->titleBar->SetTitle(title); UIWindow* window = g_windowMgr.LookupWindow(0x2718); @@ -323,7 +323,7 @@ namespace OngoingQuestInfo { // OFFSET: 0x00A55A90 // FUNCTION: fn_16311 -void CUIScrollWindow::Slot16() { +void CUIScrollWindow::OnInit() { this->firstContents->EnableClip(); this->secondContents->EnableClip(); this->rewards->EnableClip(); @@ -338,7 +338,7 @@ namespace OngoingQuestInfo { // OFFSET: 0x00A55950 // FUNCTION: fn_16310 -void CUIRewards::Slot16() { +void CUIRewards::OnInit() { this->firstLabel->SetText(LookupMessage(0xD4C)); this->secondLabel->SetText(LookupMessage(0xD4D)); this->thirdLabel->SetText(LookupMessage(0xD4E)); @@ -442,7 +442,7 @@ void CUIScrollWindow::SetQuest(unsigned int id) { // OFFSET: 0x00A50970 // FUNCTION: fn_16227 -void CUIOngoingQuestInfo::Slot15(int width, int height) { +void CUIOngoingQuestInfo::OnCreate(int width, int height) { this->titleBar = new CUITitleBar(); this->titleBar->SetSize(342, 17); this->titleBar->Move(0, 0); @@ -535,7 +535,7 @@ namespace OngoingQuestInfo { // OFFSET: 0x00A4FFE0 // FUNCTION: fn_16226 -void CUIContents::Slot15(int width, int height) { +void CUIContents::OnCreate(int width, int height) { this->icon = new CUIStaticImage(); this->icon->SetSize(10, 9); this->icon->Move(9, 9); @@ -583,7 +583,7 @@ void CUIContents::Slot15(int width, int height) { // OFFSET: 0x00A51900 // FUNCTION: fn_16228 -void CUIRewardItem::Slot15(int width, int height) { +void CUIRewardItem::OnCreate(int width, int height) { this->background = new CUIStaticImage(); this->background->SetSize(38, 38); this->background->Move(0, 0); @@ -628,7 +628,7 @@ void CUIRewardItem::Slot15(int width, int height) { // OFFSET: 0x00A53170 // FUNCTION: fn_16230 -void CUIScrollWindow::Slot15(int width, int height) { +void CUIScrollWindow::OnCreate(int width, int height) { this->firstContents = new CUIContents(); this->firstContents->SetSize(335, 59); this->firstContents->Move(0, 0); @@ -777,7 +777,7 @@ void CUIListBoxEx -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -811,7 +811,7 @@ CUIRewardItem::CUIRewardItem() : CUIListItem(), background(nullptr), gameItem(nu namespace OngoingQuestInfo { // OFFSET: 0x00A51ED0 // FUNCTION: fn_16229 -void CUIRewards::Slot15(int width, int height) { +void CUIRewards::OnCreate(int width, int height) { this->icon = new CUIStaticImage(); this->icon->SetSize(10, 9); this->icon->Move(9, 9); diff --git a/Source/UI/Quest/UIOngoingQuestInfo.h b/Source/UI/Quest/UIOngoingQuestInfo.h index fa1be1f5c..f36882020 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.h +++ b/Source/UI/Quest/UIOngoingQuestInfo.h @@ -17,11 +17,11 @@ class CUIScrollWindow; class CUIOngoingQuestInfo : public CUIFrameWnd { public: __declspec(noinline) CUIOngoingQuestInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void OnFirstAction(); void OnClose(); - virtual void Slot53(); + virtual void Initialize(); void UpdateHuntInfo(); void SetQuest(unsigned int id); @@ -52,8 +52,8 @@ class CUIContents : public CUIControl { public: __declspec(noinline) CUIContents(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; __declspec(noinline) void UpdateHeight(); @@ -71,8 +71,8 @@ public: class CUIRewardItem : public CUIListItem { public: CUIRewardItem(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; /* 00E8 */ CUIStaticImage* background; @@ -85,8 +85,8 @@ class CUIRewards : public CUIControl { public: __declspec(noinline) CUIRewards(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; void OnPrepareItem(CUIRewardItem* item, const CRewardItemData& data); @@ -113,10 +113,10 @@ class CUIScrollWindow : public CUIControl { public: __declspec(noinline) CUIScrollWindow(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot35(int value) override; + void OnWheel(int value) override; void OnScroll(int position); void SetQuest(unsigned int id); diff --git a/Source/UI/Quest/UIQuestDisplay.cpp b/Source/UI/Quest/UIQuestDisplay.cpp index 81f4c71d1..11c0dd07b 100644 --- a/Source/UI/Quest/UIQuestDisplay.cpp +++ b/Source/UI/Quest/UIQuestDisplay.cpp @@ -34,7 +34,7 @@ void UIQuestDisplay::Create(int width, int height) { // OFFSET: 0x0094A400 // FUNCTION: fn_12887 -bool UIQuestDisplay::Slot08() { +bool UIQuestDisplay::IsTransmitMouseInput() { return true; } @@ -152,7 +152,7 @@ void UIQuestDisplay::Paint() { // OFFSET: 0x0094F1D0 // FUNCTION: fn_12934 -void UIQuestDisplay::Slot33(int x, int y) { +void UIQuestDisplay::OnRBtnUp(int x, int y) { const int previous = this->m_selectedIndex; int selected = -1; int single = 0; @@ -197,7 +197,7 @@ void UIQuestDisplay::Slot33(int x, int y) { // OFFSET: 0x009515D0 // FUNCTION: fn_12953 -void UIQuestDisplay::Slot11() { +void UIQuestDisplay::StoreInfo() { if (this->m_visibleSetting) { *this->m_visibleSetting = this->geometry.visible; } diff --git a/Source/UI/Quest/UIQuestDisplay.h b/Source/UI/Quest/UIQuestDisplay.h index 2ca45a638..5c1f4d3ff 100644 --- a/Source/UI/Quest/UIQuestDisplay.h +++ b/Source/UI/Quest/UIQuestDisplay.h @@ -11,10 +11,10 @@ struct QuestDisplayInfo; class UIQuestDisplay : public UIWindow { public: UIQuestDisplay(); - bool Slot08() override; - void Slot11() override; + bool IsTransmitMouseInput() override; + void StoreInfo() override; void Paint() override; - void Slot33(int x, int y) override; + void OnRBtnUp(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 Create(int width, int height); diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.cpp b/Source/UI/Quest/UIRecommendedQuestInfo.cpp index 57f24875a..2d6ede036 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.cpp +++ b/Source/UI/Quest/UIRecommendedQuestInfo.cpp @@ -14,18 +14,18 @@ // OFFSET: 0x00A568E0 // FUNCTION: fn_16321 -void CUIRecommendedQuestInfo::Slot53() { +void CUIRecommendedQuestInfo::Initialize() { this->unknown_00B4 = 0; this->m_resolveSkin = true; this->Resize(342, 412); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A570F0 // FUNCTION: fn_16323 -void CUIRecommendedQuestInfo::Slot15(int width, int height) { +void CUIRecommendedQuestInfo::OnCreate(int width, int height) { this->titleBar = new CUITitleBar(); this->titleBar->SetSize(342, 17); this->titleBar->Move(0, 0); @@ -113,7 +113,7 @@ void CUIRecommendedQuestInfo::OnClose() { // OFFSET: 0x00A58BE0 // FUNCTION: fn_16349 -void CUIRecommendedQuestInfo::Slot16() { +void CUIRecommendedQuestInfo::OnInit() { const char* title = LookupMessage(0xD48); this->titleBar->SetTitle(title); UIWindow* window = g_windowMgr.LookupWindow(0x2718); @@ -134,12 +134,12 @@ void CUIQuestInfo::Paint() { // OFFSET: 0x00A58BD0 // FUNCTION: fn_16348 -void CUIQuestInfo::Slot16() { +void CUIQuestInfo::OnInit() { } // OFFSET: 0x00A569F0 // FUNCTION: fn_16322 -void CUIQuestInfo::Slot15(int width, int height) { +void CUIQuestInfo::OnCreate(int width, int height) { this->textViewer = new CUITextViewer(); this->textViewer->SetSize(300, 150); this->textViewer->Move(0, 0); @@ -167,7 +167,7 @@ void CUIQuestInfo::Slot15(int width, int height) { // OFFSET: 0x00A57EF0 // FUNCTION: fn_16324 -void CUIScrollWindow::Slot15(int width, int height) { +void CUIScrollWindow::OnCreate(int width, int height) { this->background = new CUIStaticImage(); this->background->SetSize(336, 318); this->background->Move(3, 2); @@ -215,7 +215,7 @@ void CUIScrollWindow::Slot15(int width, int height) { // OFFSET: 0x00A58C70 // FUNCTION: fn_16350 -void CUIScrollWindow::Slot16() { +void CUIScrollWindow::OnInit() { this->npcSprite = new UINpcSprWnd(); this->npcSprite->SetSize(75, 145); this->npcSprite->Show(0); diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.h b/Source/UI/Quest/UIRecommendedQuestInfo.h index 8ff9c4ea9..a41ebc196 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.h +++ b/Source/UI/Quest/UIRecommendedQuestInfo.h @@ -17,11 +17,11 @@ class CUIScrollWindow; class CUIRecommendedQuestInfo : public CUIFrameWnd { public: __declspec(noinline) CUIRecommendedQuestInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void OnFirstAction(); void OnClose(); - virtual void Slot53(); + virtual void Initialize(); void SetQuest(unsigned int questId); /* 00D8 */ CUITitleBar* titleBar; @@ -37,8 +37,8 @@ class CUIQuestInfo : public CUIControl { public: __declspec(noinline) CUIQuestInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; /* 0084 */ CUITextViewer* textViewer; @@ -47,8 +47,8 @@ public: class CUIScrollWindow : public CUIControl { public: __declspec(noinline) CUIScrollWindow(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void SetQuest(unsigned int questId); /* 0084 */ CUIStaticImage* background; diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index bed0ac31e..3673a4001 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -647,8 +647,8 @@ void CUIRenewQuestUI::Paint() { // OFFSET: 0x00A66F40 // FUNCTION: fn_16625 -void RenewQuestUI::CUIQuestItem::Slot25(int x, int y) { - CUIListItem::Slot25(x, y); +void RenewQuestUI::CUIQuestItem::OnLBtnDown(int x, int y) { + CUIListItem::OnLBtnDown(x, y); this->pressed = 1; UIWindow::Move(this->baseX, this->baseY + 1); this->Invalidate(); @@ -656,8 +656,8 @@ void RenewQuestUI::CUIQuestItem::Slot25(int x, int y) { // OFFSET: 0x00A66F80 // FUNCTION: fn_16626 -void RenewQuestUI::CUIQuestItem::Slot31(int x, int y) { - CUIListItem::Slot31(x, y); +void RenewQuestUI::CUIQuestItem::OnLBtnUp(int x, int y) { + CUIListItem::OnLBtnUp(x, y); this->pressed = 0; UIWindow::Move(this->baseX, this->baseY); this->Invalidate(); @@ -665,7 +665,7 @@ void RenewQuestUI::CUIQuestItem::Slot31(int x, int y) { // OFFSET: 0x00A66FC0 // FUNCTION: fn_16627 -void RenewQuestUI::CUIQuestItem::Slot48() { +void RenewQuestUI::CUIQuestItem::OnMouseLeave() { this->pressed = 0; UIWindow::Move(this->baseX, this->baseY); this->Invalidate(); @@ -890,7 +890,7 @@ void RenewQuestUI::CUIQuestItem::OnSimpleView(bool simpleView) { // OFFSET: 0x00A66C70 // FUNCTION: fn_16622 -void RenewQuestUI::CUIQuestItem::Slot16() { +void RenewQuestUI::CUIQuestItem::OnInit() { CUIButton* button = this->unknown_00F4; std::string tooltip = LookupMessage(3409); button->tooltip = tooltip; @@ -898,21 +898,21 @@ void RenewQuestUI::CUIQuestItem::Slot16() { // OFFSET: 0x00A66D90 // FUNCTION: fn_16623 -void RenewQuestUI::CUIQuestList::Slot16() { +void RenewQuestUI::CUIQuestList::OnInit() { this->list->unknown_00E0 = 0; } // OFFSET: 0x00A5C200 // FUNCTION: fn_16432 -void CUIRenewQuestUI::Slot53() { +void CUIRenewQuestUI::Initialize() { this->unknown_00B4 = 1; this->m_resolveSkin = true; this->Resize(381, 466); this->Move( g_renderer->viewport.centerX - this->geometry.width / 2, g_renderer->viewport.centerY - this->geometry.height / 2 ); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A67E10 @@ -1097,7 +1097,7 @@ int CUIRenewQuestUI::SendMsg(UIWindow* sender, int message, std::intptr_t a, std // OFFSET: 0x00A5C380 // FUNCTION: fn_16433 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -1315,7 +1315,7 @@ static bool s_registered = [] { // OFFSET: 0x00A5C590 // FUNCTION: fn_16434 -void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { +void RenewQuestUI::CUIQuestItem::OnCreate(int width, int height) { this->icon = new CUIStaticImage(); this->icon->SetSize(26, 29); this->icon->Move(8, 7); @@ -1417,7 +1417,7 @@ void RenewQuestUI::CUIQuestItem::Slot15(int width, int height) { // OFFSET: 0x00A5D850 // FUNCTION: fn_16435 -void RenewQuestUI::CUIQuestList::Slot15(int width, int height) { +void RenewQuestUI::CUIQuestList::OnCreate(int width, int height) { CUIListBoxEx* listBox = new CUIListBoxEx(); this->list = listBox; listBox->itemWidth = 330; @@ -1513,7 +1513,7 @@ void RenewQuestUI::CUIQuestList::Slot15(int width, int height) { // OFFSET: 0x00A5E8C0 // FUNCTION: fn_16436 -void CUIRenewQuestUI::Slot15(int width, int height) { +void CUIRenewQuestUI::OnCreate(int width, int height) { this->titleBar = new CUITitleBar(); this->titleBar->SetSize(352, 17); this->titleBar->Move(29, 0); @@ -2100,7 +2100,7 @@ void CUIListBoxEx::AddNewItem() { // OFFSET: 0x00A63CD0 // FUNCTION: fn_16442 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -2226,7 +2226,7 @@ CUIRenewQuestUI::CUIRenewQuestUI() // OFFSET: 0x00A66DA0 // FUNCTION: fn_16624 -void CUIRenewQuestUI::Slot16() { +void CUIRenewQuestUI::OnInit() { g_windowMgr.RecordWindowPacket(0x2718); g_windowMgr.CloseWindow(0x8F); diff --git a/Source/UI/Quest/UIRenewQuestUI.h b/Source/UI/Quest/UIRenewQuestUI.h index d663785a3..473c618eb 100644 --- a/Source/UI/Quest/UIRenewQuestUI.h +++ b/Source/UI/Quest/UIRenewQuestUI.h @@ -20,12 +20,12 @@ class CUIQuestItem : public CUIListItem { public: __declspec(noinline) CUIQuestItem(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Move(int x, int y) override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot48() override; - void Slot16() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnMouseLeave() override; + void OnInit() override; void Paint() override; void SetSelected(bool selected) override; void OnActiveStateChanged(bool active); @@ -47,9 +47,9 @@ public: class CUIQuestList : public CUIControl { public: __declspec(noinline) CUIQuestList(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot16() override; + void OnInit() override; void OnSelectItem(CUIQuestItem* item, const unsigned long& questId); void BindItem(CUIQuestItem* item, const unsigned long& questId); @@ -62,10 +62,10 @@ class CUIRenewQuestUI : public CUIFrameWnd { public: __declspec(noinline) CUIRenewQuestUI(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; - void Slot53() override; + void Initialize() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; bool MatchesFilter(const RenewQuestInfo& info) const; @@ -109,7 +109,7 @@ void CUIListBoxEx::AddNewItem(); template <> void CUIListBoxEx::Resize(int width, int height); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(RenewQuestUI::CUIQuestItem) == 0x110); diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index 72b084014..d497bf6d7 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -129,7 +129,7 @@ void UINpcSprWnd::Paint() { // OFFSET: 0x007F9770 // FUNCTION: fn_09935 -void UINpcSprWnd::Slot31(int, int) { +void UINpcSprWnd::OnLBtnUp(int, int) { if (this->m_mapName.size() != 0) { g_navigationManager.StartNavigation(this->m_mapName, 0, 5, false, this->m_destinationX, this->m_destinationY, 1002); } @@ -161,7 +161,7 @@ void UINpcSprWnd::SetDestination(std::string mapName, int x, int y) { UIOngoingQuestScrollWnd::UIOngoingQuestScrollWnd(int width, int height) : UIScrollWnd(width, height, 0), m_questId(0), m_lineHeight(18) { this->m_huntTexts.clear(); - static_cast(this)->Slot15(width, height); + static_cast(this)->OnCreate(width, height); } // OFFSET: 0x007F9C30 @@ -170,7 +170,7 @@ void Nullsub254() {} // OFFSET: 0x007F9C40 // FUNCTION: fn_09943 -void UIOngoingQuestScrollWnd::Slot15(int, int) { +void UIOngoingQuestScrollWnd::OnCreate(int, int) { this->scrollBarWidth = 9; } @@ -185,7 +185,7 @@ void UIOngoingQuestScrollWnd::Paint() { // OFFSET: 0x007F9C70 // FUNCTION: fn_09945 -void UIOngoingQuestScrollWnd::Slot35(int delta) { +void UIOngoingQuestScrollWnd::OnWheel(int delta) { if (this->wheelScroll == 1) { if (delta < 0) { this->SendMsg(this->scrollBar, 7, 15, 0, 0, 0); @@ -452,7 +452,7 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { this->scrollBar = new UIRenewQuestScrollBar(); this->scrollBar->Configure(this->geometry.width - this->scrollBarWidth, 0, 1, this->geometry.height - this->scrollBarHeight); this->AddChild(this->scrollBar); - this->Slot53(); + this->UpdateScrollRange(); this->Invalidate(); } @@ -460,7 +460,7 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { // FUNCTION: fn_09949 UIRecommededQuestScrollWnd::UIRecommededQuestScrollWnd(int width, int height) : UIScrollWnd(width, height, 0), unknown_00B0(0), unknown_00B4(14) { - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x007FB0C0 @@ -469,7 +469,7 @@ void Nullsub255() {} // OFFSET: 0x007FB0D0 // FUNCTION: fn_09952 -void UIRecommededQuestScrollWnd::Slot15(int, int) { +void UIRecommededQuestScrollWnd::OnCreate(int, int) { this->scrollBarWidth = 9; } @@ -484,7 +484,7 @@ void UIRecommededQuestScrollWnd::Paint() { // OFFSET: 0x007FB100 // FUNCTION: fn_09954 -void UIRecommededQuestScrollWnd::Slot35(int delta) { +void UIRecommededQuestScrollWnd::OnWheel(int delta) { if (this->wheelScroll == 1) { if (delta < 0) { this->SendMsg(this->scrollBar, 7, 15, 0, 0, 0); @@ -568,7 +568,7 @@ UIRenewDetailQuestInfoWnd::UIRenewDetailQuestInfoWnd() // OFFSET: 0x007FB6C0 // FUNCTION: fn_09959 -void UIRenewDetailQuestInfoWnd::Slot15(int, int) { +void UIRenewDetailQuestInfoWnd::OnCreate(int, int) { this->m_ongoingWnd = new UIOngoingQuestScrollWnd(342, 322); this->m_ongoingWnd->Move(0, 62); this->AddChild(this->m_ongoingWnd); @@ -624,9 +624,9 @@ void UIRenewDetailQuestInfoWnd::Paint() { // OFFSET: 0x007FBAD0 // FUNCTION: fn_09961 -void UIRenewDetailQuestInfoWnd::Slot25(int x, int y) { +void UIRenewDetailQuestInfoWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } } @@ -710,7 +710,7 @@ UIRenewQuestWnd::UIRenewQuestWnd() // OFFSET: 0x007FC4A0 // FUNCTION: fn_09972 -void UIRenewQuestWnd::Slot15(int, int) { +void UIRenewQuestWnd::OnCreate(int, int) { this->m_tabs = new UITab(); this->m_tabs->SetSize(29, 404); this->m_tabs->tabCount = 4; @@ -840,9 +840,9 @@ void UIRenewQuestWnd::Paint() { // OFFSET: 0x007FCC90 // FUNCTION: fn_09975 -void UIRenewQuestWnd::Slot25(int x, int y) { +void UIRenewQuestWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -868,15 +868,15 @@ void UIRenewQuestWnd::Slot25(int x, int y) { // OFFSET: 0x007FCD80 // FUNCTION: fn_09976 -void UIRenewQuestWnd::Slot31(int x, int y) { +void UIRenewQuestWnd::OnLBtnUp(int x, int y) { this->m_pressed = 0; this->Invalidate(); - UIFrameWnd::Slot31(x, y); + UIFrameWnd::OnLBtnUp(x, y); } // OFFSET: 0x007FCDB0 // FUNCTION: fn_09977 -void UIRenewQuestWnd::Slot35(int delta) { +void UIRenewQuestWnd::OnWheel(int delta) { if (this->m_scrollable) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 7, 3, 0, 0, 0); diff --git a/Source/UI/Quest/UIRenewQuestWnd.h b/Source/UI/Quest/UIRenewQuestWnd.h index 9f4c1cf5b..2b5815982 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.h +++ b/Source/UI/Quest/UIRenewQuestWnd.h @@ -27,7 +27,7 @@ public: } void Paint() override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(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 SetSprite(int width, int height, std::string name); @@ -43,9 +43,9 @@ public: class UIOngoingQuestScrollWnd : public UIScrollWnd { public: __declspec(noinline) UIOngoingQuestScrollWnd(int width, int height); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot35(int delta) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -61,9 +61,9 @@ public: class UIRecommededQuestScrollWnd : public UIScrollWnd { public: __declspec(noinline) UIRecommededQuestScrollWnd(int width, int height); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot35(int delta) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -77,9 +77,9 @@ public: class UIRenewDetailQuestInfoWnd : public UIFrameWnd { public: UIRenewDetailQuestInfoWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; @@ -110,11 +110,11 @@ struct RenewQuestRowControls { class UIRenewQuestWnd : public UIFrameWnd { public: UIRenewQuestWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int delta) 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 RefreshRows(); diff --git a/Source/UI/Rodex/UIRodexComposeWnd.cpp b/Source/UI/Rodex/UIRodexComposeWnd.cpp index f0173dea6..0f7db7763 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.cpp +++ b/Source/UI/Rodex/UIRodexComposeWnd.cpp @@ -137,7 +137,7 @@ void UIRodexComposeWnd::InsertSkillTag(int tagId) { // OFFSET: 0x00800480 // FUNCTION: fn_10006 -void UIRodexEditCtrl3::Slot15(int width, int height) { +void UIRodexEditCtrl3::OnCreate(int width, int height) { auto* scrollBar = new UIRodexScrollBar(); this->unknown_0130 = scrollBar; scrollBar->Configure(width - 5, 0, 1, height); @@ -182,9 +182,9 @@ void UIRodexScrollBar::Paint() { // OFFSET: 0x00800ED0 // FUNCTION: fn_10009 -void UIRodexComposeWnd::Slot25(int x, int y) { +void UIRodexComposeWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } ITEM_INFO item = this->GetItemAtPoint(x, y); @@ -195,7 +195,7 @@ void UIRodexComposeWnd::Slot25(int x, int y) { // OFFSET: 0x00800FA0 // FUNCTION: fn_10010 -void UIRodexComposeWnd::Slot28(int x, int y) { +void UIRodexComposeWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAtPoint(x, y); if (std::atoi(item.itemId.c_str()) != 0) { int tooltipX = this->m_itemIndex * 34 + 30; @@ -216,15 +216,15 @@ void UIRodexComposeWnd::Slot28(int x, int y) { // OFFSET: 0x008011B0 // FUNCTION: fn_10011 -void UIRodexComposeWnd::Slot19() { +void UIRodexComposeWnd::OnProcess() { if (g_windowMgr.GetHoverWindow() == this->m_zeny) { - this->m_zeny->Slot19(); + this->m_zeny->OnProcess(); } } // OFFSET: 0x008011D0 // FUNCTION: fn_10012 -void UIRodexComposeWnd::Slot32(int x, int y) { +void UIRodexComposeWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAtPoint(x, y); if (std::atoi(item.itemId.c_str()) != 0) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&item), 0, 0, 0); @@ -275,9 +275,9 @@ void UIRodexComposeWnd::SetRecipient(int id, unsigned short job, unsigned short // OFFSET: 0x007FF400 // FUNCTION: fn_10000 -void UIRodexComposeWnd::Slot10(int x, int y, std::intptr_t value) { +void UIRodexComposeWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (!g_windowMgr.unknown_0458) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -544,7 +544,7 @@ void UIRodexComposeWnd::Paint() { // OFFSET: 0x007FFB90 // FUNCTION: fn_10005 -void UIRodexComposeWnd::Slot15(int, int) { +void UIRodexComposeWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/Rodex/UIRodexComposeWnd.h b/Source/UI/Rodex/UIRodexComposeWnd.h index 4acb99dc7..a55bb8b40 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.h +++ b/Source/UI/Rodex/UIRodexComposeWnd.h @@ -26,19 +26,19 @@ public: class UIRodexEditCtrl3 : public UIEditCtrl3 { public: UIRodexEditCtrl3(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; }; class UIRodexComposeWnd : public UIFrameWnd { public: UIRodexComposeWnd(); ~UIRodexComposeWnd() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot19() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnProcess() override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Paint() 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 InsertItemTag(const ITEM_INFO& item); diff --git a/Source/UI/Rodex/UIRodexInboxWnd.cpp b/Source/UI/Rodex/UIRodexInboxWnd.cpp index 0842eb5dc..1f7f4952c 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.cpp +++ b/Source/UI/Rodex/UIRodexInboxWnd.cpp @@ -84,23 +84,23 @@ UIRodexInboxWnd::UIRodexInboxWnd() // OFFSET: 0x00807640 // FUNCTION: fn_10049 -void UIRodexInboxWnd::Slot25(int x, int y) { +void UIRodexInboxWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x00807660 // FUNCTION: fn_10050 -void UIRodexInboxWnd::Slot28(int, int) {} +void UIRodexInboxWnd::OnMouseHover(int, int) {} // OFFSET: 0x00807670 // FUNCTION: fn_10051 -void UIRodexInboxWnd::Slot19() {} +void UIRodexInboxWnd::OnProcess() {} // OFFSET: 0x00807680 // FUNCTION: fn_10052 -void UIRodexInboxWnd::Slot32(int, int) {} +void UIRodexInboxWnd::OnRBtnDown(int, int) {} // OFFSET: 0x00805750 // FUNCTION: fn_10045 @@ -127,13 +127,13 @@ void UIRodexInboxWnd::DrawMailIcons(int row, unsigned char attachments, unsigned // OFFSET: 0x008058B0 // FUNCTION: fn_10046 -bool UIRodexInboxWnd::Slot03() { +bool UIRodexInboxWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x008058C0 // FUNCTION: fn_10047 -void UIRodexInboxWnd::Slot15(int width, int height) { +void UIRodexInboxWnd::OnCreate(int width, int height) { g_rodexMailStore->PurgeFlagged(); this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/Rodex/UIRodexInboxWnd.h b/Source/UI/Rodex/UIRodexInboxWnd.h index 17a10c22d..a65474ded 100644 --- a/Source/UI/Rodex/UIRodexInboxWnd.h +++ b/Source/UI/Rodex/UIRodexInboxWnd.h @@ -43,14 +43,14 @@ struct RodexMailEntryLess { class UIRodexInboxWnd : public UIItemWnd { public: UIRodexInboxWnd(); - bool Slot03() override; - void Slot15(int width, int height) override; + bool NeedsFrameRefresh() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot19() override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnProcess() override; - void Slot32(int x, int y) override; + void OnRBtnDown(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 DrawMailIcons(int row, unsigned char attachments, unsigned char read, unsigned char returned); diff --git a/Source/UI/RuneSystem/UIRuneSystemWindows.h b/Source/UI/RuneSystem/UIRuneSystemWindows.h index e84100ece..cd9a91628 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWindows.h +++ b/Source/UI/RuneSystem/UIRuneSystemWindows.h @@ -37,9 +37,9 @@ public: UIRuneSetReWard(); void Paint() override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(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; /* 0120 */ int m_itemId; @@ -51,7 +51,7 @@ class UIRuneSystemTab : public UIWindow { public: UIRuneSystemTab(); void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; /* 007C */ int m_count; @@ -63,17 +63,17 @@ public: UIEquipRuneSetWnd(); void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; }; class UIRuneSystem_tagListWnd : public UIWindow { public: UIRuneSystem_tagListWnd(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(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; /* 007C */ UIBitmapButton* m_leftButton; @@ -87,9 +87,9 @@ public: UIRuneSetList(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnWheel(int delta) 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 DrawScrollBar(bool drawLine); void ScrollBy(int delta); @@ -106,7 +106,7 @@ public: UIRuneList(); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; class UIDecomlist : public UIRuneSetList { @@ -114,7 +114,7 @@ public: UIDecomlist(); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; struct RuneSetInfoLine { @@ -162,8 +162,8 @@ public: UIRuneSystem_ActiveWnd(); void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; int HitTestItem(int x, int y); __declspec(noinline) void DrawCount(int x, int y, int count, int total, std::uint32_t color, int fontHeight); @@ -203,11 +203,11 @@ class UIRuneSet_Info : public UIWindow { public: UIRuneSet_Info(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(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; __declspec(noinline) void UpdateActivation(); __declspec(noinline) void UpdateRewards(); @@ -232,7 +232,7 @@ class UIRune_Info : public UIWindow { public: UIRune_Info(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -245,10 +245,10 @@ class UIRune_Decom : public UIWindow { public: UIRune_Decom(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; __declspec(noinline) void Reset(); int HitTestItem(int x, int y); @@ -267,7 +267,7 @@ public: class UIRune_ViewInfo : public UIWindow { public: - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; /* 007C */ UIGage_Circle* m_gauge; @@ -313,10 +313,10 @@ public: class UIRuneSystemWnd : public UIFrameWnd { public: UIRuneSystemWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; __declspec(noinline) void SelectTab(); diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp index 9ad05a073..dbfebb60f 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.cpp +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.cpp @@ -95,7 +95,7 @@ int UIRune_Decom::HitTestItem(int x, int y) { // OFFSET: 0x00818300 // FUNCTION: fn_10174 -void UIRune_Info::Slot15(int, int) { +void UIRune_Info::OnCreate(int, int) { this->m_activeWnd = new UIRuneSystem_ActiveWnd(); this->AddChild(this->m_activeWnd); this->m_activeWnd->SetSize(0xEA, 0x78); @@ -197,13 +197,13 @@ void UIRuneSetList::DrawScrollBar(bool drawLine) { // OFFSET: 0x0081BE90 // FUNCTION: fn_10195 -void UIEquipRuneSetWnd::Slot26(int, int) { +void UIEquipRuneSetWnd::OnLBtnDblClk(int, int) { this->parent->SendMsg(this, 0xAB, 0x158, 0, 0, 0); } // OFFSET: 0x0081BEC0 // FUNCTION: fn_10196 -void UIRuneSet_Info::Slot26(int x, int y) { +void UIRuneSet_Info::OnLBtnDblClk(int x, int y) { RuneSetData* runeSet = this->m_runeSet; if (!runeSet) { return; @@ -228,13 +228,13 @@ void UIRuneSet_Info::Slot26(int x, int y) { // OFFSET: 0x0081BFD0 // FUNCTION: fn_10197 -void UIEquipRuneSetWnd::Slot25(int, int) { +void UIEquipRuneSetWnd::OnLBtnDown(int, int) { this->parent->SendMsg(this, 0xAB, 0xC2, -1, 0, 0); } // OFFSET: 0x0081C000 // FUNCTION: fn_10198 -void UIRuneSetList::Slot25(int x, int y) { +void UIRuneSetList::OnLBtnDown(int x, int y) { if (y == 0) { return; } @@ -246,12 +246,12 @@ void UIRuneSetList::Slot25(int x, int y) { return; } - UIScrollBar::Slot25(x, y); + UIScrollBar::OnLBtnDown(x, y); } // OFFSET: 0x0081C080 // FUNCTION: fn_10199 -void UIRuneSystemTab::Slot25(int x, int) { +void UIRuneSystemTab::OnLBtnDown(int x, int) { if (!this->parent) { return; } @@ -270,12 +270,12 @@ void UIRuneSystemTab::Slot25(int x, int) { // OFFSET: 0x0081C0E0 // FUNCTION: fn_10200 -void UIRuneSystemWnd::Slot25(int, int) { +void UIRuneSystemWnd::OnLBtnDown(int, int) { } // OFFSET: 0x0081C0F0 // FUNCTION: fn_10201 -void UIRuneSystem_tagListWnd::Slot25(int x, int) { +void UIRuneSystem_tagListWnd::OnLBtnDown(int x, int) { if (x < 20 || this->geometry.width - 23 < x) { return; } @@ -294,9 +294,9 @@ void UIRuneSystem_tagListWnd::Slot25(int x, int) { // OFFSET: 0x0081C190 // FUNCTION: fn_10202 -void UIRuneSetReWard::Slot31(int x, int y) { +void UIRuneSetReWard::OnLBtnUp(int x, int y) { if (this->m_state == 2) { - UIBitmapButton::Slot31(x, y); + UIBitmapButton::OnLBtnUp(x, y); return; } @@ -314,12 +314,12 @@ void UIRuneSetReWard::Slot31(int x, int y) { // OFFSET: 0x0081C230 // FUNCTION: fn_10203 -void UIDecomlist::Slot28(int, int) { +void UIDecomlist::OnMouseHover(int, int) { } // OFFSET: 0x0081C240 // FUNCTION: fn_10204 -void UIEquipRuneSetWnd::Slot28(int x, int y) { +void UIEquipRuneSetWnd::OnMouseHover(int x, int y) { if (x >= 11 && x <= 36 && y >= 8 && y <= 27) { RuneSetData* runeSet = g_runeSystemMgr->GetCurRuneSet(); if (!runeSet) { @@ -372,12 +372,12 @@ void UIEquipRuneSetWnd::Slot28(int x, int y) { // OFFSET: 0x0081C3D0 // FUNCTION: fn_10205 -void UIRuneList::Slot28(int, int) { +void UIRuneList::OnMouseHover(int, int) { } // OFFSET: 0x0081C3E0 // FUNCTION: fn_10206 -void UIRuneSetList::Slot28(int x, int y) { +void UIRuneSetList::OnMouseHover(int x, int y) { if (x < 19 || x > 256 || y < 25 || this->geometry.height - 10 < y) { return; } @@ -418,7 +418,7 @@ void UIRuneSetList::Slot28(int x, int y) { // OFFSET: 0x0081C6F0 // FUNCTION: fn_10208 -void UIRuneSet_Info::Slot28(int x, int y) { +void UIRuneSet_Info::OnMouseHover(int x, int y) { if (!this->m_runeSet || !this->m_runeSet->IsActive()) { return; } @@ -442,7 +442,7 @@ void UIRuneSet_Info::Slot28(int x, int y) { // OFFSET: 0x0081C960 // FUNCTION: fn_10210 -void UIRuneSystem_tagListWnd::Slot28(int x, int) { +void UIRuneSystem_tagListWnd::OnMouseHover(int x, int) { if (x < 20 || this->geometry.width - 23 < x) { return; } @@ -463,29 +463,29 @@ void UIRuneSystem_tagListWnd::Slot28(int x, int) { // OFFSET: 0x0081CBF0 // FUNCTION: fn_10212 -void UIRuneSet_Info::Slot19() { - this->m_gauge->Slot19(); +void UIRuneSet_Info::OnProcess() { + this->m_gauge->OnProcess(); } // OFFSET: 0x0081CC00 // FUNCTION: fn_10213 -void UIRuneSystemWnd::Slot19() { +void UIRuneSystemWnd::OnProcess() { switch (this->m_tab->geometry.unknown_0030) { case 0: - this->m_runeSetInfo->Slot19(); + this->m_runeSetInfo->OnProcess(); break; case 1: - this->m_runeInfo->Slot19(); + this->m_runeInfo->OnProcess(); break; case 2: - this->m_runeDecom->Slot19(); + this->m_runeDecom->OnProcess(); break; } } // OFFSET: 0x0081CF10 // FUNCTION: fn_10217 -void UIRuneSetList::Slot35(int delta) { +void UIRuneSetList::OnWheel(int delta) { const int previous = this->position; int next = previous + (delta < 0 ? 1 : -1); if (next < 0) { @@ -923,7 +923,7 @@ int UIRune_Info::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, // OFFSET: 0x0081CC40 // FUNCTION: fn_10214 -void UIRuneSetReWard::Slot32(int, int) { +void UIRuneSetReWard::OnRBtnDown(int, int) { this->Invalidate(); ITEM_INFO item; item.SetItemId(this->m_itemId); @@ -936,7 +936,7 @@ void UIRuneSetReWard::Slot32(int, int) { // OFFSET: 0x0081CD10 // FUNCTION: fn_10215 -void UIRuneSystem_ActiveWnd::Slot32(int x, int y) { +void UIRuneSystem_ActiveWnd::OnRBtnDown(int x, int y) { if (this->m_listId == -1) { return; } @@ -960,7 +960,7 @@ void UIRuneSystem_ActiveWnd::Slot32(int x, int y) { // OFFSET: 0x0081CE10 // FUNCTION: fn_10216 -void UIRune_Decom::Slot32(int x, int y) { +void UIRune_Decom::OnRBtnDown(int x, int y) { if (!this->m_decomList) { return; } @@ -1217,7 +1217,7 @@ void UIRuneSetList::Paint() { // OFFSET: 0x0081C510 // FUNCTION: fn_10207 -void UIRuneSetReWard::Slot28(int, int) { +void UIRuneSetReWard::OnMouseHover(int, int) { if (!this->m_itemId) { return; } @@ -1240,7 +1240,7 @@ void UIRuneSetReWard::Slot28(int, int) { // OFFSET: 0x0081C7F0 // FUNCTION: fn_10209 -void UIRuneSystem_ActiveWnd::Slot28(int x, int y) { +void UIRuneSystem_ActiveWnd::OnMouseHover(int x, int y) { if (this->m_listId == -1) { return; } @@ -1269,7 +1269,7 @@ void UIRuneSystem_ActiveWnd::Slot28(int x, int y) { // OFFSET: 0x0081CA80 // FUNCTION: fn_10211 -void UIRune_Decom::Slot28(int x, int y) { +void UIRune_Decom::OnMouseHover(int x, int y) { if (!this->m_decomList) { return; } @@ -1696,7 +1696,7 @@ void UIRune_Decom::SetItem(int itemId) { // OFFSET: 0x008184A0 // FUNCTION: fn_10175 -void UIRune_ViewInfo::Slot15(int, int) { +void UIRune_ViewInfo::OnCreate(int, int) { this->m_gauge = new UIGage_Circle(); this->AddChild(this->m_gauge); this->m_gauge->SetSize(0x89, 0x7F); @@ -1762,7 +1762,7 @@ int UIRune_Decom::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 // OFFSET: 0x00817EA0 // FUNCTION: fn_10173 -void UIRune_Decom::Slot15(int, int) { +void UIRune_Decom::OnCreate(int, int) { this->m_decomButton = new UIBitmapButton(); this->AddChild(this->m_decomButton); this->m_decomButton->SetBitmap("유저인터페이스\\runesystem\\bt_decom_nomal.bmp", 0, 0); @@ -1793,7 +1793,7 @@ void UIRune_Decom::Slot15(int, int) { // OFFSET: 0x008177C0 // FUNCTION: fn_10172 -void UIRuneSystemWnd::Slot15(int, int) { +void UIRuneSystemWnd::OnCreate(int, int) { this->m_tab = new UIRuneSystemTab(); this->AddChild(this->m_tab); this->m_tab->SetSize(0x109, 0x1A); @@ -1816,8 +1816,8 @@ void UIRuneSystemWnd::Slot15(int, int) { UIRuneSetList* list = this->m_lists[0]; list->vertical = 1; list->UIWindow::Resize(0x11B, 0x159); - list->Slot15(0x11B, 0x159); - list->Slot22(0x11B, 0x159); + list->OnCreate(0x11B, 0x159); + list->OnSize(0x11B, 0x159); this->m_lists[0]->Move(0, this->m_equipRuneSet->geometry.height + this->m_tagList->geometry.height + top); int count = g_runeSystemMgr->GetTag(-1)->GetRuneCount(0); this->m_lists[0]->SetRange(std::max(count - 5, 0), 5, count); @@ -1827,8 +1827,8 @@ void UIRuneSystemWnd::Slot15(int, int) { list = this->m_lists[1]; list->vertical = 1; list->UIWindow::Resize(0x11B, 0x1AB); - list->Slot15(0x11B, 0x1AB); - list->Slot22(0x11B, 0x1AB); + list->OnCreate(0x11B, 0x1AB); + list->OnSize(0x11B, 0x1AB); this->m_lists[1]->Move(0, this->m_tagList->geometry.height + top); count = g_runeSystemMgr->GetTag(-1)->GetRuneCount(1); this->m_lists[1]->SetRange(std::max(count - 9, 0), 9, count); @@ -1838,8 +1838,8 @@ void UIRuneSystemWnd::Slot15(int, int) { list = this->m_lists[2]; list->vertical = 1; list->UIWindow::Resize(0x11B, 0x1CB); - list->Slot15(0x11B, 0x1CB); - list->Slot22(0x11B, 0x1CB); + list->OnCreate(0x11B, 0x1CB); + list->OnSize(0x11B, 0x1CB); this->m_lists[2]->Move(0, top); this->m_runeSetInfo = new UIRuneSet_Info(); @@ -1864,7 +1864,7 @@ void UIRuneSystemWnd::Slot15(int, int) { // OFFSET: 0x00816CB0 // FUNCTION: fn_10171 -void UIRuneSet_Info::Slot15(int, int) { +void UIRuneSet_Info::OnCreate(int, int) { this->m_activeWnd = new UIRuneSystem_ActiveWnd(); this->AddChild(this->m_activeWnd); this->m_activeWnd->SetSize(0xE6, 0x8C); @@ -1941,8 +1941,8 @@ void UIRuneSet_Info::Slot15(int, int) { UIRuneSetinfoList* infoList = this->m_infoList; infoList->vertical = 1; infoList->UIWindow::Resize(0xF9, 0x192); - infoList->Slot15(0xF9, 0x192); - infoList->Slot22(0xF9, 0x192); + infoList->OnCreate(0xF9, 0x192); + infoList->OnSize(0xF9, 0x192); this->m_infoList->Move(0x179, 0x48); this->m_infoList->ClearLines(); @@ -2385,7 +2385,7 @@ int UIRuneSystemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argume CEffect* effect = g_effectMgr->Spawn(g_session.m_aid, effects[argument2], 0.0f, 0.0f, 0.0f, 0, -1, 0, 0); if (effect) { const vector3d& position = positions[argument2]; - effect->Slot24(std::bit_cast(position.x), std::bit_cast(position.y), std::bit_cast(position.z), 1, 0x169); + effect->SetWindowOffset(std::bit_cast(position.x), std::bit_cast(position.y), std::bit_cast(position.z), 1, 0x169); } } break; diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.h b/Source/UI/RuneSystem/UIRuneSystemWnd.h index 8bb7d4575..e6f246212 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.h +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.h @@ -39,9 +39,9 @@ public: UIRuneSetReWard(); void Paint() override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(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; /* 0120 */ int m_itemId; @@ -53,7 +53,7 @@ class UIRuneSystemTab : public UIWindow { public: UIRuneSystemTab(); void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; /* 007C */ int m_count; @@ -65,17 +65,17 @@ public: UIEquipRuneSetWnd(); void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; }; class UIRuneSystem_tagListWnd : public UIWindow { public: UIRuneSystem_tagListWnd(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(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; /* 007C */ UIBitmapButton* m_leftButton; @@ -89,9 +89,9 @@ public: UIRuneSetList(); void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnWheel(int delta) 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 DrawScrollBar(bool drawLine); void ScrollBy(int delta); @@ -108,7 +108,7 @@ public: UIRuneList(); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; class UIDecomlist : public UIRuneSetList { @@ -116,7 +116,7 @@ public: UIDecomlist(); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; struct RuneSetInfoLine { @@ -164,8 +164,8 @@ public: UIRuneSystem_ActiveWnd(); void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; int HitTestItem(int x, int y); __declspec(noinline) void DrawCount(int x, int y, int count, int total, std::uint32_t color, int fontHeight); @@ -205,11 +205,11 @@ class UIRuneSet_Info : public UIWindow { public: UIRuneSet_Info(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(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; __declspec(noinline) void UpdateActivation(); __declspec(noinline) void UpdateRewards(); @@ -234,7 +234,7 @@ class UIRune_Info : public UIWindow { public: UIRune_Info(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -247,10 +247,10 @@ class UIRune_Decom : public UIWindow { public: UIRune_Decom(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; __declspec(noinline) void Reset(); int HitTestItem(int x, int y); @@ -269,7 +269,7 @@ public: class UIRune_ViewInfo : public UIWindow { public: - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; /* 007C */ UIGage_Circle* m_gauge; @@ -315,10 +315,10 @@ public: class UIRuneSystemWnd : public UIFrameWnd { public: UIRuneSystemWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; __declspec(noinline) void SelectTab(); diff --git a/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h b/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h index bd2cf4ac6..00057a7d4 100644 --- a/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h +++ b/Source/UI/SelectPackageItemBox/SelectPackageItemBox.h @@ -24,8 +24,8 @@ public: class CUIItemInfo : public CUIListItem { public: CUIItemInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; /* 00E8 */ CUIStaticImage* image; @@ -36,8 +36,8 @@ public: class CUITabInfo : public CUIListItem { public: CUITabInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; /* 00E8 */ CUIStaticText* nameText; }; @@ -46,9 +46,9 @@ public: class CUISelectPackageItemBox : public CUIFrameWnd { public: __declspec(noinline) CUISelectPackageItemBox(); - void Slot15(int width, int height) override; - void Slot16() override; - virtual void Slot53(); + void OnCreate(int width, int height) override; + void OnInit() override; + virtual void Initialize(); void OnCancel(); void OnClickClose(); diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index 3a2d2e4c5..bcfbe4b19 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -27,9 +27,9 @@ void CUIListBoxEx::AddNewItem(); template <> void CUIListBoxEx::AddNewItem(); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> void CUIListBoxEx::Resize(int width, int height); template <> @@ -91,12 +91,12 @@ void CUIListBoxExunknown_00B4 = 0; this->Resize(387, 283); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); this->SetSkinColors(0, 0, 0, 0); this->m_buttonBarStyle = 3; } @@ -109,7 +109,7 @@ void CUIListBoxEx -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -119,7 +119,7 @@ void CUIListBoxEx::Slot15(int widt // OFFSET: 0x00A696C0 // FUNCTION: fn_16663 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -143,22 +143,22 @@ void CUIListBoxEx -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x00A6D0C0 // FUNCTION: fn_16669 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -305,7 +305,7 @@ void CUIListBoxEx -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -319,7 +319,7 @@ void CUIListBoxEx::Slot53(int reso // OFFSET: 0x00A6D870 // FUNCTION: fn_16673 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -653,7 +653,7 @@ void CUIItemInfo::Paint() { // OFFSET: 0x00A703B0 // FUNCTION: fn_16785 -void CUIItemInfo::Slot16() { +void CUIItemInfo::OnInit() { auto* const item = this->gameItem; item->showOverlay = 1; item->Invalidate(); @@ -661,7 +661,7 @@ void CUIItemInfo::Slot16() { // OFFSET: 0x00A705E0 // FUNCTION: fn_16787 -void CUITabInfo::Slot16() { +void CUITabInfo::OnInit() { } } @@ -750,7 +750,7 @@ const char* DecryptName(const Byte (&source)[Length]) { // OFFSET: 0x00A69790 // FUNCTION: fn_16664 -void SelectPackageItemBox::CUIItemInfo::Slot15(int width, int height) { +void SelectPackageItemBox::CUIItemInfo::OnCreate(int width, int height) { this->image = new CUIStaticImage(); this->image->SetSize(200, 34); this->image->Move(0, 0); @@ -796,7 +796,7 @@ void SelectPackageItemBox::CUIItemInfo::Slot15(int width, int height) { // OFFSET: 0x00A69DB0 // FUNCTION: fn_45491 -void CUISelectPackageItemBox::Slot15(int width, int height) { +void CUISelectPackageItemBox::OnCreate(int width, int height) { this->title = new CUITitleBar(); this->title->SetSize(387, 17); this->title->Move(0, 0); @@ -1237,7 +1237,7 @@ void CUISelectPackageItemBox::Slot15(int width, int height) { // OFFSET: 0x00A6CDE0 // FUNCTION: fn_16665 -void SelectPackageItemBox::CUITabInfo::Slot15(int width, int height) { +void SelectPackageItemBox::CUITabInfo::OnCreate(int width, int height) { this->nameText = new CUIStaticText(); this->nameText->SetSize(148, 34); this->nameText->Move(11, 0); @@ -1310,7 +1310,7 @@ void CUISelectPackageItemBox::BindItem(SelectPackageItemBox::CUIItemInfo* item, // OFFSET: 0x00A703D0 // FUNCTION: fn_16786 -void CUISelectPackageItemBox::Slot16() { +void CUISelectPackageItemBox::OnInit() { this->Move((g_renderer->viewport.width - this->geometry.width) / 2, (g_renderer->viewport.height - this->geometry.height) / 2); auto* const list = this->itemList; list->unknown_00C4 = 1; diff --git a/Source/UI/Shop/UIMerchantItemMyShopWnd.h b/Source/UI/Shop/UIMerchantItemMyShopWnd.h index 7aedb57ca..e37ad193c 100644 --- a/Source/UI/Shop/UIMerchantItemMyShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemMyShopWnd.h @@ -14,13 +14,13 @@ class UIStaticText; class UIMerchantItemMyShopWnd : public UIItemBaseWnd { public: UIMerchantItemMyShopWnd(int value); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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 OpenShop(); diff --git a/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h b/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h index d8cfcdf11..8c4f23fc8 100644 --- a/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h +++ b/Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h @@ -9,7 +9,7 @@ class UIStaticText; class UIMerchantItemPurchaseMSGWnd : public UIFrameWnd { public: UIMerchantItemPurchaseMSGWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; void SetPurchase(int value, int amount); int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Shop/UIMerchantItemPurchaseWnd.h b/Source/UI/Shop/UIMerchantItemPurchaseWnd.h index 7d1f155a9..cba8febc6 100644 --- a/Source/UI/Shop/UIMerchantItemPurchaseWnd.h +++ b/Source/UI/Shop/UIMerchantItemPurchaseWnd.h @@ -12,12 +12,12 @@ class UIStaticText; class UIMerchantItemPurchaseWnd : public UIItemBaseWnd { public: UIMerchantItemPurchaseWnd(int value); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Shop/UIMerchantItemShopWnd.h b/Source/UI/Shop/UIMerchantItemShopWnd.h index 321f44e8a..7f8b817ca 100644 --- a/Source/UI/Shop/UIMerchantItemShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemShopWnd.h @@ -13,14 +13,14 @@ class UIStaticText; class UIMerchantItemShopWnd : public UIItemBaseWnd { public: UIMerchantItemShopWnd(int value); - std::vector Slot44() override; - void Slot11() override; - void Slot19() override; - void Slot10(int x, int y, std::intptr_t value) 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; + std::vector GetReplayData() override; + void StoreInfo() override; + void OnProcess() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Shop/UIMerchantItemWnd.h b/Source/UI/Shop/UIMerchantItemWnd.h index 395286a30..5f738842b 100644 --- a/Source/UI/Shop/UIMerchantItemWnd.h +++ b/Source/UI/Shop/UIMerchantItemWnd.h @@ -12,13 +12,13 @@ class UIStaticText; class UIMerchantItemWnd : public UIItemBaseWnd { public: UIMerchantItemWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot15(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00F0 */ MerchantItemWndInfo* saved; diff --git a/Source/UI/Shop/UIMerchantMirrorItemWnd.h b/Source/UI/Shop/UIMerchantMirrorItemWnd.h index b6bf4ed8b..0b9433f78 100644 --- a/Source/UI/Shop/UIMerchantMirrorItemWnd.h +++ b/Source/UI/Shop/UIMerchantMirrorItemWnd.h @@ -9,14 +9,14 @@ class UIMerchantMirrorItemWnd : public UIItemBaseWnd { public: - std::vector Slot44() override; + std::vector GetReplayData() override; UIMerchantMirrorItemWnd(int value); - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot11() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot25(int x, int y) override; - void Slot15(int width, int height) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void StoreInfo() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnLBtnDown(int x, int y) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 00F0 */ MerchantMirrorItemWndInfo* saved; diff --git a/Source/UI/Shop/UIMerchantShopMakeWnd.h b/Source/UI/Shop/UIMerchantShopMakeWnd.h index d6810e6b3..56ae98ba3 100644 --- a/Source/UI/Shop/UIMerchantShopMakeWnd.h +++ b/Source/UI/Shop/UIMerchantShopMakeWnd.h @@ -17,13 +17,13 @@ class UIEditCtrl; class UIMerchantShopMakeWnd : public UIFrameWnd { public: explicit UIMerchantShopMakeWnd(int mode); - std::vector Slot44() override; - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot25(int x, int y) override; - void Slot35(int value) override; + std::vector GetReplayData() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnLBtnDown(int x, int y) override; + void OnWheel(int value) override; __declspec(noinline) ITEM_INFO GetItemAt(int x, int y); void UpdateLayout(); @@ -37,7 +37,7 @@ public: void PrintBuyList(); void PrintSellList(); void Refresh(); - void Slot32(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Shop/UIMerchantShopTitle.cpp b/Source/UI/Shop/UIMerchantShopTitle.cpp index 52fe274f7..d3f41cd6e 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.cpp +++ b/Source/UI/Shop/UIMerchantShopTitle.cpp @@ -14,7 +14,7 @@ // OFFSET: 0x0085ACE0 // FUNCTION: fn_10788 -void UIMerchantShopTitle::Slot15(int, int) { +void UIMerchantShopTitle::OnCreate(int, int) { this->label = new UIStaticText(); this->label->SetSize(this->geometry.width - 34, 15); this->label->Move(31, 8); @@ -40,7 +40,7 @@ void UIMerchantShopTitle::Paint() { // OFFSET: 0x0085EC40 // FUNCTION: fn_10843 -void UIMerchantShopTitle::Slot25(int, int) { +void UIMerchantShopTitle::OnLBtnDown(int, int) { if (!g_serviceOptions.Get(167)) { return; } @@ -57,7 +57,7 @@ void UIMerchantShopTitle::Slot25(int, int) { // OFFSET: 0x0085E920 // FUNCTION: fn_10832 -void UIMerchantShopTitle::Slot26(int, int) { +void UIMerchantShopTitle::OnLBtnDblClk(int, int) { CMode* mode = g_modeMgr.GetGameMode(); if (this->buyingShop != 0) { if (g_windowMgr.unknown_0308 == 0) { @@ -80,7 +80,7 @@ void UIMerchantShopTitle::ResetCursor(int x, int y) { // OFFSET: 0x0085FE20 // FUNCTION: fn_10886 -void UIMerchantShopTitle::Slot32(int, int) { +void UIMerchantShopTitle::OnRBtnDown(int, int) { if (g_serviceOptions.Get(167)) { g_modeMgr.gameMode->SendMsg(245, 0, 0, 0, 0); g_session.unknown_1760.clear(); diff --git a/Source/UI/Shop/UIMerchantShopTitle.h b/Source/UI/Shop/UIMerchantShopTitle.h index 11ac37809..fe1f9176d 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.h +++ b/Source/UI/Shop/UIMerchantShopTitle.h @@ -10,12 +10,12 @@ class UIStaticText; class UIMerchantShopTitle : public UIWindow { public: explicit UIMerchantShopTitle(int buyingShop); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot32(int x, int y) override; + void OnRBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; /* 007C */ UIStaticText* label; diff --git a/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h b/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h index 3c5274693..9dfc81c45 100644 --- a/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h +++ b/Source/UI/Shop/UINoticeMessageBox_LockSellItem.h @@ -8,8 +8,8 @@ class UINoticeMessageBox_LockSellItem : public UIFrameWnd { public: UINoticeMessageBox_LockSellItem(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Shop/UInCash_CallWnd.h b/Source/UI/Shop/UInCash_CallWnd.h index 8a714b35d..9c4ffec28 100644 --- a/Source/UI/Shop/UInCash_CallWnd.h +++ b/Source/UI/Shop/UInCash_CallWnd.h @@ -16,15 +16,15 @@ class UIStaticText; class UInCashWnd : public UIItemBaseWnd { public: UInCashWnd(); - bool Slot03() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot11() override; + bool NeedsFrameRefresh() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void StoreInfo() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; ITEM_INFO ItemAt(int x, int y); void DrawItems(); @@ -53,7 +53,7 @@ public: class UInCash_CallWnd : public UIFrameWnd { public: UInCash_CallWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; diff --git a/Source/UI/Shortcuts/ShortcutActivation.cpp b/Source/UI/Shortcuts/ShortcutActivation.cpp index 7920ee216..e69020cee 100644 --- a/Source/UI/Shortcuts/ShortcutActivation.cpp +++ b/Source/UI/Shortcuts/ShortcutActivation.cpp @@ -6,7 +6,7 @@ // OFFSET: 0x00930900 // FUNCTION: fn_12689 -void UIShortCutWnd::Slot26(int x, int y) { +void UIShortCutWnd::OnLBtnDblClk(int x, int y) { const int column = this->m_grid.HitTest(x, y, g_session.ItemSlotActive(), g_session.m_hotkeyPage); if (column == -1) { return; diff --git a/Source/UI/Shortcuts/ShortcutControls.cpp b/Source/UI/Shortcuts/ShortcutControls.cpp index d39acf2e9..77c28d6f0 100644 --- a/Source/UI/Shortcuts/ShortcutControls.cpp +++ b/Source/UI/Shortcuts/ShortcutControls.cpp @@ -10,7 +10,7 @@ // OFFSET: 0x0092A190 // FUNCTION: fn_12654 -void UIShortCutWnd::Slot15(int, int) { +void UIShortCutWnd::OnCreate(int, int) { this->AddCloseButton("F12", 0)->Move(this->geometry.width - 10, 0); for (int index = 0; index < 36; ++index) { diff --git a/Source/UI/Shortcuts/ShortcutCooldowns.cpp b/Source/UI/Shortcuts/ShortcutCooldowns.cpp index 2e0084c50..b2ee4e5b6 100644 --- a/Source/UI/Shortcuts/ShortcutCooldowns.cpp +++ b/Source/UI/Shortcuts/ShortcutCooldowns.cpp @@ -451,11 +451,11 @@ void UIQuickSlotWnd::Paint() { // OFFSET: 0x00924A50 // FUNCTION: fn_12646 -void UIQuickSlotWnd::Slot15(int, int) {} +void UIQuickSlotWnd::OnCreate(int, int) {} // OFFSET: 0x00930610 // FUNCTION: fn_12686 -void UIQuickSlotWnd::Slot26(int x, int y) { +void UIQuickSlotWnd::OnLBtnDblClk(int x, int y) { if (g_session.GetOption(5) > 0 || static_cast(y) > 23) { return; } @@ -482,7 +482,7 @@ void UIQuickSlotWnd::Slot26(int x, int y) { // OFFSET: 0x00932E80 // FUNCTION: fn_12718 -void UIQuickSlotWnd::Slot19() { +void UIQuickSlotWnd::OnProcess() { this->Invalidate(); } @@ -515,7 +515,7 @@ int UIQuickSlotWnd::SlotAt(int x, int y) { // OFFSET: 0x00932E90 // FUNCTION: fn_12719 -void UISeekPartyWnd::Slot19() { +void UISeekPartyWnd::OnProcess() { int frameCounts[6] = {5, 5, 17, 11, 11, 11}; const std::uint32_t now = GetTickCount(); this->m_frameElapsed = now - this->m_frameTick; @@ -529,7 +529,7 @@ void UISeekPartyWnd::Slot19() { // OFFSET: 0x00940EE0 // FUNCTION: fn_12783 -void UIQuickSlotWnd::Slot11() { +void UIQuickSlotWnd::StoreInfo() { if (this->m_saved) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; @@ -540,7 +540,7 @@ void UIQuickSlotWnd::Slot11() { // OFFSET: 0x00940F60 // FUNCTION: fn_12785 -void UISeekPartyMBWnd::Slot11() { +void UISeekPartyMBWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.width; this->m_saved->height = this->geometry.height; @@ -597,7 +597,7 @@ int UISeekPartyWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argumen // OFFSET: 0x00940FA0 // FUNCTION: fn_12786 -void UISeekPartyWnd::Slot11() { +void UISeekPartyWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.width; this->m_saved->height = this->geometry.height; @@ -608,7 +608,7 @@ void UISeekPartyWnd::Slot11() { // OFFSET: 0x00940F20 // FUNCTION: fn_12784 -void UISeekPartyListWnd::Slot11() { +void UISeekPartyListWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.width; this->m_saved->height = this->geometry.height; diff --git a/Source/UI/Shortcuts/ShortcutDetails.cpp b/Source/UI/Shortcuts/ShortcutDetails.cpp index 518e774fc..cc094c386 100644 --- a/Source/UI/Shortcuts/ShortcutDetails.cpp +++ b/Source/UI/Shortcuts/ShortcutDetails.cpp @@ -8,7 +8,7 @@ // OFFSET: 0x009332D0 // FUNCTION: fn_12724 -void UIShortCutWnd::Slot32(int x, int y) { +void UIShortCutWnd::OnRBtnDown(int x, int y) { UIWindow& window = *this; ShortcutGrid& grid = this->m_grid; const NormalItemSlot* const* slots = this->m_slots; diff --git a/Source/UI/Shortcuts/ShortcutDrop.cpp b/Source/UI/Shortcuts/ShortcutDrop.cpp index 4c0b8f85e..d9888d301 100644 --- a/Source/UI/Shortcuts/ShortcutDrop.cpp +++ b/Source/UI/Shortcuts/ShortcutDrop.cpp @@ -50,7 +50,7 @@ namespace { // OFFSET: 0x00917640 // FUNCTION: fn_12589 -void UIShortCutWnd::Slot10(int x, int y, std::intptr_t argument) { +void UIShortCutWnd::DragAndDrop(int x, int y, std::intptr_t argument) { UIWindow& window = *this; ShortcutGrid& grid = this->m_grid; const ModeDragState& value = *reinterpret_cast(argument); @@ -225,7 +225,7 @@ namespace { // OFFSET: 0x00917100 // FUNCTION: fn_12588 -void UIQuickSlotWnd::Slot10(int x, int y, std::intptr_t argument) { +void UIQuickSlotWnd::DragAndDrop(int x, int y, std::intptr_t argument) { const ModeDragState& value = *reinterpret_cast(argument); std::list& records = g_session.m_requestTimers; diff --git a/Source/UI/Shortcuts/ShortcutPress.cpp b/Source/UI/Shortcuts/ShortcutPress.cpp index 2490c5d73..6626ebff0 100644 --- a/Source/UI/Shortcuts/ShortcutPress.cpp +++ b/Source/UI/Shortcuts/ShortcutPress.cpp @@ -10,13 +10,13 @@ // OFFSET: 0x009310E0 // FUNCTION: fn_12699 -void UIShortCutWnd::Slot25(int x, int y) { +void UIShortCutWnd::OnLBtnDown(int x, int y) { ShortcutGrid& grid = this->m_grid; const NormalItemSlot* const* slots = this->m_slots; const NormalItemSlot* const* itemSlots = this->m_itemSlots; const int columnOffset = x - 15; if (columnOffset >= 261 || x < 15 || y < 4) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); return; } diff --git a/Source/UI/Shortcuts/ShortcutTooltip.cpp b/Source/UI/Shortcuts/ShortcutTooltip.cpp index 116f68891..6a8bb1271 100644 --- a/Source/UI/Shortcuts/ShortcutTooltip.cpp +++ b/Source/UI/Shortcuts/ShortcutTooltip.cpp @@ -10,7 +10,7 @@ // OFFSET: 0x00932050 // FUNCTION: fn_12711 -void UIShortCutWnd::Slot28(int x, int y) { +void UIShortCutWnd::OnMouseHover(int x, int y) { UIWindow& window = *this; ShortcutGrid& grid = this->m_grid; const bool itemSlotActive = g_session.ItemSlotActive(); diff --git a/Source/UI/Shortcuts/ShortcutVisibility.cpp b/Source/UI/Shortcuts/ShortcutVisibility.cpp index 98410f70d..16985b975 100644 --- a/Source/UI/Shortcuts/ShortcutVisibility.cpp +++ b/Source/UI/Shortcuts/ShortcutVisibility.cpp @@ -23,7 +23,7 @@ bool UIWindowMgr::ShowWindowById(int id, int visible) { UIWindow* window = this->window_01C8; if (visible == 0) { - window->Slot11(); + window->StoreInfo(); return true; } @@ -66,7 +66,7 @@ bool UIWindowMgr::ShowWindowById(int id, int visible) { UIWindow* window = this->window_0230; if (visible == 0) { - window->Slot11(); + window->StoreInfo(); return true; } diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp index ca8d66a09..3cf15d721 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp @@ -30,9 +30,9 @@ // OFFSET: 0x00930EB0 // FUNCTION: fn_12696 -void UIQuickSlotWnd::Slot25(int x, int y) { +void UIQuickSlotWnd::OnLBtnDown(int x, int y) { if (x > 59 && x < this->geometry.width) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); return; } @@ -68,7 +68,7 @@ void UIQuickSlotWnd::Slot25(int x, int y) { // OFFSET: 0x00931920 // FUNCTION: fn_12709 -void UIQuickSlotWnd::Slot28(int x, int y) { +void UIQuickSlotWnd::OnMouseHover(int x, int y) { int index; if (static_cast(y) <= 23 && (x <= 58 || x >= this->geometry.width)) { index = (x - 4) / 29; @@ -118,7 +118,7 @@ void UIQuickSlotWnd::Slot28(int x, int y) { // OFFSET: 0x00932F80 // FUNCTION: fn_12722 -void UIQuickSlotWnd::Slot32(int x, int y) { +void UIQuickSlotWnd::OnRBtnDown(int x, int y) { if (x > 59 && x < this->geometry.width) { return; } diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.h b/Source/UI/Shortcuts/UIQuickSlotWnd.h index 726c4cbd0..66285daf3 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.h +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.h @@ -23,15 +23,15 @@ struct QuickSlotWndInfo; class UIQuickSlotWnd : public UIFrameWnd { public: UIQuickSlotWnd(); - void Slot10(int x, int y, std::intptr_t argument) override; - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void DragAndDrop(int x, int y, std::intptr_t argument) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; int SlotX(int slot); int SlotAt(int x, int y); diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 3196e3ec6..e7832d1ed 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -97,7 +97,7 @@ UIShortCutWnd::~UIShortCutWnd() = default; // OFFSET: 0x0091E800 // FUNCTION: fn_12629 -bool UIShortCutWnd::Slot03() { +bool UIShortCutWnd::NeedsFrameRefresh() { return true; } @@ -115,7 +115,7 @@ void UIShortCutWnd::Move(int x, int y) { // OFFSET: 0x00940FE0 // FUNCTION: fn_12787 -void UIShortCutWnd::Slot11() { +void UIShortCutWnd::StoreInfo() { if (this->m_saved) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; @@ -140,7 +140,7 @@ void UIShortCutWnd::Show(int visible) { // OFFSET: 0x00932F30 // FUNCTION: fn_12720 -void UIShortCutWnd::Slot19() { +void UIShortCutWnd::OnProcess() { const int x = (g_mouse.x - this->geometry.x); const int y = (g_mouse.y - this->geometry.y); const int hovered = this->m_grid.HitTest(x, y, g_session.ItemSlotActive(), g_session.m_hotkeyPage); @@ -152,9 +152,9 @@ void UIShortCutWnd::Slot19() { // OFFSET: 0x009316F0 // FUNCTION: fn_12705 -void UIShortCutWnd::Slot31(int x, int y) { - this->UIFrameWnd::Slot31(x, y); - this->Slot11(); +void UIShortCutWnd::OnLBtnUp(int x, int y) { + this->UIFrameWnd::OnLBtnUp(x, y); + this->StoreInfo(); } // INLINED @@ -287,7 +287,7 @@ __forceinline void UIShortCutWnd::ResizeRows() { break; } this->m_increase->Invalidate(); - this->Slot11(); + this->StoreInfo(); } // INLINED @@ -481,7 +481,7 @@ int UIShortCutWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // OFFSET: 0x0091C9B0 // FUNCTION: fn_12618 -bool UINewChatWnd::Slot42(void* output) { +bool UINewChatWnd::GetCustomTransBoxInfo(void* output) { std::memcpy(output, &this->m_inputX, 28); return true; } @@ -579,15 +579,15 @@ void UINewChatWnd::SaveChatWndInfo() { // OFFSET: 0x009328F0 // FUNCTION: fn_12712 -void UINewChatWnd::Slot27(int x, int y) { +void UINewChatWnd::OnMouseMove(int x, int y) { if (g_windowMgr.Capture() == this && g_chatInputFlag == 1) { - this->UIFrameWnd::Slot27(x, y); + this->UIFrameWnd::OnMouseMove(x, y); } } // OFFSET: 0x00930D40 // FUNCTION: fn_12695 -void UINewChatWnd::Slot25(int x, int y) { +void UINewChatWnd::OnLBtnDown(int x, int y) { if (static_cast(y - 1) <= 19) { if (static_cast(this->geometry.unknown_0030) <= 0) { return; @@ -619,7 +619,7 @@ void UINewChatWnd::Slot25(int x, int y) { } } else { g_windowMgr.SetFocus(this->m_inputEdit); - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } @@ -665,13 +665,13 @@ void UINewChatWnd::Paint() { // OFFSET: 0x009313E0 // FUNCTION: fn_12703 -void UINewChatWnd::Slot31(int x, int y) { - this->UIFrameWnd::Slot31(x, y); +void UINewChatWnd::OnLBtnUp(int x, int y) { + this->UIFrameWnd::OnLBtnUp(x, y); } // OFFSET: 0x009313F0 // FUNCTION: fn_12704 -void UIRoMapWnd::Slot31(int x, int y) { +void UIRoMapWnd::OnLBtnUp(int x, int y) { this->unknown_01FC.clear(); unsigned int mapIndex = 0; @@ -740,7 +740,7 @@ void UIMemorialDunWnd::Move(int x, int y) { // OFFSET: 0x00921260 // FUNCTION: fn_12641 -void UIMemorialDunWnd::Slot15(int, int) { +void UIMemorialDunWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("Alt+B", 0); @@ -862,7 +862,7 @@ void UIMemorialDunWnd::Paint() { // OFFSET: 0x0092AFE0 // FUNCTION: fn_12656 -void UISubChatMiniWnd::Slot15(int, int) { +void UISubChatMiniWnd::OnCreate(int, int) { this->Resize(this->m_rowHeight * this->unknown_00B4, this->m_offsetY); } @@ -878,7 +878,7 @@ int UISubChatMiniWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, st this->Move(b, c - this->m_offsetY); break; case 202: - this->Slot25(this->m_rowHeight * b + 1, 0); + this->OnLBtnDown(this->m_rowHeight * b + 1, 0); break; } return 0; @@ -912,7 +912,7 @@ void UISubChatMiniWnd::Paint() { // OFFSET: 0x00931330 // FUNCTION: fn_12701 -void UISubChatMiniWnd::Slot25(int x, int) { +void UISubChatMiniWnd::OnLBtnDown(int x, int) { if (x > 0 && x <= this->m_rowHeight) { g_subChatMiniFirstCollapsed = !g_subChatMiniFirstCollapsed; } else { @@ -924,7 +924,7 @@ void UISubChatMiniWnd::Slot25(int x, int) { // OFFSET: 0x00940EB0 // FUNCTION: fn_12782 -void UINewChatWnd::Slot11() { +void UINewChatWnd::StoreInfo() { g_windowMgr.unknown_004C = this->geometry.unknown_0030; g_windowMgr.unknown_0038 = this->geometry.height; g_windowMgr.unknown_0030 = this->geometry.x; @@ -1362,7 +1362,7 @@ int UISubChatHisWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argume // OFFSET: 0x009230A0 // FUNCTION: fn_12644 -void UINewChatWnd::Slot15(int width, int height) { +void UINewChatWnd::OnCreate(int width, int height) { if (height > this->m_inputAreaHeight) { int rows = (height - (static_cast(this->geometry.unknown_0030) + this->m_inputOffsetY + 74)) / 42 + 1; if (rows > 4) { diff --git a/Source/UI/Shortcuts/UIShortCutWnd.h b/Source/UI/Shortcuts/UIShortCutWnd.h index 6845c89f7..06ba72d45 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.h +++ b/Source/UI/Shortcuts/UIShortCutWnd.h @@ -15,19 +15,19 @@ public: UIShortCutWnd(); ~UIShortCutWnd() override; - bool Slot03() override; + bool NeedsFrameRefresh() override; void Move(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot11() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void StoreInfo() override; void Show(int visible) override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; friend class CGameMode; diff --git a/Source/UI/Skill/UISkillDescribeWnd.h b/Source/UI/Skill/UISkillDescribeWnd.h index bf47af86e..5fc5298d5 100644 --- a/Source/UI/Skill/UISkillDescribeWnd.h +++ b/Source/UI/Skill/UISkillDescribeWnd.h @@ -21,10 +21,10 @@ public: /* 0108 */ UITextViewer* m_text; /* 010C */ UIBitmapButton* m_delayButton; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - bool Slot42(void* output) override; - void Slot43() override; + bool GetCustomTransBoxInfo(void* output) override; + void DrawTransBox() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; diff --git a/Source/UI/Skill/UISkillListWnd.h b/Source/UI/Skill/UISkillListWnd.h index 806a1a68b..1471e8b93 100644 --- a/Source/UI/Skill/UISkillListWnd.h +++ b/Source/UI/Skill/UISkillListWnd.h @@ -13,16 +13,16 @@ class UISkillListWnd : public UIFrameWnd { public: UISkillListWnd(); - bool Slot03() override; - void Slot11() override; - void Slot15(int width, int height) override; + bool NeedsFrameRefresh() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; __declspec(noinline) int SkillAt(int x, int y); diff --git a/Source/UI/Skill/UISkillNameChangeWnd.h b/Source/UI/Skill/UISkillNameChangeWnd.h index d419c2397..4dbd2faf1 100644 --- a/Source/UI/Skill/UISkillNameChangeWnd.h +++ b/Source/UI/Skill/UISkillNameChangeWnd.h @@ -14,7 +14,7 @@ public: /* 00B8 */ int m_skillId; /* 00BC */ std::string m_name; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; diff --git a/Source/UI/SkillDelayInfo/SkillDelayInfo.h b/Source/UI/SkillDelayInfo/SkillDelayInfo.h index 55cf655b6..f264a1ea7 100644 --- a/Source/UI/SkillDelayInfo/SkillDelayInfo.h +++ b/Source/UI/SkillDelayInfo/SkillDelayInfo.h @@ -25,8 +25,8 @@ public: class CUIDelayItem : public CUIListItem { public: CUIDelayItem(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; /* 00E8 */ CUIStaticText* level; @@ -39,8 +39,8 @@ class CUITime : public CUIControl { public: __declspec(noinline) CUITime(); ~CUITime() override; - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; __declspec(noinline) void SetTime(int milliseconds); @@ -55,11 +55,11 @@ class CUITextViewer; class CUISkillDelayInfo : public CUIFrameWnd { public: __declspec(noinline) CUISkillDelayInfo(); - void Slot15(int width, int height) override; - void Slot16() override; + void OnCreate(int width, int height) override; + void OnInit() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - virtual void Slot53(); + virtual void Initialize(); void OnButtonClick(); void OnClose(); diff --git a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp index d3ab4b008..4e4684d4e 100644 --- a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp +++ b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp @@ -21,13 +21,13 @@ template <> void CUIListBoxEx::Paint(); template <> -void CUIListBoxEx::Slot35(int value); +void CUIListBoxEx::OnWheel(int value); template <> void CUIListBoxEx::OnScroll(int position); template <> void CUIListBoxEx::AddNewItem(); template <> -void CUIListBoxEx::Slot53(int resolveSkin); +void CUIListBoxEx::LoadSkin(int resolveSkin); template <> void CUIListBoxEx::Resize(int width, int height); @@ -131,20 +131,20 @@ void CUIListBoxEx: // OFFSET: 0x00A719E0 // FUNCTION: fn_16807 -void CUISkillDelayInfo::Slot53() { +void CUISkillDelayInfo::Initialize() { this->unknown_00B4 = 0; this->m_resolveSkin = true; this->Resize(345, 379); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); this->SetSkinColors(0, 0, 0, 0); } // OFFSET: 0x00A71B50 // FUNCTION: fn_16808 template <> -void CUIListBoxEx::Slot15(int width, int height) { +void CUIListBoxEx::OnCreate(int width, int height) { this->scrollBar = new CUIVScrollBar(); this->scrollBar->Show(0); this->scrollBar->SetOnChange([this](int position) { this->OnScroll(position); }); @@ -155,7 +155,7 @@ namespace SkillDelayInfo { // OFFSET: 0x00A71D60 // FUNCTION: fn_16809 -void CUIDelayItem::Slot15(int width, int height) { +void CUIDelayItem::OnCreate(int width, int height) { this->level = new CUIStaticText(); this->level->SetSize(44, 21); this->level->Move(0, 0); @@ -188,7 +188,7 @@ void CUIDelayItem::Slot15(int width, int height) { // OFFSET: 0x00A75A00 // FUNCTION: fn_16811 -void CUITime::Slot15(int width, int height) { +void CUITime::OnCreate(int width, int height) { this->text = new CUIStaticText(); this->text->SetSize(60, 21); this->text->Move(5, 0); @@ -219,11 +219,11 @@ void CUIListBoxEx: // OFFSET: 0x00A75C90 // FUNCTION: fn_16813 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -297,7 +297,7 @@ void CUIListBoxEx: // OFFSET: 0x00A75F80 // FUNCTION: fn_16815 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { CResPtr* images = reinterpret_cast*>(reinterpret_cast(this) + 0x80); images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); @@ -497,14 +497,14 @@ void CUITime::Paint() { // OFFSET: 0x00A77F10 // FUNCTION: fn_16885 -void CUIDelayItem::Slot16() { +void CUIDelayItem::OnInit() { this->backgroundColor = SkinPaletteColor(ResourceMgr::Instance(), SkinPaletteCell{0, 2}, true); this->borderColor = SkinPaletteColor(ResourceMgr::Instance(), SkinPaletteCell{6, 2}, true); } // OFFSET: 0x00A78180 // FUNCTION: fn_16887 -void CUITime::Slot16() { +void CUITime::OnInit() { } // OFFSET: 0x00A78A10 @@ -599,7 +599,7 @@ void CUISkillDelayInfo::Paint() { // OFFSET: 0x00A77F70 // FUNCTION: fn_16886 -void CUISkillDelayInfo::Slot16() { +void CUISkillDelayInfo::OnInit() { this->backgroundColor = SkinPaletteColor(ResourceMgr::Instance(), SkinPaletteCell{0, 2}, true); this->borderColor = SkinPaletteColor(ResourceMgr::Instance(), SkinPaletteCell{6, 2}, true); @@ -621,7 +621,7 @@ void CUISkillDelayInfo::Slot16() { // OFFSET: 0x00A720A0 // FUNCTION: fn_16810 -void CUISkillDelayInfo::Slot15(int width, int height) { +void CUISkillDelayInfo::OnCreate(int width, int height) { this->titleBar = new CUITitleBar(); this->titleBar->SetSize(345, 17); this->titleBar->Move(0, 0); diff --git a/Source/UI/Status/UIStatusWnd.h b/Source/UI/Status/UIStatusWnd.h index e65fecacf..7153785d2 100644 --- a/Source/UI/Status/UIStatusWnd.h +++ b/Source/UI/Status/UIStatusWnd.h @@ -21,14 +21,14 @@ public: /* 00F8 */ UIBmpTextButton* m_expandButton; /* 00FC */ unsigned char m_extended; - bool Slot03() override; - void Slot11() override; + bool NeedsFrameRefresh() override; + void StoreInfo() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; void ValidatePlacement(); }; diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index e5b4be75a..7108eafcc 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -19,7 +19,7 @@ // OFFSET: 0x00829B50 // FUNCTION: fn_10341 -void UIStylingshopTabParentWnd::Slot15(int, int) { +void UIStylingshopTabParentWnd::OnCreate(int, int) { } // OFFSET: 0x00829B60 @@ -119,7 +119,7 @@ void UIStylingshopTabParentWnd::Paint() { // OFFSET: 0x0082A0A0 // FUNCTION: fn_10353 -void UISlotForSelectWnd::Slot26(int, int) { +void UISlotForSelectWnd::OnLBtnDblClk(int, int) { if (this->parent) { this->parent->SendMsg(nullptr, 121, 0, 0, 0, 0); } @@ -127,15 +127,15 @@ void UISlotForSelectWnd::Slot26(int, int) { // OFFSET: 0x0082A0C0 // FUNCTION: fn_10354 -void UI2ndCostumeCheckBox::Slot25(int x, int y) { +void UI2ndCostumeCheckBox::OnLBtnDown(int x, int y) { if (this->m_disabled == 0 && this->geometry.unknown_0030 != 1) { - UICheckBox::Slot25(x, y); + UICheckBox::OnLBtnDown(x, y); } } // OFFSET: 0x0082A0E0 // FUNCTION: fn_10355 -void UISlotForSelectWnd::Slot25(int x, int y) { +void UISlotForSelectWnd::OnLBtnDown(int x, int y) { if (this->parent) { this->parent->SendMsg(nullptr, 6, this->geometry.id, x, y, 0); } @@ -143,7 +143,7 @@ void UISlotForSelectWnd::Slot25(int x, int y) { // OFFSET: 0x0082A110 // FUNCTION: fn_10356 -void UIStylingShopButton::Slot31(int, int) { +void UIStylingShopButton::OnLBtnUp(int, int) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -178,7 +178,7 @@ void UIStylingShopButton::Slot31(int, int) { // OFFSET: 0x0082A1C0 // FUNCTION: fn_10357 -void UIStylingShopButton::Slot28(int, int) { +void UIStylingShopButton::OnMouseHover(int, int) { if (!this->m_names[1].empty()) { return; } @@ -191,7 +191,7 @@ void UIStylingShopButton::Slot28(int, int) { // OFFSET: 0x0082A210 // FUNCTION: fn_10358 -void UIStylingShopButton::Slot27(int x, int y) { +void UIStylingShopButton::OnMouseMove(int x, int y) { if (this->m_disabled == 0 && g_windowMgr.Capture() == this && x >= 0 && x < this->geometry.width && y >= 0 && y < this->geometry.height && this->geometry.unknown_0030 != 2) { this->geometry.unknown_0030 = 2; @@ -201,7 +201,7 @@ void UIStylingShopButton::Slot27(int x, int y) { // OFFSET: 0x0082A270 // FUNCTION: fn_10359 -void UIStylingShopWnd::Slot19() { +void UIStylingShopWnd::OnProcess() { for (std::map::iterator it = this->m_tabs.begin(); it != this->m_tabs.end(); ++it) { int id = it->first->geometry.id; if (id == 200) { @@ -222,7 +222,7 @@ void UIStylingShopWnd::Slot19() { // OFFSET: 0x0082A330 // FUNCTION: fn_10360 -void UIAccBitmapButton::Slot33(int, int) { +void UIAccBitmapButton::OnRBtnUp(int, int) { this->parent->SendMsg(this, 101, this->geometry.id, this->m_argument, 0, 0); } @@ -1538,7 +1538,7 @@ void UIStylingShopWnd::AddTab(const char* normal, const char* hover, const char* // OFFSET: 0x00829220 // FUNCTION: fn_10339 -void UISlotOfMyStyleWnd::Slot15(int, int) { +void UISlotOfMyStyleWnd::OnCreate(int, int) { UIDisplayCharacter* display = new (std::nothrow) UIDisplayCharacter(); if (display) { *reinterpret_cast(&display->unknown_00B0) = 1; @@ -1562,7 +1562,7 @@ void UISlotOfMyStyleWnd::Slot15(int, int) { // OFFSET: 0x008294D0 // FUNCTION: fn_10340 -void UIStylingShopWnd::Slot15(int, int) { +void UIStylingShopWnd::OnCreate(int, int) { this->AddCloseButton("", 0); UIBasicStylingWnd* basic = new (std::nothrow) UIBasicStylingWnd(); @@ -1635,7 +1635,7 @@ void UIDisplayCharacter::Paint() { FuncDrawWNDChar draw( this, this->geometry.width / 2, this->geometry.height - 33, static_cast(player->unknown_0260), static_cast(player->GetEffectiveJob(-1)), player->unknown_04D4, static_cast(this->job), static_cast(this->unknown_008C), static_cast(this->unknown_00A4), - static_cast(this->unknown_009C), static_cast(this->unknown_00A0), this->unknown_0088, player->unknown_02CC, player->Slot56(), + static_cast(this->unknown_009C), static_cast(this->unknown_00A0), this->unknown_0088, player->unknown_02CC, player->GetMadogearType(), g_session.GetBodyStyle(player->GetEffectiveJob(-1), this->unknown_0098, this->job), this->unknown_0094, this->unknown_0084, 0, this->unknown_00A8 ); draw.Draw(false); @@ -2158,7 +2158,7 @@ void UIMyStyleWnd::LoadLikeList() { // OFFSET: 0x00828CA0 // FUNCTION: fn_10337 -void UIMyStyleWnd::Slot15(int, int) { +void UIMyStyleWnd::OnCreate(int, int) { this->LoadLikeList(); UISlotForSelectWnd* select = new UISlotForSelectWnd(); @@ -2210,7 +2210,7 @@ void UIMyStyleWnd::Slot15(int, int) { } // OFFSET: 0x008280F0 // FUNCTION: fn_10333 -void UIAccessoryCusWnd::Slot15(int, int) { +void UIAccessoryCusWnd::OnCreate(int, int) { this->m_display = new (std::nothrow) UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); @@ -2310,7 +2310,7 @@ void UIDisplayCharacter::CreateButtons() { // OFFSET: 0x00828B90 // FUNCTION: fn_10336 -void UIDisplayCharacter::Slot15(int width, int height) { +void UIDisplayCharacter::OnCreate(int width, int height) { this->Resize(width, height); this->unknown_00A8 = timeGetTime(); if (!*reinterpret_cast(&this->unknown_00B0)) { @@ -2331,7 +2331,7 @@ void UIDisplayCharacter::Slot15(int width, int height) { // OFFSET: 0x00829080 // FUNCTION: fn_10338 -void UIShowInfoWnd::Slot15(int, int) { +void UIShowInfoWnd::OnCreate(int, int) { for (int i = 0; i < 8; ++i) { this->m_checks[i] = new (std::nothrow) UICheckBox(); this->m_checks[i]->SetSize(17, 13); @@ -2356,7 +2356,7 @@ void UIShowInfoWnd::Slot15(int, int) { // OFFSET: 0x00827D00 // FUNCTION: fn_10332 -void UI2ndCostumeWnd::Slot15(int, int) { +void UI2ndCostumeWnd::OnCreate(int, int) { this->m_display = new (std::nothrow) UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); @@ -2405,7 +2405,7 @@ void UI2ndCostumeWnd::Slot15(int, int) { // OFFSET: 0x00828380 // FUNCTION: fn_10334 -void UIBasicStylingWnd::Slot15(int, int) { +void UIBasicStylingWnd::OnCreate(int, int) { this->m_display = new (std::nothrow) UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); @@ -2459,7 +2459,7 @@ void UIBasicStylingWnd::Slot15(int, int) { // OFFSET: 0x008288C0 // FUNCTION: fn_10335 -void UICostumeChangeWnd::Slot15(int, int) { +void UICostumeChangeWnd::OnCreate(int, int) { this->m_display = new UIDisplayCharacter(); this->m_display->SetSize(static_cast(roundf(static_cast(this->geometry.width) * 0.552f)), static_cast(roundf(static_cast(this->geometry.height) * 0.8f))); diff --git a/Source/UI/StylingShop/UIStylingShopWnd.h b/Source/UI/StylingShop/UIStylingShopWnd.h index 370f6b5eb..82ea10c49 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.h +++ b/Source/UI/StylingShop/UIStylingShopWnd.h @@ -22,7 +22,7 @@ public: void SelectPreviousStyle(const char* table, int* goods); std::string GetStyleTable(const int& type); void CreateButtons(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -61,7 +61,7 @@ public: bool SendStyleChange(); void DrawPaymentItem(const int& type, const int& zeny, const int& itemId, bool enabled, const int& row); void DrawPayments(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -98,7 +98,7 @@ public: /* 0085 */ bool unknown_0085; /* 0086 */ bool unknown_0086; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -106,7 +106,7 @@ public: class UICostumeChangeWnd : public UIStylingshopTabParentWnd { public: UICostumeChangeWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -123,8 +123,8 @@ public: /* 00B8 */ UIDisplayCharacter* m_preview; /* 00BC */ std::map m_tabs; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; void AddTab(const char* normal, const char* hover, const char* pressed, const int& id, UIStylingshopTabParentWnd* tab, const char* tooltip); void RefreshFavoriteButton(); @@ -140,7 +140,7 @@ class UI2ndCostumeWnd : public UIStylingshopTabParentWnd { public: UI2ndCostumeWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -154,7 +154,7 @@ public: // INLINED explicit UIAccessoryCusWnd() : UIStylingshopTabParentWnd() { } - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -179,7 +179,7 @@ public: class UIBasicStylingWnd : public UIStylingshopTabParentWnd { public: UIBasicStylingWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -194,7 +194,7 @@ public: UIMyStyleWnd(); void LoadLikeList(); void SaveLikeList(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -208,7 +208,7 @@ public: class UISlotOfMyStyleWnd : public UIStylingshopTabParentWnd { public: UISlotOfMyStyleWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -218,8 +218,8 @@ public: // INLINED explicit UISlotForSelectWnd() : UIWindow(0) { } - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; }; class UI2ndCostumeCheckBox : public UICheckBox { @@ -227,7 +227,7 @@ public: // INLINED UI2ndCostumeCheckBox() : UICheckBox() { } - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; }; class UIStylingShopButton : public UIBitmapButton { @@ -243,9 +243,9 @@ public: int Argument() const { return this->m_argument; } - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; }; class UIAccBitmapButton : public UIBitmapButton { @@ -261,7 +261,7 @@ public: int Argument() const { return this->m_argument; } - void Slot33(int x, int y) override; + void OnRBtnUp(int x, int y) override; /* 0120 */ int m_slot; /* 0124 */ int m_itemId; diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index 1d25416e4..4cdbc88fc 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -62,14 +62,14 @@ namespace LineCutter { } void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int value) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int value) override; /* 007C */ std::uint32_t m_color; /* 0080 */ int m_fontHeight; @@ -89,7 +89,7 @@ public: explicit UIEmotion(const char* sprite, const char* action); explicit UIEmotion(); - void Slot19() override; + void OnProcess() override; void Paint() override; /* 007C */ unsigned m_animation; @@ -110,8 +110,8 @@ public: explicit UIItemImage(); void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; protected: /* 007C */ std::string m_itemId; @@ -560,25 +560,25 @@ std::string FormatMessageArguments(std::string value, int messageId) { // OFFSET: 0x0083B250 // FUNCTION: fn_10473 -void LineCutter::UIText::Slot25(int x, int y) { +void LineCutter::UIText::OnLBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot25(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnDown(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x0083B220 // FUNCTION: fn_10472 -void LineCutter::UIText::Slot26(int x, int y) { +void LineCutter::UIText::OnLBtnDblClk(int x, int y) { if (this->parent) { - this->parent->Slot26(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnDblClk(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x0083B400 // FUNCTION: fn_10476 -void LineCutter::UIText::Slot27(int x, int y) { +void LineCutter::UIText::OnMouseMove(int x, int y) { if (this->parent) { - this->parent->Slot27(x + this->geometry.x, y + this->geometry.y); + this->parent->OnMouseMove(x + this->geometry.x, y + this->geometry.y); } } @@ -592,33 +592,33 @@ void LineCutter::UIText::ResetCursor(int x, int y) { // OFFSET: 0x0083B280 // FUNCTION: fn_10474 -void LineCutter::UIText::Slot31(int x, int y) { +void LineCutter::UIText::OnLBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot31(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnUp(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x0083B630 // FUNCTION: fn_10480 -void LineCutter::UIText::Slot32(int x, int y) { +void LineCutter::UIText::OnRBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot32(x + this->geometry.x, y + this->geometry.y); + this->parent->OnRBtnDown(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x0083B660 // FUNCTION: fn_10481 -void LineCutter::UIText::Slot33(int x, int y) { +void LineCutter::UIText::OnRBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot33(x + this->geometry.x, y + this->geometry.y); + this->parent->OnRBtnUp(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x0083B690 // FUNCTION: fn_10482 -void LineCutter::UIText::Slot35(int value) { +void LineCutter::UIText::OnWheel(int value) { if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -645,7 +645,7 @@ void LineCutter::UIText::Paint() { // OFFSET: 0x0083B460 // FUNCTION: fn_10478 -void UIEmotion::Slot19() { +void UIEmotion::OnProcess() { if (!this->m_action || this->m_action->Speed(this->m_animation) == 0.0f) { return; } @@ -1682,7 +1682,7 @@ void UIEmotion::Paint() { // OFFSET: 0x0083B2B0 // FUNCTION: fn_10475 -void UIItemImage::Slot28(int, int) { +void UIItemImage::OnMouseHover(int, int) { ITEM_INFO item; item.itemId = this->m_itemId; item.identified = 1; @@ -1699,7 +1699,7 @@ void UIItemImage::Slot28(int, int) { // OFFSET: 0x0083B550 // FUNCTION: fn_10479 -void UIItemImage::Slot32(int, int) { +void UIItemImage::OnRBtnDown(int, int) { ITEM_INFO item; item.itemId = this->m_itemId; item.identified = 1; diff --git a/Source/UI/Text/UIAchWnd.cpp b/Source/UI/Text/UIAchWnd.cpp index 1cf5b17cf..abb3e6be0 100644 --- a/Source/UI/Text/UIAchWnd.cpp +++ b/Source/UI/Text/UIAchWnd.cpp @@ -103,7 +103,7 @@ void UIAchListWnd::Create(int width, int height, int rows) { this->AddChild(this->buttons[index]); } - this->Slot15(width, height); + this->OnCreate(width, height); this->Resize(width, height); } @@ -199,7 +199,7 @@ bool UIAchTab::HitTestTab(int x, int y, int* a, int* b) { void UIAchievementWnd::CreateTab() { UIAchTab* tab = new (std::nothrow) UIAchTab(); this->tab = tab; - tab->Slot15(0, 0); + tab->OnCreate(0, 0); tab->tabWidth = 102; tab->groupHeight = 40; tab->subHeight = 26; @@ -244,10 +244,10 @@ void UIAchievementWnd::CreateTab() { // OFFSET: 0x007B52E0 // FUNCTION: fn_09214 -void UIAchUpperWnd::Slot15(int, int) { +void UIAchUpperWnd::OnCreate(int, int) { UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(); this->unknown_00A4 = gauge; - gauge->Slot15(84, 10); + gauge->OnCreate(84, 10); gauge->Resize(84, 10); gauge->value = 0; gauge->maximum = 100; @@ -257,7 +257,7 @@ void UIAchUpperWnd::Slot15(int, int) { gauge = new (std::nothrow) UICustomGageBar(); this->unknown_00A8 = gauge; - gauge->Slot15(124, 8); + gauge->OnCreate(124, 8); gauge->Resize(124, 8); gauge->value = 0; gauge->maximum = 100; @@ -279,7 +279,7 @@ void UIAchUpperWnd::Slot15(int, int) { // OFFSET: 0x007B54F0 // FUNCTION: fn_09215 -void UIAchViewWnd::Slot15(int, int) { +void UIAchViewWnd::OnCreate(int, int) { const std::string name = "유저인터페이스\\achievement_re\\btn_receive"; this->receiveButton = new UIBitmapButton(); this->receiveButton->SetBitmap((name + "_out.bmp").c_str(), 0, 0); @@ -311,7 +311,7 @@ void UIAchViewWnd::Slot15(int, int) { for (UICustomGageBar*& slot : this->gauges) { UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(); slot = gauge; - gauge->Slot15(254, 10); + gauge->OnCreate(254, 10); gauge->Resize(254, 10); gauge->value = 0; gauge->maximum = 100; @@ -401,7 +401,7 @@ void UIAchListWnd::Paint() { // OFFSET: 0x007B5B60 // FUNCTION: fn_09216 -void UIAchievementWnd::Slot15(int, int) { +void UIAchievementWnd::OnCreate(int, int) { this->AddCloseButton("", 0); this->upper = new (std::nothrow) UIAchUpperWnd(); @@ -666,7 +666,7 @@ void UIToolTipBitmapWnd::Paint() { // OFFSET: 0x007B7B60 // FUNCTION: fn_09236 -void UIAchTab::Slot27(int x, int y) { +void UIAchTab::OnMouseMove(int x, int y) { int group = 0; int sub = 0; this->HitTestTab(x, y, &group, &sub); @@ -677,7 +677,7 @@ void UIAchTab::Slot27(int x, int y) { // OFFSET: 0x007B7BB0 // FUNCTION: fn_09237 -void UIToolTipBitmapWnd::Slot32(int x, int y) { +void UIToolTipBitmapWnd::OnRBtnDown(int x, int y) { if (this->itemId > 0 && this->unknown_00B4 <= x && x <= this->unknown_00B4 + 24 && this->unknown_00B8 <= y && y <= this->unknown_00B8 + 24) { ITEM_INFO item; item.SetItemId(this->itemId); @@ -720,7 +720,7 @@ void UIAchievementWnd::SelectAchievement(int id) { // OFFSET: 0x007B7D90 // FUNCTION: fn_09239 -void UIAchListWnd::Slot35(int delta) { +void UIAchListWnd::OnWheel(int delta) { if (!this->scrollable) { return; } @@ -735,7 +735,7 @@ void UIAchListWnd::Slot35(int delta) { // OFFSET: 0x007B7DD0 // FUNCTION: fn_09240 -void UIAchTab::Slot35(int delta) { +void UIAchTab::OnWheel(int delta) { if (!this->scrollable) { return; } @@ -992,7 +992,7 @@ void UIToolTipBitmapWnd::Set(const char* name, const char* text, int item) { void UIAchSummaryWnd::Show(int visible) { this->geometry.visible = visible; for (int index = 0; index < 2; ++index) { - this->buttons[index]->Slot27(-1, -1); + this->buttons[index]->OnMouseMove(-1, -1); } } @@ -1047,13 +1047,13 @@ UIAchTracingWnd::UIAchTracingWnd() : UIFrameWnd(0) { // OFFSET: 0x007BA460 // FUNCTION: fn_09267 -bool UIAchTracingWnd::Slot08() { +bool UIAchTracingWnd::IsTransmitMouseInput() { return true; } // OFFSET: 0x007BAA20 // FUNCTION: fn_09271 -void UIAchTracingWnd::Slot11() { +void UIAchTracingWnd::StoreInfo() { if (this->info) { this->info->x = this->geometry.x; this->info->y = this->geometry.y; @@ -1062,7 +1062,7 @@ void UIAchTracingWnd::Slot11() { // OFFSET: 0x007BA470 // FUNCTION: fn_09268 -void UIAchTracingWnd::Slot15(int, int) { +void UIAchTracingWnd::OnCreate(int, int) { for (int index = 0; index < 3; ++index) { this->toggleButtons[index] = new UITextButton(); this->toggleButtons[index]->Configure("", 0, 0, 12, 1, 0); @@ -1177,7 +1177,7 @@ int UIAchTracingWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argume // OFFSET: 0x007B7A20 // FUNCTION: fn_09234 -void UICustomGageBar::Slot28(int x, int y) { +void UICustomGageBar::OnMouseHover(int x, int y) { std::string label = FormatOwnedString("%s( %d / %d )", this->text.c_str(), this->value, this->maximum); int tipX = 0; int tipY = -20; @@ -1187,8 +1187,8 @@ void UICustomGageBar::Slot28(int x, int y) { // OFFSET: 0x007B7AF0 // FUNCTION: fn_09235 -void UIToolTipBitmapWnd::Slot28(int x, int y) { - this->Slot27(x, y); +void UIToolTipBitmapWnd::OnMouseHover(int x, int y) { + this->OnMouseMove(x, y); if (this->tooltip.size() > 0) { x = 0; y = -20; @@ -1199,17 +1199,17 @@ void UIToolTipBitmapWnd::Slot28(int x, int y) { // OFFSET: 0x007B50C0 // FUNCTION: fn_09213 -void UIAchSummaryWnd::Slot15(int, int) { +void UIAchSummaryWnd::OnCreate(int, int) { for (int index = 0; index < this->unknown_007C; ++index) { UICustomGageBar* gauge = new (std::nothrow) UICustomGageBar(); if (index == 0) { - gauge->Slot15(558, 10); + gauge->OnCreate(558, 10); gauge->Resize(558, 10); gauge->value = 0; gauge->maximum = 100; gauge->Move(43, 49); } else { - gauge->Slot15(254, 10); + gauge->OnCreate(254, 10); gauge->Resize(254, 10); gauge->value = 0; gauge->maximum = 100; diff --git a/Source/UI/Text/UIAchWnd.h b/Source/UI/Text/UIAchWnd.h index cbf6bfbba..892aea352 100644 --- a/Source/UI/Text/UIAchWnd.h +++ b/Source/UI/Text/UIAchWnd.h @@ -46,7 +46,7 @@ public: /* 00A8 */ std::uint32_t innerBorderColor; void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; class UIAchListWnd : public UIWindow { @@ -72,9 +72,9 @@ public: __declspec(noinline) void UpdateScroll(); void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -122,10 +122,10 @@ public: void SetLabel(const char* text, int group, int sub); void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -141,7 +141,7 @@ public: /* 00F8 */ unsigned char underline; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; void Clear() override; }; @@ -157,8 +157,8 @@ public: /* 00B8 */ int unknown_00B8; void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void Set(const char* name, const char* text, int item); @@ -178,7 +178,7 @@ public: __declspec(noinline) void UpdateInfo(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -202,7 +202,7 @@ public: this->title = text; } - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -219,7 +219,7 @@ public: __declspec(noinline) void UpdateInfo(); void Show(int visible) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; @@ -238,7 +238,7 @@ public: /* 00CC */ int sub; /* 00D0 */ std::map achievements; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -269,9 +269,9 @@ public: /* 00C4 */ UITextButton* openButtons[3]; UIAchTracingWnd(); - bool Slot08() override; - void Slot11() override; - void Slot15(int width, int height) override; + bool IsTransmitMouseInput() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index 2984ced17..afd498321 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -61,7 +61,7 @@ bool UIBalloonText::CanHitTest() { // OFFSET: 0x0085FAE0 // FUNCTION: fn_10882 -void UIBalloonText::Slot19() { +void UIBalloonText::OnProcess() { ++this->geometry.unknown_0034; } @@ -248,7 +248,7 @@ void UIVerticalNameBalloonText::Paint() { // OFFSET: 0x0085FC90 // FUNCTION: fn_10884 -void UINameBalloonText::Slot19() { +void UINameBalloonText::OnProcess() { CEmblemRes* emblem = dynamic_cast(ResourceMgr::Instance().Load(this->iconName.c_str())); if (emblem) { if (emblem->gif.frameChanged == 1) { diff --git a/Source/UI/Text/UIBalloonText.h b/Source/UI/Text/UIBalloonText.h index a3b8f06ed..a5602c8bb 100644 --- a/Source/UI/Text/UIBalloonText.h +++ b/Source/UI/Text/UIBalloonText.h @@ -22,7 +22,7 @@ public: ~UIBalloonText() override; bool CanHitTest() override; - void Slot19() override; + void OnProcess() override; void Paint() override; void SetText(const char* text, int width); diff --git a/Source/UI/Text/UINameBalloonText.h b/Source/UI/Text/UINameBalloonText.h index e133a026f..f0c424e95 100644 --- a/Source/UI/Text/UINameBalloonText.h +++ b/Source/UI/Text/UINameBalloonText.h @@ -11,7 +11,7 @@ class UINameBalloonText : public UIBalloonText { public: __declspec(noinline) UINameBalloonText(); ~UINameBalloonText() override; - void Slot19() override; + void OnProcess() override; void Paint() override; virtual void SetIcon(const char* name, unsigned char framed); virtual void SetName(const CActorNameCard& card, bool stripHash, unsigned char monsterType); diff --git a/Source/UI/Text/UIStaticText.cpp b/Source/UI/Text/UIStaticText.cpp index 15c308832..603dc5748 100644 --- a/Source/UI/Text/UIStaticText.cpp +++ b/Source/UI/Text/UIStaticText.cpp @@ -156,26 +156,26 @@ void UIStaticText::Paint() { // OFFSET: 0x0085EE40 // FUNCTION: fn_10850 -void UIStaticText::Slot25(int x, int y) { - this->parent->Slot25((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticText::OnLBtnDown(int x, int y) { + this->parent->OnLBtnDown((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085EA60 // FUNCTION: fn_10837 -void UIStaticText::Slot26(int x, int y) { - this->parent->Slot26((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticText::OnLBtnDblClk(int x, int y) { + this->parent->OnLBtnDblClk((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085F8D0 // FUNCTION: fn_10873 -void UIStaticText::Slot27(int x, int y) { - this->Slot28(x, y); - this->parent->Slot27((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticText::OnMouseMove(int x, int y) { + this->OnMouseHover(x, y); + this->parent->OnMouseMove((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085F580 // FUNCTION: fn_10866 -void UIStaticText::Slot28(int, int) { +void UIStaticText::OnMouseHover(int, int) { if (this->tooltipEnabled == 0) { return; } @@ -195,26 +195,26 @@ void UIStaticText::ResetCursor(int x, int y) { // OFFSET: 0x0085F030 // FUNCTION: fn_10855 -void UIStaticText::Slot31(int x, int y) { - this->parent->Slot31((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticText::OnLBtnUp(int x, int y) { + this->parent->OnLBtnUp((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085FED0 // FUNCTION: fn_10889 -void UIStaticText::Slot32(int x, int y) { - this->parent->Slot32((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticText::OnRBtnDown(int x, int y) { + this->parent->OnRBtnDown((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085FF30 // FUNCTION: fn_10891 -void UIStaticText::Slot33(int x, int y) { - this->parent->Slot33((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticText::OnRBtnUp(int x, int y) { + this->parent->OnRBtnUp((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x00860020 // FUNCTION: fn_10897 -void UIStaticText::Slot35(int value) { - this->parent->Slot35(value); +void UIStaticText::OnWheel(int value) { + this->parent->OnWheel(value); } // OFFSET: 0x0085DAF0 diff --git a/Source/UI/Text/UIStaticText.h b/Source/UI/Text/UIStaticText.h index f9f756fee..a1f1fec06 100644 --- a/Source/UI/Text/UIStaticText.h +++ b/Source/UI/Text/UIStaticText.h @@ -10,15 +10,15 @@ public: UIStaticText(); ~UIStaticText() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int value) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int value) override; void SetText(const char* value, int outline); void SetColor(int redValue, int greenValue, int blueValue); void SetTextFitted(const char* value); diff --git a/Source/UI/Text/UIStaticTextControl.h b/Source/UI/Text/UIStaticTextControl.h index 54cd75c81..67b30fd58 100644 --- a/Source/UI/Text/UIStaticTextControl.h +++ b/Source/UI/Text/UIStaticTextControl.h @@ -14,7 +14,7 @@ class CUIStaticText : public CUIControl { public: CUIStaticText(); - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void Paint() override; void UpdateText(); void SetAlign(int horizontal, int vertical); diff --git a/Source/UI/Text/UIStaticText_LF.cpp b/Source/UI/Text/UIStaticText_LF.cpp index 1a4674cc3..a3881b815 100644 --- a/Source/UI/Text/UIStaticText_LF.cpp +++ b/Source/UI/Text/UIStaticText_LF.cpp @@ -22,25 +22,25 @@ void UIStaticText_LF::Paint() { // OFFSET: 0x0094EEA0 // FUNCTION: fn_12920 -void UIStaticText_LF::Slot25(int x, int y) { +void UIStaticText_LF::OnLBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot25(x, y); + this->parent->OnLBtnDown(x, y); } } // OFFSET: 0x0094EFA0 // FUNCTION: fn_12925 -void UIStaticText_LF::Slot31(int x, int y) { +void UIStaticText_LF::OnLBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot31(x, y); + this->parent->OnLBtnUp(x, y); } } // OFFSET: 0x0094F300 // FUNCTION: fn_12936 -void UIStaticText_LF::Slot35(int delta) { +void UIStaticText_LF::OnWheel(int delta) { if (this->parent) { - this->parent->Slot35(delta); + this->parent->OnWheel(delta); } } diff --git a/Source/UI/Text/UIStaticText_LF.h b/Source/UI/Text/UIStaticText_LF.h index fdb4cb04f..a6cdaae5b 100644 --- a/Source/UI/Text/UIStaticText_LF.h +++ b/Source/UI/Text/UIStaticText_LF.h @@ -12,9 +12,9 @@ public: : UIWindow(cached), m_lineSpacing(0), m_align(0), m_fontFamily(0), m_fontHeight(12), m_textColor(0), m_bold(0) {} void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int delta) override; void SetText(std::string text); protected: diff --git a/Source/UI/Text/UIString.h b/Source/UI/Text/UIString.h index cd28c797a..1c78c6202 100644 --- a/Source/UI/Text/UIString.h +++ b/Source/UI/Text/UIString.h @@ -10,7 +10,7 @@ public: UIString(); void Paint() override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(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 ParseTags(std::string text); virtual void SetText(int width, int height, std::string text); diff --git a/Source/UI/Text/UITagTextViewer.cpp b/Source/UI/Text/UITagTextViewer.cpp index 4c15151d7..2169bf4b1 100644 --- a/Source/UI/Text/UITagTextViewer.cpp +++ b/Source/UI/Text/UITagTextViewer.cpp @@ -55,7 +55,7 @@ int TagTextViewer::UIScroll::ContentHeight() { // OFFSET: 0x0083EE40 // FUNCTION: fn_10524 -void TagTextViewer::UIScroll::Slot15(int width, int height) { +void TagTextViewer::UIScroll::OnCreate(int width, int height) { this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(width - 13, 0, 1, height); this->AddChild(this->m_scrollBar); @@ -75,15 +75,15 @@ void UITagTextViewer::Paint() { // OFFSET: 0x0083EF20 // FUNCTION: fn_10526 -void UITagTextViewer::Slot19() { +void UITagTextViewer::OnProcess() { for (UIWindow* child : this->m_children) { - child->Slot19(); + child->OnProcess(); } } // OFFSET: 0x0083EF50 // FUNCTION: fn_10527 -void TagTextViewer::UIScroll::Slot35(int delta) { +void TagTextViewer::UIScroll::OnWheel(int delta) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 10, 0, 0, 0, 0); } else { diff --git a/Source/UI/Text/UITagTextViewer.h b/Source/UI/Text/UITagTextViewer.h index 215fddd7d..cce88a87b 100644 --- a/Source/UI/Text/UITagTextViewer.h +++ b/Source/UI/Text/UITagTextViewer.h @@ -30,8 +30,8 @@ namespace TagTextViewer { public: explicit UIScroll() : UIWindow(0), m_scrollPos(0), m_scrollBar(nullptr) { } - void Slot15(int width, int height) override; - void Slot35(int delta) override; + void OnCreate(int width, int height) override; + void OnWheel(int delta) 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 UpdateScroll(); void StorePosition(UIWindow* child); @@ -47,7 +47,7 @@ class UITagTextViewer : public TagTextViewer::UIScroll { public: UITagTextViewer(); void Resize(int width, int height) override; - void Slot19() override; + void OnProcess() override; void Paint() 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 SetAlign(unsigned char align); diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index 23e1046de..10102b90a 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -38,8 +38,8 @@ UITextViewer::~UITextViewer() = default; // OFFSET: 0x008872A0 // FUNCTION: fn_11334 -void UITextViewer::Slot15(int width, int height) { - UIListBox::Slot15(width, height); +void UITextViewer::OnCreate(int width, int height) { + UIListBox::OnCreate(width, height); } // OFFSET: 0x0087B730 @@ -48,8 +48,8 @@ void UITextViewEX::Configure(int x, int y, int width, int height, unsigned char this->transparent = value; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); this->lineHeight = 21; } @@ -71,8 +71,8 @@ void UITextViewer::Configure(int x, int y, int width, int height, unsigned char this->transparent = value; UIWindow::Resize(width, height); this->Move(x, y); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); } // OFFSET: 0x008760C0 @@ -96,17 +96,17 @@ void UITextViewer::Clear() { // OFFSET: 0x008909F0 // FUNCTION: fn_11429 -void UITextViewer::Slot25(int, int) { +void UITextViewer::OnLBtnDown(int, int) { } // OFFSET: 0x007B78C0 // FUNCTION: fn_09227 -void UITextViewer::Slot26(int, int) { +void UITextViewer::OnLBtnDblClk(int, int) { } // OFFSET: 0x007B78D0 // FUNCTION: fn_09228 -void UIAchListWnd::Slot25(int x, int y) { +void UIAchListWnd::OnLBtnDown(int x, int y) { if (x < 0 || x > this->geometry.width - this->unknown_0094) { return; } @@ -122,7 +122,7 @@ void UIAchListWnd::Slot25(int x, int y) { // OFFSET: 0x007B7920 // FUNCTION: fn_09229 -void UIAchTV::Slot25(int, int) { +void UIAchTV::OnLBtnDown(int, int) { if (this->unknown_00EC == 1) { return; } @@ -135,7 +135,7 @@ void UIAchTV::Slot25(int, int) { // OFFSET: 0x007B7960 // FUNCTION: fn_09230 -void UIAchTab::Slot25(int x, int y) { +void UIAchTab::OnLBtnDown(int x, int y) { int a = 0; int b = 0; if (!this->HitTestTab(x, y, &a, &b)) { @@ -156,19 +156,19 @@ void UIAchTab::Slot25(int x, int y) { // OFFSET: 0x007B79F0 // FUNCTION: fn_09231 -void UIAchListWnd::Slot31(int, int) { +void UIAchListWnd::OnLBtnUp(int, int) { g_windowMgr.ReleaseCapture(); } // OFFSET: 0x007B7A00 // FUNCTION: fn_09232 -void UIAchTab::Slot31(int, int) { +void UIAchTab::OnLBtnUp(int, int) { g_windowMgr.ReleaseCapture(); } // OFFSET: 0x007B7A10 // FUNCTION: fn_09233 -void UITextViewer::Slot31(int, int) { +void UITextViewer::OnLBtnUp(int, int) { } // OFFSET: 0x0088FBB0 @@ -220,8 +220,8 @@ void UITextViewer::Paint() { // OFFSET: 0x00887290 // FUNCTION: fn_11333 -void UITextViewEX::Slot15(int width, int height) { - UIListBox::Slot15(width, height); +void UITextViewEX::OnCreate(int width, int height) { + UIListBox::OnCreate(width, height); } // OFFSET: 0x00896100 diff --git a/Source/UI/Text/UITextViewer.h b/Source/UI/Text/UITextViewer.h index 47a615aaa..ff1b03f0a 100644 --- a/Source/UI/Text/UITextViewer.h +++ b/Source/UI/Text/UITextViewer.h @@ -15,11 +15,11 @@ class UITextViewer : public UIListBox { public: UITextViewer(); ~UITextViewer() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnLBtnUp(int x, int y) override; void Configure(int x, int y, int width, int height, unsigned char transparent) override; void AddLine(const char* text) override; void Clear() override; @@ -49,7 +49,7 @@ private: class UITextViewEX : public UITextViewer { public: void Configure(int x, int y, int width, int height, unsigned char transparent) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; void Clear() override; void Refresh() override; diff --git a/Source/UI/Text/UITextViewerControl.h b/Source/UI/Text/UITextViewerControl.h index 6b6ce05d6..9c7162abd 100644 --- a/Source/UI/Text/UITextViewerControl.h +++ b/Source/UI/Text/UITextViewerControl.h @@ -15,11 +15,11 @@ class CUIVScrollBar; class CUITextViewer : public CUIControl { public: CUITextViewer(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Resize(int width, int height) override; - void Slot19() override; + void OnProcess() override; void Paint() override; - void Slot35(int value) override; + void OnWheel(int value) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetTextOffset(int x, int y); diff --git a/Source/UI/Text/UITransBalloonText.cpp b/Source/UI/Text/UITransBalloonText.cpp index ca32b2b14..b16e3396c 100644 --- a/Source/UI/Text/UITransBalloonText.cpp +++ b/Source/UI/Text/UITransBalloonText.cpp @@ -107,14 +107,14 @@ void UITransBalloonText::Move(int x, int y) { // OFFSET: 0x00858F00 // FUNCTION: fn_10770 -bool UITransBalloonText::Slot07(void* output) { +bool UITransBalloonText::GetTransBoxInfo(void* output) { std::memcpy(output, &this->m_rectangle, sizeof(this->m_rectangle)); return true; } // OFFSET: 0x0085AFB0 // FUNCTION: fn_10790 -void UITransBalloonText::Slot15(int, int) { +void UITransBalloonText::OnCreate(int, int) { this->m_rectangle = {this->geometry.x, this->geometry.y, this->geometry.width, this->geometry.height, 0, 1711276032u, 0}; this->m_fontMode = 0; } diff --git a/Source/UI/Text/UITransBalloonText.h b/Source/UI/Text/UITransBalloonText.h index e3369edf7..c49ab1a4b 100644 --- a/Source/UI/Text/UITransBalloonText.h +++ b/Source/UI/Text/UITransBalloonText.h @@ -24,8 +24,8 @@ public: void Resize(int width, int height) override; void Move(int x, int y) override; - bool Slot07(void* output) override; - void Slot15(int width, int height) override; + bool GetTransBoxInfo(void* output) override; + void OnCreate(int width, int height) override; void Paint() override; // INLINED diff --git a/Source/UI/UIBarGraph.h b/Source/UI/UIBarGraph.h index fd1c3ae8f..0bd6c0bc5 100644 --- a/Source/UI/UIBarGraph.h +++ b/Source/UI/UIBarGraph.h @@ -49,7 +49,7 @@ public: } void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void SetValues(const int* current, const int* maximum); @@ -61,7 +61,7 @@ public: UIINT64BarGraph(); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void SetValues(std::int64_t current, std::int64_t maximum); void FillBackground(std::uint32_t color); diff --git a/Source/UI/UIBartermarketWnd.cpp b/Source/UI/UIBartermarketWnd.cpp index cabc0f353..d460e1304 100644 --- a/Source/UI/UIBartermarketWnd.cpp +++ b/Source/UI/UIBartermarketWnd.cpp @@ -56,9 +56,9 @@ UIExpandedBartermarketWnd::UIExpandedBartermarketWnd() // OFFSET: 0x00840B30 // FUNCTION: fn_10545 -void UIBarterItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { +void UIBarterItemPurchaseWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -80,9 +80,9 @@ void UIBarterItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00840C00 // FUNCTION: fn_10546 -void UIBartermarketWnd::Slot10(int x, int y, std::intptr_t value) { +void UIBartermarketWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (g_windowMgr.LookupWindow(10011)) { - UIWindow::Slot10(x, y, value); + UIWindow::DragAndDrop(x, y, value); return; } @@ -229,7 +229,7 @@ int UIBarterItemPurchaseWnd::GetInventoryItemCount(int itemId) { // OFFSET: 0x00845940 // FUNCTION: fn_10576 -void UIExpandedBarterItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) { +void UIExpandedBarterItemPurchaseWnd::DragAndDrop(int x, int y, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); const ModeDragState* drag = reinterpret_cast(value); if (drag->source == 31) { @@ -246,7 +246,7 @@ void UIExpandedBarterItemPurchaseWnd::Slot10(int x, int y, std::intptr_t value) // OFFSET: 0x008459F0 // FUNCTION: fn_10577 -void UIExpandedBartermarketWnd::Slot10(int x, int y, std::intptr_t value) { +void UIExpandedBartermarketWnd::DragAndDrop(int x, int y, std::intptr_t value) { const ModeDragState* drag = reinterpret_cast(value); if (drag->source != 32) { g_modeMgr.GetGameMode()->SendMsg(18, 0, 0, 0, 0); @@ -381,7 +381,7 @@ std::pair UIExpandedBartermarketWnd::GetEntryOrChunkAt( // OFFSET: 0x00849030 // FUNCTION: fn_10594 -void UIExpandedBarterItemPurchaseWnd::Slot35(int delta) { +void UIExpandedBarterItemPurchaseWnd::OnWheel(int delta) { if (this->scrollEnabled == 1) { int step = this->rowCount - 1; if (step > 3) { @@ -393,7 +393,7 @@ void UIExpandedBarterItemPurchaseWnd::Slot35(int delta) { // OFFSET: 0x00849080 // FUNCTION: fn_10595 -void UIExpandedBartermarketWnd::Slot35(int delta) { +void UIExpandedBartermarketWnd::OnWheel(int delta) { if (this->scrollEnabled == 1) { int step = this->rowCount - 1; if (step > 3) { @@ -773,9 +773,9 @@ ITEM_INFO BarterMarketEntry::ToItemInfo() const { // OFFSET: 0x00843190 // FUNCTION: fn_10556 -void UIBarterItemPurchaseWnd::Slot25(int x, int y) { +void UIBarterItemPurchaseWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -794,9 +794,9 @@ void UIBarterItemPurchaseWnd::Slot25(int x, int y) { // OFFSET: 0x00843270 // FUNCTION: fn_10557 -void UIBartermarketWnd::Slot25(int x, int y) { +void UIBartermarketWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->hovered; @@ -831,7 +831,7 @@ void UIBartermarketWnd::Slot25(int x, int y) { // OFFSET: 0x00843DE0 // FUNCTION: fn_10561 -void UIBarterItemPurchaseWnd::Slot32(int x, int y) { +void UIBarterItemPurchaseWnd::OnRBtnDown(int x, int y) { std::pair found = this->GetBarterItemOrPriceAt(x, y); if (found.first == true) { UIWindow* window = g_windowMgr.EnsureWindow(12); @@ -844,7 +844,7 @@ void UIBarterItemPurchaseWnd::Slot32(int x, int y) { // OFFSET: 0x00843EC0 // FUNCTION: fn_10562 -void UIBartermarketWnd::Slot32(int x, int y) { +void UIBartermarketWnd::OnRBtnDown(int x, int y) { std::pair found = this->GetBarterItemOrPriceAt(x, y); if (found.first) { UIWindow* window = g_windowMgr.EnsureWindow(12); @@ -857,9 +857,9 @@ void UIBartermarketWnd::Slot32(int x, int y) { // OFFSET: 0x008481E0 // FUNCTION: fn_10587 -void UIExpandedBarterItemPurchaseWnd::Slot25(int x, int y) { +void UIExpandedBarterItemPurchaseWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->unknown_00CC; @@ -893,9 +893,9 @@ void UIExpandedBarterItemPurchaseWnd::Slot25(int x, int y) { // OFFSET: 0x00848320 // FUNCTION: fn_10588 -void UIExpandedBartermarketWnd::Slot25(int x, int y) { +void UIExpandedBartermarketWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->unknown_00CC; @@ -932,7 +932,7 @@ void UIExpandedBartermarketWnd::Slot25(int x, int y) { // OFFSET: 0x00848E70 // FUNCTION: fn_10592 -void UIExpandedBarterItemPurchaseWnd::Slot32(int x, int y) { +void UIExpandedBarterItemPurchaseWnd::OnRBtnDown(int x, int y) { std::pair found = this->GetEntryOrChunkAt(x, y); if (found.first == true) { UIWindow* window = g_windowMgr.EnsureWindow(12); @@ -945,7 +945,7 @@ void UIExpandedBarterItemPurchaseWnd::Slot32(int x, int y) { // OFFSET: 0x00848F50 // FUNCTION: fn_10593 -void UIExpandedBartermarketWnd::Slot32(int x, int y) { +void UIExpandedBartermarketWnd::OnRBtnDown(int x, int y) { std::pair found = this->GetEntryOrChunkAt(x, y); if (found.first == true) { UIWindow* window = g_windowMgr.EnsureWindow(12); @@ -958,7 +958,7 @@ void UIExpandedBartermarketWnd::Slot32(int x, int y) { // OFFSET: 0x00843420 // FUNCTION: fn_10558 -void UIBarterItemPurchaseWnd::Slot28(int x, int y) { +void UIBarterItemPurchaseWnd::OnMouseHover(int x, int y) { std::pair found = this->GetBarterItemAt(x, y); if (found.first) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -978,7 +978,7 @@ void UIBarterItemPurchaseWnd::Slot28(int x, int y) { // OFFSET: 0x008436B0 // FUNCTION: fn_10559 -void UIBartermarketWnd::Slot28(int x, int y) { +void UIBartermarketWnd::OnMouseHover(int x, int y) { std::pair found = this->GetBarterItemAt(x, y); if (found.first) { int tooltipX = (x - 40) / 32 * 32 + 40; @@ -997,7 +997,7 @@ void UIBartermarketWnd::Slot28(int x, int y) { // OFFSET: 0x008484A0 // FUNCTION: fn_10589 -void UIExpandedBarterItemPurchaseWnd::Slot28(int x, int y) { +void UIExpandedBarterItemPurchaseWnd::OnMouseHover(int x, int y) { std::pair found = this->GetEntryAt(x, y); if (found.first && x > 40 && x < 72) { int tooltipX = x; @@ -1030,7 +1030,7 @@ void UIExpandedBarterItemPurchaseWnd::Slot28(int x, int y) { // OFFSET: 0x00848B80 // FUNCTION: fn_10591 -void UIExpandedBartermarketWnd::Slot28(int x, int y) { +void UIExpandedBartermarketWnd::OnMouseHover(int x, int y) { std::pair found = this->GetEntryAt(x, y); if (found.first && x > 40 && x < 72) { int tooltipX = x; @@ -1063,7 +1063,7 @@ void UIExpandedBartermarketWnd::Slot28(int x, int y) { // OFFSET: 0x00843910 // FUNCTION: fn_10560 -void UIPurchaseButton::Slot28(int x, int y) { +void UIPurchaseButton::OnMouseHover(int x, int y) { std::string text; std::map totals = *g_barterMarketItemMgr->GetTotals(); int count = 0; @@ -1110,7 +1110,7 @@ std::string UIExpandedBarterPurchaseButton::FormatChunkText(int refine, std::str // OFFSET: 0x00848790 // FUNCTION: fn_10590 -void UIExpandedBarterPurchaseButton::Slot28(int x, int y) { +void UIExpandedBarterPurchaseButton::OnMouseHover(int x, int y) { std::string text; std::vector chunks = *g_expandedBarterMarketItemMgr->GetChunks(); int index = 0; @@ -1199,7 +1199,7 @@ bool UIBarterItemPurchaseWnd::Purchase() { // OFFSET: 0x00841A10 // FUNCTION: fn_10552 -void UIBarterItemPurchaseWnd::Slot15(int width, int height) { +void UIBarterItemPurchaseWnd::OnCreate(int width, int height) { UIResizer* resizer = new UIResizer(); this->resizer = resizer; resizer->SetSize(16, 16); @@ -1407,7 +1407,7 @@ int UIBarterItemPurchaseWnd::SendMsg(UIWindow* sender, int message, std::intptr_ // OFFSET: 0x00846FB0 // FUNCTION: fn_10583 -void UIExpandedBarterItemPurchaseWnd::Slot15(int width, int height) { +void UIExpandedBarterItemPurchaseWnd::OnCreate(int width, int height) { UIResizer* resizer = new UIResizer(); this->resizer = resizer; resizer->SetSize(16, 16); @@ -1536,7 +1536,7 @@ int UIBartermarketWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s // OFFSET: 0x00842570 // FUNCTION: fn_10553 -void UIBartermarketWnd::Slot15(int width, int height) { +void UIBartermarketWnd::OnCreate(int width, int height) { this->resizer = new UIResizer(); this->resizer->SetSize(16, 16); static_cast(this->resizer)->SetDirection(7); @@ -1620,7 +1620,7 @@ bool UIExpandedBarterItemPurchaseWnd::Purchase() { // OFFSET: 0x00847290 // FUNCTION: fn_10584 -void UIExpandedBartermarketWnd::Slot15(int width, int height) { +void UIExpandedBartermarketWnd::OnCreate(int width, int height) { this->unknown_00BC = new UIResizer(); this->unknown_00BC->SetSize(16, 16); static_cast(this->unknown_00BC)->SetDirection(7); diff --git a/Source/UI/UIBartermarketWnd.h b/Source/UI/UIBartermarketWnd.h index 1c3114816..043cd10c3 100644 --- a/Source/UI/UIBartermarketWnd.h +++ b/Source/UI/UIBartermarketWnd.h @@ -18,13 +18,13 @@ class UIResizer; class UIExpandedBarterItemPurchaseWnd : public UIFrameWnd { public: UIExpandedBarterItemPurchaseWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; bool Purchase(); void UpdateScrollBar(); @@ -47,13 +47,13 @@ public: class UIExpandedBartermarketWnd : public UIFrameWnd { public: UIExpandedBartermarketWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int delta) 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 UpdateScrollBar(); __declspec(noinline) std::pair GetEntryAt(int x, int y); @@ -74,11 +74,11 @@ class UIBarterItemPurchaseWnd : public UIItemPurchaseWnd { public: UIBarterItemPurchaseWnd(); void Paint() override; - void Slot10(int x, int y, std::intptr_t value) 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; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; bool Purchase(); __declspec(noinline) std::pair GetBarterItemOrPriceAt(int x, int y); @@ -90,11 +90,11 @@ class UIBartermarketWnd : public UIItemShopWnd { public: UIBartermarketWnd(); void Paint() override; - void Slot10(int x, int y, std::intptr_t value) 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; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; __declspec(noinline) std::pair GetBarterItemAt(int x, int y); __declspec(noinline) std::pair GetBarterItemOrPriceAt(int x, int y); @@ -105,7 +105,7 @@ public: // OFFSET: 0x008401C0 // FUNCTION: fn_10540 UIPurchaseButton() = default; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; class UIExpandedBarterPurchaseButton : public UIBitmapButton { @@ -113,7 +113,7 @@ public: // OFFSET: 0x00844CA0 // FUNCTION: fn_10568 UIExpandedBarterPurchaseButton() = default; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; std::string FormatChunkText(int refine, std::string name, int amount); }; diff --git a/Source/UI/UIBasicCtrl.h b/Source/UI/UIBasicCtrl.h index e8e3c2bb6..82de73093 100644 --- a/Source/UI/UIBasicCtrl.h +++ b/Source/UI/UIBasicCtrl.h @@ -11,11 +11,11 @@ class UIBasicItemCtrl : public UIWindow { public: UIBasicItemCtrl(WindowManagerWindows& windowList); - void Slot10(int argument1, int argument2, std::intptr_t argument3) override; + void DragAndDrop(int argument1, int argument2, std::intptr_t argument3) override; void Paint() override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; void DrawItemIcon(int x, int y, int unused, bool compact); protected: @@ -29,11 +29,11 @@ protected: class UIBasicSkillCtrl : public UIWindow { public: UIBasicSkillCtrl(); - void Slot10(int argument1, int argument2, std::intptr_t argument3) override; + void DragAndDrop(int argument1, int argument2, std::intptr_t argument3) override; void Paint() override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; protected: /* 007C */ int m_skillId; diff --git a/Source/UI/UIBroadcastBalloon.cpp b/Source/UI/UIBroadcastBalloon.cpp index 8ac0163ac..4ae7ada02 100644 --- a/Source/UI/UIBroadcastBalloon.cpp +++ b/Source/UI/UIBroadcastBalloon.cpp @@ -63,7 +63,7 @@ void UIBroadcastBalloon::AddMessage(int category, const BroadcastBalloonMessage& // OFFSET: 0x007C31C0 // FUNCTION: fn_09334 -void UIBroadcastBalloon::Slot43() { +void UIBroadcastBalloon::DrawTransBox() { int y = 0; for (const auto& entry : this->m_messages) { for (const BroadcastBalloonMessage& message : entry.second) { @@ -78,7 +78,7 @@ void UIBroadcastBalloon::Slot43() { // OFFSET: 0x007C32C0 // FUNCTION: fn_09335 -bool UIBroadcastBalloon::Slot42(void*) { +bool UIBroadcastBalloon::GetCustomTransBoxInfo(void*) { return true; } @@ -107,7 +107,7 @@ void UIBroadcastBalloon::Paint() { // OFFSET: 0x007C3430 // FUNCTION: fn_09337 -void UIBroadcastBalloon::Slot19() { +void UIBroadcastBalloon::OnProcess() { if (this->m_messages.size() == 0) { this->Show(0); return; diff --git a/Source/UI/UIBroadcastBalloon.h b/Source/UI/UIBroadcastBalloon.h index 294bf9ab0..5b72c3f98 100644 --- a/Source/UI/UIBroadcastBalloon.h +++ b/Source/UI/UIBroadcastBalloon.h @@ -31,9 +31,9 @@ public: UIBroadcastBalloon(); void Paint() override; bool CanHitTest() override; - void Slot19() override; - bool Slot42(void* output) override; - void Slot43() override; + void OnProcess() override; + bool GetCustomTransBoxInfo(void* output) override; + void DrawTransBox() override; void AddMessage(int category, const BroadcastBalloonMessage& message); diff --git a/Source/UI/UICaptchaPreviewWnd.cpp b/Source/UI/UICaptchaPreviewWnd.cpp index a0fd9e5b7..d9849b883 100644 --- a/Source/UI/UICaptchaPreviewWnd.cpp +++ b/Source/UI/UICaptchaPreviewWnd.cpp @@ -63,7 +63,7 @@ void UIMacroDetectorWnd::AddImageData(const void* data, int size) { // OFFSET: 0x007ED660 // FUNCTION: fn_09810 -void UICaptchaPreviewWnd::Slot15(int, int) { +void UICaptchaPreviewWnd::OnCreate(int, int) { this->m_image = new UICaptchaImage(); this->m_image->SetSize(220, 90); this->m_image->Move(0, 0); @@ -73,7 +73,7 @@ void UICaptchaPreviewWnd::Slot15(int, int) { // OFFSET: 0x007ED710 // FUNCTION: fn_09811 -void UIMacroDetectorWnd::Slot15(int, int) { +void UIMacroDetectorWnd::OnCreate(int, int) { this->geometry.currentAlpha = 0xBB; this->geometry.targetAlpha = 0xBB; diff --git a/Source/UI/UICaptchaPreviewWnd.h b/Source/UI/UICaptchaPreviewWnd.h index cb8b3c8c4..a124a8f8c 100644 --- a/Source/UI/UICaptchaPreviewWnd.h +++ b/Source/UI/UICaptchaPreviewWnd.h @@ -8,7 +8,7 @@ class UICaptchaImage; class UICaptchaPreviewWnd : public UIFrameWnd { public: UICaptchaPreviewWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/UICaptchaRegisterWnd.cpp b/Source/UI/UICaptchaRegisterWnd.cpp index 7f848a3b2..074aa539f 100644 --- a/Source/UI/UICaptchaRegisterWnd.cpp +++ b/Source/UI/UICaptchaRegisterWnd.cpp @@ -42,7 +42,7 @@ UICaptchaRegisterWnd::UICaptchaRegisterWnd() // OFFSET: 0x007EA3B0 // FUNCTION: fn_09788 -void UICaptchaRegisterWnd::Slot15(int width, int height) { +void UICaptchaRegisterWnd::OnCreate(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/UICaptchaRegisterWnd.h b/Source/UI/UICaptchaRegisterWnd.h index a9f6061c6..5c2a37207 100644 --- a/Source/UI/UICaptchaRegisterWnd.h +++ b/Source/UI/UICaptchaRegisterWnd.h @@ -14,7 +14,7 @@ class UIBitmapButton; class UICaptchaRegisterWnd : public UIFrameWnd { public: UICaptchaRegisterWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a1, std::intptr_t a2, std::intptr_t a3, std::intptr_t a4) override; void SetRegisterDisabled(unsigned char disabled); diff --git a/Source/UI/UIChangeMaterialWnd.cpp b/Source/UI/UIChangeMaterialWnd.cpp index 98485439a..a636ccb28 100644 --- a/Source/UI/UIChangeMaterialWnd.cpp +++ b/Source/UI/UIChangeMaterialWnd.cpp @@ -79,7 +79,7 @@ UIChangeMaterialWnd_ScrollBar::UIChangeMaterialWnd_ScrollBar() : UIScrollBar() { // OFFSET: 0x005E1B30 // FUNCTION: fn_03877 -void UIChangeMaterialWnd_List::Slot15(int width, int height) { +void UIChangeMaterialWnd_List::OnCreate(int width, int height) { this->m_scrollBar = new UIChangeMaterialWnd_ScrollBar(); this->m_scrollBar->Configure(width - this->unknown_00B8, 0, 1, height); this->m_scrollBar->Show(0); @@ -135,7 +135,7 @@ ITEM_INFO* UIChangeMaterialWnd::GetItemAt(int x, int y) { // OFFSET: 0x005E1300 // FUNCTION: fn_03874 -bool UIChangeMaterialWnd::Slot02() { +bool UIChangeMaterialWnd::IsFrameWnd() { return true; } @@ -147,7 +147,7 @@ void UIChangeMaterialWnd_List::Move(int x, int y) { // OFFSET: 0x005E2590 // FUNCTION: fn_03883 -void UIChangeMaterialWnd_List::Slot31(int, int position) { +void UIChangeMaterialWnd_List::OnLBtnUp(int, int position) { const int rowHeight = this->unknown_00B4; const unsigned int last = static_cast(this->m_items.size() - 1); unsigned int index = static_cast(position / rowHeight + this->m_scrollOffset); @@ -157,7 +157,7 @@ void UIChangeMaterialWnd_List::Slot31(int, int position) { // OFFSET: 0x005E25D0 // FUNCTION: fn_03884 -void UIChangeMaterialWnd::Slot28(int x, int y) { +void UIChangeMaterialWnd::OnMouseHover(int x, int y) { ITEM_INFO* item = this->GetItemAt(x, y); if (!item) { return; @@ -174,12 +174,12 @@ void UIChangeMaterialWnd::Slot28(int x, int y) { // OFFSET: 0x005E2840 // FUNCTION: fn_03886 -void UIChangeMaterialWnd_List::Slot27(int x, int y) { +void UIChangeMaterialWnd_List::OnMouseMove(int x, int y) { } // OFFSET: 0x005E2850 // FUNCTION: fn_03887 -void UIChangeMaterialWnd::Slot19() { +void UIChangeMaterialWnd::OnProcess() { const std::string text = this->unknown_00B8->Text(); if (text.compare(LookupMessage(0xec0)) != 0) { if (text.empty()) { @@ -193,7 +193,7 @@ void UIChangeMaterialWnd::Slot19() { // OFFSET: 0x005E29F0 // FUNCTION: fn_03888 -void UIChangeMaterialWnd::Slot33(int x, int y) { +void UIChangeMaterialWnd::OnRBtnUp(int x, int y) { ITEM_INFO* item = this->GetItemAt(x, y); if (!item) { return; @@ -207,7 +207,7 @@ void UIChangeMaterialWnd::Slot33(int x, int y) { // OFFSET: 0x005E2A30 // FUNCTION: fn_03889 -void UIChangeMaterialWnd_List::Slot35(int argument) { +void UIChangeMaterialWnd_List::OnWheel(int argument) { if (argument < 0) { this->SendMsg(this->m_scrollBar, 10, 0, 0, 0, 0); } else { @@ -646,7 +646,7 @@ void UIChangeMaterialWnd_ScrollBar::Paint() { // OFFSET: 0x005E26B0 // FUNCTION: fn_03885 -void UIChangeMaterialWnd_List::Slot28(int x, int y) { +void UIChangeMaterialWnd_List::OnMouseHover(int x, int y) { const int rowHeight = this->unknown_00B4; const int index = y / rowHeight + this->m_scrollOffset; if (static_cast(index) >= this->m_items.size()) { @@ -685,7 +685,7 @@ __forceinline void UIChangeMaterialWnd_CheckBox::SetLabels(std::string ascending // OFFSET: 0x005E1320 // FUNCTION: fn_03876 -void UIChangeMaterialWnd::Slot15(int width, int height) { +void UIChangeMaterialWnd::OnCreate(int width, int height) { UIBitmapButton* close = new UIBitmapButton(); close->SetBitmap("유저인터페이스\\basic_interface\\sys_close_off.bmp", 0, 0); close->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 1, 0); diff --git a/Source/UI/UIChangeMaterialWnd.h b/Source/UI/UIChangeMaterialWnd.h index 49d135966..c709dccf1 100644 --- a/Source/UI/UIChangeMaterialWnd.h +++ b/Source/UI/UIChangeMaterialWnd.h @@ -69,14 +69,14 @@ public: class UIChangeMaterialWnd : public UIFrameWnd { public: UIChangeMaterialWnd(); - void Slot15(int width, int height) override; - bool Slot02() override; + void OnCreate(int width, int height) override; + bool IsFrameWnd() override; void Paint() override; - void Slot28(int x, int y) override; - void Slot33(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnUp(int x, int y) override; ITEM_INFO* GetItemAt(int x, int y); void SendChangeMaterial(); - void Slot19() override; + void OnProcess() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -100,10 +100,10 @@ public: void Paint() override; void Move(int x, int y) override; // INLINED - void Slot25(int, int) override {} - void Slot28(int x, int y) override; - void Slot27(int x, int y) override; - void Slot35(int argument) override; + void OnLBtnDown(int, int) override {} + void OnMouseHover(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnWheel(int argument) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -112,10 +112,10 @@ public: void RefreshVisibleEntries(); void UpdateScrollBar(); void SetSelectedIndex(int index); - void Slot31(int unknown, int position) override; + void OnLBtnUp(int unknown, int position) override; void SelectNextItem(int delta); void ShiftSelectedIndex(int value); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; const MaterialListEntry* GetEntry(unsigned int index) const; /* 00B4 */ int unknown_00B4; diff --git a/Source/UI/UICheckAttendanceWnd.cpp b/Source/UI/UICheckAttendanceWnd.cpp index 871c5e07b..ec922fed2 100644 --- a/Source/UI/UICheckAttendanceWnd.cpp +++ b/Source/UI/UICheckAttendanceWnd.cpp @@ -107,7 +107,7 @@ UICheckAttendanceWnd_Banner::~UICheckAttendanceWnd_Banner() { // OFFSET: 0x007DCF50 // FUNCTION: fn_09639 -void UICheckAttendanceWnd::Slot15(int, int) { +void UICheckAttendanceWnd::OnCreate(int, int) { tm end; end.tm_mday = g_checkAttendanceMgr->m_config1; end.tm_hour = 15; @@ -232,7 +232,7 @@ void UICheckAttendanceWnd_Banner::Paint() { // OFFSET: 0x007DDBB0 // FUNCTION: fn_09642 -void UICheckAttendanceWnd::Slot25(int x, int y) { +void UICheckAttendanceWnd::OnLBtnDown(int x, int y) { if (this->SlotAt(x, y) == this->m_checkedDays) { this->m_highlight = 2; this->Invalidate(); @@ -241,7 +241,7 @@ void UICheckAttendanceWnd::Slot25(int x, int y) { // OFFSET: 0x007DDBF0 // FUNCTION: fn_09643 -void UICheckAttendanceWnd::Slot31(int x, int y) { +void UICheckAttendanceWnd::OnLBtnUp(int x, int y) { const int slot = this->SlotAt(x, y); if (slot == this->m_checkedDays) { this->SendMsg(nullptr, 6, 184, slot, 0, 0); @@ -250,7 +250,7 @@ void UICheckAttendanceWnd::Slot31(int x, int y) { // OFFSET: 0x007DDC30 // FUNCTION: fn_09644 -void UICheckAttendanceWnd_Banner::Slot31(int x, int y) { +void UICheckAttendanceWnd_Banner::OnLBtnUp(int x, int y) { const std::string url = this->m_entries[this->m_current].url; if (!url.empty()) { ShellExecuteA(nullptr, "OPEN", url.c_str(), url.c_str(), nullptr, SW_SHOW); @@ -273,7 +273,7 @@ void UICheckAttendanceWnd_Banner::Slot31(int x, int y) { // OFFSET: 0x007DDD70 // FUNCTION: fn_09645 -void UICheckAttendanceWnd::Slot28(int x, int y) { +void UICheckAttendanceWnd::OnMouseHover(int x, int y) { const int slot = this->SlotAt(x, y); if (slot < 0 || slot >= this->m_rewardCount) { return; @@ -303,7 +303,7 @@ void UICheckAttendanceWnd_Banner::ResetCursor(int, int) { // OFFSET: 0x007DDF00 // FUNCTION: fn_09647 -void UICheckAttendanceWnd::Slot19() { +void UICheckAttendanceWnd::OnProcess() { if (this->m_blinking != 0) { const int highlight = timeGetTime() / 100 & 1; if (this->m_highlight != 2 && this->m_highlight != highlight) { @@ -315,7 +315,7 @@ void UICheckAttendanceWnd::Slot19() { // OFFSET: 0x007DDF50 // FUNCTION: fn_09648 -void UICheckAttendanceWnd_Banner::Slot19() { +void UICheckAttendanceWnd_Banner::OnProcess() { if (this->m_lastSwitch + 5000 < timeGetTime()) { const unsigned int next = this->m_current + 1 < this->m_entries.size() ? this->m_current + 1 : 0; this->SendMsg(this->m_buttons[next], 6, 215, 0, 0, 0); @@ -324,7 +324,7 @@ void UICheckAttendanceWnd_Banner::Slot19() { // OFFSET: 0x007DDFC0 // FUNCTION: fn_09649 -void UICheckAttendanceWnd::Slot32(int x, int y) { +void UICheckAttendanceWnd::OnRBtnDown(int x, int y) { const int slot = this->SlotAt(x, y); if (slot < 0 || slot >= this->m_rewardCount) { return; diff --git a/Source/UI/UICheckAttendanceWnd.h b/Source/UI/UICheckAttendanceWnd.h index 329ee80d3..35ba80230 100644 --- a/Source/UI/UICheckAttendanceWnd.h +++ b/Source/UI/UICheckAttendanceWnd.h @@ -20,10 +20,10 @@ class UICheckAttendanceWnd_Banner : public UIWindow { public: UICheckAttendanceWnd_Banner(); ~UICheckAttendanceWnd_Banner() override; - void Slot19() override; + void OnProcess() override; void Paint() override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(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 AddBanner(std::string image, std::string url, int action, int argument); void CreateButtons(); @@ -38,13 +38,13 @@ class UICheckAttendanceWnd : public UIFrameWnd { public: UICheckAttendanceWnd(); ~UICheckAttendanceWnd() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(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 VisitChildren() override; int SlotAt(int x, int y); diff --git a/Source/UI/UIGradeEnchantWnd.cpp b/Source/UI/UIGradeEnchantWnd.cpp index 247721a15..e17c15938 100644 --- a/Source/UI/UIGradeEnchantWnd.cpp +++ b/Source/UI/UIGradeEnchantWnd.cpp @@ -92,7 +92,7 @@ UIGradeEnchant_BtnStart::UIGradeEnchant_BtnStart() : UIBitmapButton() { // OFFSET: 0x007E7500 // FUNCTION: fn_09749 -void UIGradeEnchantWnd::Slot10(int x, int y, std::intptr_t value) { +void UIGradeEnchantWnd::DragAndDrop(int x, int y, std::intptr_t value) { const ModeDragState* drag = reinterpret_cast(value); if (x >= 53 && x <= 99 && y >= 114 && y <= 160 && drag->source == 1) { this->SendMsg(this, 23, drag->id, 0, 0, 0); @@ -151,7 +151,7 @@ int UIGradeEnchantWnd::SuccessRate() { // OFFSET: 0x007E7780 // FUNCTION: fn_09753 -void UIGradeEnchantWnd::Slot15(int, int) { +void UIGradeEnchantWnd::OnCreate(int, int) { if (UIBitmapButton* close = this->AddCloseButton("", 0)) { close->Move(0x180, 0x14); } @@ -326,7 +326,7 @@ void UIGradeEnchant_BtnStart::Paint() { // OFFSET: 0x007E8990 // FUNCTION: fn_09758 -void UIGradeEnchantWnd::Slot26(int x, int y) { +void UIGradeEnchantWnd::OnLBtnDblClk(int x, int y) { if (this->item.unknown_0000[1] > 0 && x >= 53 && x <= 99 && y >= 114 && y <= 160) { this->ResetItem(); } @@ -334,9 +334,9 @@ void UIGradeEnchantWnd::Slot26(int x, int y) { // OFFSET: 0x007E89C0 // FUNCTION: fn_09759 -void UIGradeEnchantWnd::Slot25(int x, int y) { +void UIGradeEnchantWnd::OnLBtnDown(int x, int y) { if (y < 38 && x > 141) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -347,9 +347,9 @@ void UIGradeEnchantWnd::Slot25(int x, int y) { // OFFSET: 0x007E8A30 // FUNCTION: fn_09760 -void UIGradeEnchantWnd::Slot31(int x, int y) { +void UIGradeEnchantWnd::OnLBtnUp(int x, int y) { if (y < 80 && x > 141) { - UIFrameWnd::Slot31(x, y); + UIFrameWnd::OnLBtnUp(x, y); return; } @@ -373,13 +373,13 @@ void UIGradeEnchantWnd::Slot31(int x, int y) { // OFFSET: 0x007E8B30 // FUNCTION: fn_09761 -void UIGradeEnchantWnd::Slot28(int x, int y) { +void UIGradeEnchantWnd::OnMouseHover(int x, int y) { this->hoverMaterial = MaterialRowAt(x, y); } // OFFSET: 0x007E8BB0 // FUNCTION: fn_09762 -void UIGradeEnchant_BtnEnhancedUp::Slot28(int x, int y) { +void UIGradeEnchant_BtnEnhancedUp::OnMouseHover(int x, int y) { if (this->tooltipValue == 0 || this->tooltipEnabled == 0) { return; } @@ -400,7 +400,7 @@ void UIGradeEnchant_BtnEnhancedUp::Slot28(int x, int y) { // OFFSET: 0x007E8CC0 // FUNCTION: fn_09763 -void UIGradeEnchantWnd::Slot19() { +void UIGradeEnchantWnd::OnProcess() { const int frameCounts[3] = {6, 6, 5}; if (this->unknown_00D8 >= frameCounts[this->state]) { return; @@ -462,12 +462,12 @@ void UIGradeEnchantWnd::Slot19() { // OFFSET: 0x007E8FA0 // FUNCTION: fn_09764 -void UIGradeEnchantWnd::Slot32(int x, int y) { +void UIGradeEnchantWnd::OnRBtnDown(int x, int y) { } // OFFSET: 0x007E8FB0 // FUNCTION: fn_09765 -void UIGradeEnchantWnd::Slot33(int x, int y) { +void UIGradeEnchantWnd::OnRBtnUp(int x, int y) { if (y < 80 && x > 141) { return; } diff --git a/Source/UI/UIGradeEnchantWnd.h b/Source/UI/UIGradeEnchantWnd.h index df11b54a4..4442486b2 100644 --- a/Source/UI/UIGradeEnchantWnd.h +++ b/Source/UI/UIGradeEnchantWnd.h @@ -41,7 +41,7 @@ class UIGradeEnchant_BtnEnhancedUp : public UIBitmapButton { public: UIGradeEnchant_BtnEnhancedUp(); void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void Enable(unsigned char value) override; /* 0120 */ int tooltipValue; @@ -58,16 +58,16 @@ public: class UIGradeEnchantWnd : public UIFrameWnd { public: UIGradeEnchantWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot19() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(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 ResetItem(); int SelectedMaterialZeny(); diff --git a/Source/UI/UIHotkeyGuideWnd.cpp b/Source/UI/UIHotkeyGuideWnd.cpp index 0ac18d445..aee29098f 100644 --- a/Source/UI/UIHotkeyGuideWnd.cpp +++ b/Source/UI/UIHotkeyGuideWnd.cpp @@ -63,7 +63,7 @@ HotkeyGuideLabel& HotkeyGuideLabel::operator=(const HotkeyGuideLabel& other) { // OFFSET: 0x00966C70 // FUNCTION: fn_13164 -void UIHotkeyGuideWnd::Slot15(int, int) { +void UIHotkeyGuideWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -254,7 +254,7 @@ void UIHotkeyGuideWnd::Paint() { // OFFSET: 0x0096C140 // FUNCTION: fn_13166 -void UIHotkeyGuideWnd::Slot19() { +void UIHotkeyGuideWnd::OnProcess() { auto tab = this->m_tabs.begin(); for (; tab != this->m_tabs.end(); ++tab) { if ((*tab)->geometry.unknown_0030 == 2) { diff --git a/Source/UI/UIHotkeyGuideWnd.h b/Source/UI/UIHotkeyGuideWnd.h index 014f831f7..831fcdf40 100644 --- a/Source/UI/UIHotkeyGuideWnd.h +++ b/Source/UI/UIHotkeyGuideWnd.h @@ -57,8 +57,8 @@ struct HotkeyGuideLabel { class UIHotkeyGuideWnd : public UIFrameWnd { public: UIHotkeyGuideWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/UIIngredientInfoWnd.h b/Source/UI/UIIngredientInfoWnd.h index 74b377246..75976c6e4 100644 --- a/Source/UI/UIIngredientInfoWnd.h +++ b/Source/UI/UIIngredientInfoWnd.h @@ -18,14 +18,14 @@ public: : UIFrameWnd(0), selected(0), insufficient(0), quantity(0) {} ~UIIngredientInfoWnd() override; void Move(int x, int y) override; - void Slot10(int argument1, int argument2, std::intptr_t argument3) override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int argument) override; + void DragAndDrop(int argument1, int argument2, std::intptr_t argument3) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int argument) override; void Paint() override; - void Slot26(int button, int unused) override; + void OnLBtnDblClk(int button, int unused) override; void SetIngredientItem(std::uint32_t id); /* 00B8 */ ITEM_INFO item; diff --git a/Source/UI/UIItemReformWnd.cpp b/Source/UI/UIItemReformWnd.cpp index 9964edcfa..7c95d22ee 100644 --- a/Source/UI/UIItemReformWnd.cpp +++ b/Source/UI/UIItemReformWnd.cpp @@ -86,7 +86,7 @@ void UIItemReformWnd_List::Move(int x, int y) { // OFFSET: 0x005FCD20 // FUNCTION: fn_04108 -void UIItemReformWnd::Slot15(int width, int height) { +void UIItemReformWnd::OnCreate(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -136,7 +136,7 @@ void UIItemReformWnd::Slot15(int width, int height) { // OFFSET: 0x005FD1B0 // FUNCTION: fn_04109 -void UIItemReformWnd_List::Slot15(int width, int height) { +void UIItemReformWnd_List::OnCreate(int width, int height) { this->scrollBar = new UIScrollBar(); this->scrollBar->Configure(width - 13, 0, 1, height); this->scrollBar->Show(0); @@ -227,7 +227,7 @@ void UIItemReformWnd_List::Paint() { // OFFSET: 0x005FDA60 // FUNCTION: fn_04117 -void UIItemReformWnd_List::Slot31(int x, int y) { +void UIItemReformWnd_List::OnLBtnUp(int x, int y) { const unsigned int count = this->items.size(); const unsigned int index = std::max(0u, std::min(y / this->itemHeight + this->scrollPosition, count - 1)); if (index < count && this->selectedIndex != index) { @@ -241,7 +241,7 @@ void UIItemReformWnd_List::Slot31(int x, int y) { // OFFSET: 0x005FDB00 // FUNCTION: fn_04118 -void UIItemReformWnd_DetailBtn::Slot47() { +void UIItemReformWnd_DetailBtn::OnMouseEnter() { if (this->parent) { this->parent->SendMsg(this, 167, 0, 0, 0, 0); } @@ -249,7 +249,7 @@ void UIItemReformWnd_DetailBtn::Slot47() { // OFFSET: 0x005FDB20 // FUNCTION: fn_04119 -void UIItemReformWnd_Item::Slot28(int x, int y) { +void UIItemReformWnd_Item::OnMouseHover(int x, int y) { if (this->item) { int screenX = x; int screenY = y; @@ -262,7 +262,7 @@ void UIItemReformWnd_Item::Slot28(int x, int y) { // OFFSET: 0x005FDBE0 // FUNCTION: fn_04120 -void UIItemReformWnd_List::Slot28(int x, int y) { +void UIItemReformWnd_List::OnMouseHover(int x, int y) { const unsigned int count = this->items.size(); const unsigned int index = std::max(0u, std::min(y / this->itemHeight + this->scrollPosition, count - 1)); if (index < count && this->hoverIndex != index) { @@ -273,7 +273,7 @@ void UIItemReformWnd_List::Slot28(int x, int y) { // OFFSET: 0x005FDC50 // FUNCTION: fn_04121 -void UIItemReformWnd_DetailBtn::Slot48() { +void UIItemReformWnd_DetailBtn::OnMouseLeave() { if (this->parent) { this->parent->SendMsg(this, 168, 0, 0, 0, 0); } @@ -281,7 +281,7 @@ void UIItemReformWnd_DetailBtn::Slot48() { // OFFSET: 0x005FDC80 // FUNCTION: fn_04123 -void UIItemReformWnd::Slot19() { +void UIItemReformWnd::OnProcess() { if (this->detailMsg) { g_windowMgr.Promote(this->detailMsg); this->detailMsg->Move(g_mouse.x + 5, g_mouse.y + 5); @@ -290,7 +290,7 @@ void UIItemReformWnd::Slot19() { // OFFSET: 0x005FDCC0 // FUNCTION: fn_04124 -void UIItemReformWnd_Item::Slot32(int x, int y) { +void UIItemReformWnd_Item::OnRBtnDown(int x, int y) { if (this->item) { if (UIWindow* window = g_windowMgr.EnsureWindow(12)) { window->SendMsg(nullptr, 24, reinterpret_cast(this->item), 0, 0, 0); @@ -300,7 +300,7 @@ void UIItemReformWnd_Item::Slot32(int x, int y) { // OFFSET: 0x005FDD10 // FUNCTION: fn_04126 -void UIItemReformWnd_List::Slot33(int x, int y) { +void UIItemReformWnd_List::OnRBtnUp(int x, int y) { const unsigned int count = this->items.size(); const unsigned int index = std::max(0u, std::min(y / this->itemHeight + this->scrollPosition, count - 1)); if (index < count) { @@ -312,7 +312,7 @@ void UIItemReformWnd_List::Slot33(int x, int y) { // OFFSET: 0x005FDDA0 // FUNCTION: fn_04127 -void UIItemReformWnd_List::Slot35(int delta) { +void UIItemReformWnd_List::OnWheel(int delta) { if (delta < 0) { this->SendMsg(this->scrollBar, 10, 0, 0, 0, 0); } else { diff --git a/Source/UI/UIItemReformWnd.h b/Source/UI/UIItemReformWnd.h index 4a5fa06c9..f543842e6 100644 --- a/Source/UI/UIItemReformWnd.h +++ b/Source/UI/UIItemReformWnd.h @@ -16,16 +16,16 @@ class UIItemReformWnd_List : public UIFrameWnd { public: UIItemReformWnd_List(); void Move(int x, int y) override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; // INLINED - void Slot25(int, int) override {} + void OnLBtnDown(int, int) override {} // INLINED - void Slot27(int, int) override {} - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnMouseMove(int, int) override {} + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; /* 00B4 */ unsigned int itemHeight; @@ -45,8 +45,8 @@ public: explicit UIItemReformWnd_Item() : UIWindow(0), item(nullptr) { } void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; /* 007C */ ITEM_INFO* item; }; @@ -57,8 +57,8 @@ public: UIItemReformWnd_DetailBtn() : UIButton() { } void Paint() override; - void Slot47() override; - void Slot48() override; + void OnMouseEnter() override; + void OnMouseLeave() override; }; class UIItemReformWnd_DetailMsg : public UIWindow { @@ -74,8 +74,8 @@ class UIItemReformWnd : public UIFrameWnd { public: UIItemReformWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() 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 SelectItem(ITEM_INFO* item); diff --git a/Source/UI/UILapineBoxWnd.cpp b/Source/UI/UILapineBoxWnd.cpp index 24a12157d..d135cc1ff 100644 --- a/Source/UI/UILapineBoxWnd.cpp +++ b/Source/UI/UILapineBoxWnd.cpp @@ -43,7 +43,7 @@ UILapineBoxWnd::UILapineBoxWnd() // OFFSET: 0x006006D0 // FUNCTION: fn_04160 -void UIIngredientInfoWnd::Slot26(int, int) { +void UIIngredientInfoWnd::OnLBtnDblClk(int, int) { if (this->insufficient == 1) { static_cast(this->parent)->CanUseIngredient(this->item.unknown_0000[1]); return; @@ -65,7 +65,7 @@ void UIIngredientInfoWnd::Slot26(int, int) { // OFFSET: 0x00600830 // FUNCTION: fn_04162 -void UIIngredientInfoWnd::Slot25(int x, int y) { +void UIIngredientInfoWnd::OnLBtnDown(int x, int y) { if (this->insufficient != 1 && this->item.unknown_0000[1] > 0) { static_cast(g_modeMgr.GetGameMode())->drag.BeginItem(g_windowMgr, 27, this->item, this->quantity, -1); } @@ -73,7 +73,7 @@ void UIIngredientInfoWnd::Slot25(int x, int y) { // OFFSET: 0x00600940 // FUNCTION: fn_04164 -void UIIngredientInfoWnd::Slot31(int, int) { +void UIIngredientInfoWnd::OnLBtnUp(int, int) { if (this->insufficient != 1) { this->selected = 1; this->Invalidate(); @@ -86,8 +86,8 @@ void UIIngredientInfoWnd::Slot31(int, int) { // OFFSET: 0x00600980 // FUNCTION: fn_04165 -void UIIngredientInfoWnd::Slot28(int x, int y) { - this->Slot27(x, y); +void UIIngredientInfoWnd::OnMouseHover(int x, int y) { + this->OnMouseMove(x, y); if (this->tooltip.size() > 0) { int tipX = 0; @@ -99,7 +99,7 @@ void UIIngredientInfoWnd::Slot28(int x, int y) { // OFFSET: 0x00600770 // FUNCTION: fn_04161 -void UILapineBoxWnd::Slot26(int x, int y) { +void UILapineBoxWnd::OnLBtnDblClk(int x, int y) { alignas(ITEM_INFO) unsigned char storage[sizeof(ITEM_INFO)]; ITEM_INFO& item = *reinterpret_cast(storage); this->ReadMaterial(&item, x, y); @@ -115,9 +115,9 @@ void UILapineBoxWnd::Slot26(int x, int y) { // OFFSET: 0x00600870 // FUNCTION: fn_04163 -void UILapineBoxWnd::Slot25(int x, int y) { +void UILapineBoxWnd::OnLBtnDown(int x, int y) { if (y < 0x11) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } alignas(ITEM_INFO) unsigned char storage[sizeof(ITEM_INFO)]; @@ -133,8 +133,8 @@ void UILapineBoxWnd::Slot25(int x, int y) { // OFFSET: 0x006009F0 // FUNCTION: fn_04166 -void UILapineBoxWnd::Slot28(int x, int y) { - this->Slot27(x, y); +void UILapineBoxWnd::OnMouseHover(int x, int y) { + this->OnMouseMove(x, y); alignas(ITEM_INFO) unsigned char storage[sizeof(ITEM_INFO)]; ITEM_INFO& item = *reinterpret_cast(storage); @@ -163,7 +163,7 @@ void UILapineBoxWnd::Slot28(int x, int y) { // OFFSET: 0x00600B60 // FUNCTION: fn_04167 -void UILapineBoxWnd::Slot19() { +void UILapineBoxWnd::OnProcess() { if (this->waiting == 0) { const int count = static_cast(this->items.size()); if (this->maxItems == count) { @@ -188,7 +188,7 @@ void UILapineBoxWnd::Slot19() { // OFFSET: 0x00600C00 // FUNCTION: fn_04168 -void UIIngredientInfoWnd::Slot32(int, int) { +void UIIngredientInfoWnd::OnRBtnDown(int, int) { if (this->item.unknown_0000[1] > 0) { UIWindow* window = g_windowMgr.EnsureWindow(12); window->SendMsg(this, 0x18, reinterpret_cast(&this->item), 0, 0, 0); @@ -299,7 +299,7 @@ void UILapineBoxWnd::SetWaiting(unsigned char waiting) { // OFFSET: 0x00600C40 // FUNCTION: fn_04169 -void UILapineBoxWnd::Slot32(int x, int y) { +void UILapineBoxWnd::OnRBtnDown(int x, int y) { alignas(ITEM_INFO) unsigned char storage[sizeof(ITEM_INFO)]; ITEM_INFO& item = *reinterpret_cast(storage); this->ReadMaterial(&item, x, y); @@ -314,14 +314,14 @@ void UILapineBoxWnd::Slot32(int x, int y) { // OFFSET: 0x00600D00 // FUNCTION: fn_04170 -void UIIngredientInfoWnd::Slot35(int argument) { +void UIIngredientInfoWnd::OnWheel(int argument) { if (this->parent) { - this->parent->Slot35(argument); + this->parent->OnWheel(argument); } } // OFFSET: 0x00600D20 // FUNCTION: fn_04171 -void UILapineBox_IngredientListWnd::Slot35(int argument) { +void UILapineBox_IngredientListWnd::OnWheel(int argument) { if (this->wheelScroll == 1) { if (argument < 0) { this->SendMsg(this->scrollBar, 7, 15, 0, 0, 0); @@ -504,7 +504,7 @@ int UILapineBox_IngredientListWnd::SendMsg(UIWindow* sender, int message, std::i y += 0x1E; } } - this->Slot53(); + this->UpdateScrollRange(); this->Invalidate(); break; } diff --git a/Source/UI/UILapineScrollBar.cpp b/Source/UI/UILapineScrollBar.cpp index 609e06c77..a781da99e 100644 --- a/Source/UI/UILapineScrollBar.cpp +++ b/Source/UI/UILapineScrollBar.cpp @@ -31,8 +31,8 @@ void UILapineScrollBarNoop() {} // OFFSET: 0x005FF810 // FUNCTION: fn_04149 -void UIIngredientInfoWnd::Slot10(int argument1, int argument2, std::intptr_t argument3) { - this->parent->Slot10(argument1, argument2, argument3); +void UIIngredientInfoWnd::DragAndDrop(int argument1, int argument2, std::intptr_t argument3) { + this->parent->DragAndDrop(argument1, argument2, argument3); } // OFFSET: 0x005FF910 @@ -120,12 +120,12 @@ void UILapineBox_IngredientListWnd::Paint() { UILapineBox_IngredientListWnd::UILapineBox_IngredientListWnd(int width, int height) : UIScrollWnd(width, height, 0), minRefine(0), maxRefine(20) { this->Resize(width, height); - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x005FF820 // FUNCTION: fn_04150 -void UILapineBoxWnd::Slot10(int, int, std::intptr_t value) { +void UILapineBoxWnd::DragAndDrop(int, int, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); const ModeDragState* drag = reinterpret_cast(value); if (this->items.size() < static_cast(this->maxItems) && drag->source == 27) { @@ -139,7 +139,7 @@ void UILapineBoxWnd::Slot10(int, int, std::intptr_t value) { // OFFSET: 0x005FF8B0 // FUNCTION: fn_04151 -void UILapineBox_IngredientListWnd::Slot10(int, int, std::intptr_t value) { +void UILapineBox_IngredientListWnd::DragAndDrop(int, int, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); const ModeDragState* drag = reinterpret_cast(value); if (drag->source == 26) { @@ -152,7 +152,7 @@ void UILapineBox_IngredientListWnd::Slot10(int, int, std::intptr_t value) { // OFFSET: 0x005FF920 // FUNCTION: fn_04153 -void UILapineBoxWnd::Slot15(int, int) { +void UILapineBoxWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -197,7 +197,7 @@ void UILapineBoxWnd::Slot15(int, int) { // OFFSET: 0x005FFCD0 // FUNCTION: fn_04154 -void UILapineBox_IngredientListWnd::Slot15(int width, int height) { +void UILapineBox_IngredientListWnd::OnCreate(int width, int height) { this->scrollBarWidth = 9; if (this->scrollBar != nullptr) { this->RemoveChild(this->scrollBar, 0); diff --git a/Source/UI/UILapineScrollBar.h b/Source/UI/UILapineScrollBar.h index 65f814c7a..17ef1e965 100644 --- a/Source/UI/UILapineScrollBar.h +++ b/Source/UI/UILapineScrollBar.h @@ -28,12 +28,12 @@ public: UILapineUpgradeBox_IngredientListWnd(int width, int height) : UIScrollWnd(width, height, 0), minRefine(0), maxRefine(20) { this->UIWindow::Resize(width, height); - this->Slot15(width, height); + this->OnCreate(width, height); } - void Slot10(int x, int y, std::intptr_t value) override; - __declspec(noinline) void Slot15(int width, int height) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + __declspec(noinline) void OnCreate(int width, int height) override; void Paint() override; - void Slot35(int argument) override; + void OnWheel(int argument) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; UILapineUpgradeBox_IngredientInfoWnd* FindSelected(); bool AddIngredient(std::uint32_t identity); @@ -59,9 +59,9 @@ class UILapineBox_IngredientListWnd : public UIScrollWnd { public: UILapineBox_IngredientListWnd(int width, int height); - void Slot10(int x, int y, std::intptr_t value) override; - __declspec(noinline) void Slot15(int width, int height) override; - void Slot35(int argument) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + __declspec(noinline) void OnCreate(int width, int height) override; + void OnWheel(int argument) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; unsigned char AddIngredient(std::uint32_t id); @@ -86,17 +86,17 @@ class UILapineBoxWnd : public UIFrameWnd { public: UILapineBoxWnd(); ~UILapineBoxWnd() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot19() override; - void Slot28(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnProcess() override; + void OnMouseHover(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; int AddIngredient(std::uint32_t id, int quantity); - void Slot26(int x, int y) override; - void Slot25(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnLBtnDown(int x, int y) override; void NotifyWindow(int unused, int alsoUnused); - void Slot32(int x, int y) override; + void OnRBtnDown(int x, int y) override; void SetIngredient(int id); void AddMaterial(int id, int quantity); __declspec(noinline) void ReadMaterial(ITEM_INFO* out, int x, int y); diff --git a/Source/UI/UILapineUpgradeBoxWnd.cpp b/Source/UI/UILapineUpgradeBoxWnd.cpp index 6e591c5b4..f1fbd0c98 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.cpp +++ b/Source/UI/UILapineUpgradeBoxWnd.cpp @@ -75,7 +75,7 @@ void UILapineUpgradeBoxWndNoop() {} // OFFSET: 0x006036E0 // FUNCTION: fn_04198 -void UILapineUpgradeBoxWnd::Slot15(int, int) { +void UILapineUpgradeBoxWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -116,7 +116,7 @@ void UILapineUpgradeBoxWnd::Slot15(int, int) { // OFFSET: 0x00603A90 // FUNCTION: fn_04199 -void UILapineUpgradeBox_IngredientListWnd::Slot15(int width, int height) { +void UILapineUpgradeBox_IngredientListWnd::OnCreate(int width, int height) { this->scrollBarWidth = 9; if (this->scrollBar) { this->RemoveChild(this->scrollBar, 0); @@ -169,7 +169,7 @@ void UILapineUpgradeBoxWnd::Paint() { // OFFSET: 0x006035E0 // FUNCTION: fn_04194 -void UILapineUpgradeBoxWnd::Slot10(int x, int y, std::intptr_t value) { +void UILapineUpgradeBoxWnd::DragAndDrop(int x, int y, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); if (this->item.unknown_0000[1] > 0) { mode->SendMsg(18, 0, 0, 0, 0); @@ -184,9 +184,9 @@ void UILapineUpgradeBoxWnd::Slot10(int x, int y, std::intptr_t value) { // OFFSET: 0x00603650 // FUNCTION: fn_04195 -void UILapineUpgradeBox_IngredientInfoWnd::Slot10(int x, int y, std::intptr_t value) { +void UILapineUpgradeBox_IngredientInfoWnd::DragAndDrop(int x, int y, std::intptr_t value) { if (this->parent) { - this->parent->Slot10(x + this->geometry.x, y + this->geometry.y, value); + this->parent->DragAndDrop(x + this->geometry.x, y + this->geometry.y, value); } } @@ -198,7 +198,7 @@ void UILapineUpgradeBox_IngredientInfoWnd::Move(int x, int y) { // OFFSET: 0x00603DB0 // FUNCTION: fn_04203 -void UILapineUpgradeBoxWnd::Slot26(int x, int y) { +void UILapineUpgradeBoxWnd::OnLBtnDblClk(int x, int y) { if (static_cast(x - 101) <= 24 && static_cast(y - 165) <= 24 && this->item.unknown_0000[1] != 0) { this->SendMsg(this, 104, this->item.unknown_0000[1], 0, 0, 0); } @@ -206,7 +206,7 @@ void UILapineUpgradeBoxWnd::Slot26(int x, int y) { // OFFSET: 0x00603DF0 // FUNCTION: fn_04204 -void UILapineUpgradeBox_IngredientInfoWnd::Slot26(int x, int y) { +void UILapineUpgradeBox_IngredientInfoWnd::OnLBtnDblClk(int x, int y) { if (this->item.unknown_0000[1] > 0) { this->parent->SendMsg(this, 104, this->item.unknown_0000[1], 0, 0, 0); } @@ -214,9 +214,9 @@ void UILapineUpgradeBox_IngredientInfoWnd::Slot26(int x, int y) { // OFFSET: 0x00603E20 // FUNCTION: fn_04205 -void UILapineUpgradeBoxWnd::Slot25(int x, int y) { +void UILapineUpgradeBoxWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } if (static_cast(x - 101) <= 24 && static_cast(y - 165) <= 24 && this->item.unknown_0000[1] != 0) { static_cast(g_modeMgr.GetGameMode())->drag.BeginItem(g_windowMgr, 26, this->item, 1, -1); @@ -225,7 +225,7 @@ void UILapineUpgradeBoxWnd::Slot25(int x, int y) { // OFFSET: 0x00603E80 // FUNCTION: fn_04206 -void UILapineUpgradeBox_IngredientInfoWnd::Slot25(int x, int y) { +void UILapineUpgradeBox_IngredientInfoWnd::OnLBtnDown(int x, int y) { if (this->item.unknown_0000[1] != 0) { static_cast(g_modeMgr.GetGameMode())->drag.BeginItem(g_windowMgr, 27, this->item, this->quantity, -1); } @@ -233,7 +233,7 @@ void UILapineUpgradeBox_IngredientInfoWnd::Slot25(int x, int y) { // OFFSET: 0x00603EC0 // FUNCTION: fn_04207 -void UILapineUpgradeBox_IngredientInfoWnd::Slot31(int x, int y) { +void UILapineUpgradeBox_IngredientInfoWnd::OnLBtnUp(int x, int y) { this->selected = 1; this->Invalidate(); if (this->parent) { @@ -243,15 +243,15 @@ void UILapineUpgradeBox_IngredientInfoWnd::Slot31(int x, int y) { // OFFSET: 0x00604180 // FUNCTION: fn_04213 -void UILapineUpgradeBox_IngredientInfoWnd::Slot35(int argument) { +void UILapineUpgradeBox_IngredientInfoWnd::OnWheel(int argument) { if (this->parent) { - this->parent->Slot35(argument); + this->parent->OnWheel(argument); } } // OFFSET: 0x006040E0 // FUNCTION: fn_04211 -void UILapineUpgradeBoxWnd::Slot32(int x, int y) { +void UILapineUpgradeBoxWnd::OnRBtnDown(int x, int y) { if (static_cast(x - 101) <= 24 && static_cast(y - 165) <= 24 && this->item.unknown_0000[1] > 0) { UIWindow* window = g_windowMgr.EnsureWindow(12); window->SendMsg(nullptr, 24, reinterpret_cast(&this->item), 0, 0, 0); @@ -260,7 +260,7 @@ void UILapineUpgradeBoxWnd::Slot32(int x, int y) { // OFFSET: 0x00604140 // FUNCTION: fn_04212 -void UILapineUpgradeBox_IngredientInfoWnd::Slot32(int x, int y) { +void UILapineUpgradeBox_IngredientInfoWnd::OnRBtnDown(int x, int y) { if (this->item.unknown_0000[1] > 0) { UIWindow* window = g_windowMgr.EnsureWindow(12); window->SendMsg(this, 24, reinterpret_cast(&this->item), 0, 0, 0); @@ -310,7 +310,7 @@ void UILapineUpgradeBoxWnd::SetIngredient(int id) { // OFFSET: 0x00603680 // FUNCTION: fn_04196 -void UILapineUpgradeBox_IngredientListWnd::Slot10(int x, int y, std::intptr_t value) { +void UILapineUpgradeBox_IngredientListWnd::DragAndDrop(int x, int y, std::intptr_t value) { CMode* mode = g_modeMgr.GetGameMode(); const ModeDragState* drag = reinterpret_cast(value); if (drag->source == 26) { @@ -368,7 +368,7 @@ int UILapineUpgradeBox_IngredientListWnd::SendMsg(UIWindow* sender, int message, y += 0x1E; } } - this->Slot53(); + this->UpdateScrollRange(); this->Invalidate(); break; } @@ -389,7 +389,7 @@ void UILapineUpgradeBox_IngredientListWnd::Paint() { // OFFSET: 0x006041A0 // FUNCTION: fn_04214 -void UILapineUpgradeBox_IngredientListWnd::Slot35(int argument) { +void UILapineUpgradeBox_IngredientListWnd::OnWheel(int argument) { if (this->wheelScroll == 1) { if (argument < 0) { this->SendMsg(this->scrollBar, 7, 15, 0, 0, 0); @@ -418,7 +418,7 @@ inline UILapineUpgradeBox_IngredientInfoWnd* UILapineUpgradeBoxWnd::FindSelected // OFFSET: 0x00603FE0 // FUNCTION: fn_04210 -void UILapineUpgradeBoxWnd::Slot19() { +void UILapineUpgradeBoxWnd::OnProcess() { UILapineUpgradeBox_IngredientInfoWnd* selected = this->FindSelected(); if (!selected) { if (this->selectButton->Disabled() == 0) { @@ -453,8 +453,8 @@ void UILapineUpgradeBoxWnd::Slot19() { // OFFSET: 0x00603F70 // FUNCTION: fn_04209 -void UILapineUpgradeBox_IngredientInfoWnd::Slot28(int x, int y) { - this->Slot27(x, y); +void UILapineUpgradeBox_IngredientInfoWnd::OnMouseHover(int x, int y) { + this->OnMouseMove(x, y); if (this->tooltip.size() > 0) { int tipX = 0; @@ -466,8 +466,8 @@ void UILapineUpgradeBox_IngredientInfoWnd::Slot28(int x, int y) { // OFFSET: 0x00603EF0 // FUNCTION: fn_04208 -void UILapineUpgradeBoxWnd::Slot28(int x, int y) { - this->Slot27(x, y); +void UILapineUpgradeBoxWnd::OnMouseHover(int x, int y) { + this->OnMouseMove(x, y); if (static_cast(x - 101) <= 24 && static_cast(y - 165) <= 24 && this->item.unknown_0000[1] > 0) { int tipX = 101; diff --git a/Source/UI/UILapineUpgradeBoxWnd.h b/Source/UI/UILapineUpgradeBoxWnd.h index 4170feb49..663dc1183 100644 --- a/Source/UI/UILapineUpgradeBoxWnd.h +++ b/Source/UI/UILapineUpgradeBoxWnd.h @@ -15,14 +15,14 @@ public: UILapineUpgradeBox_IngredientInfoWnd(); void Move(int x, int y) override; - void Slot10(int x, int y, std::intptr_t value) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot35(int argument) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnWheel(int argument) override; void SetItem(std::uint32_t identity); /* 00B8 */ ITEM_INFO item; @@ -37,14 +37,14 @@ class UILapineUpgradeBoxWnd : public UIFrameWnd { public: UILapineUpgradeBoxWnd(); ~UILapineUpgradeBoxWnd() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot19() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SetWaiting(unsigned char value); UILapineUpgradeBox_IngredientInfoWnd* FindSelected(); diff --git a/Source/UI/UIMacroBlackListCheckWnd.cpp b/Source/UI/UIMacroBlackListCheckWnd.cpp index 2d524b8df..9a327179a 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.cpp +++ b/Source/UI/UIMacroBlackListCheckWnd.cpp @@ -43,7 +43,7 @@ UIMacroBlackListCheckWnd::UIMacroBlackListCheckWnd() // OFFSET: 0x007EB230 // FUNCTION: fn_09794 -void UIMacroBlackListCheckWnd::Slot15(int width, int height) { +void UIMacroBlackListCheckWnd::OnCreate(int width, int height) { for (int i = 0; i < 10; ++i) { this->digits[i] = static_cast(i); } @@ -147,22 +147,22 @@ void UIMacroBlackListCheckWnd::Paint() { // OFFSET: 0x007EC770 // FUNCTION: fn_09796 -void UIMacroBlackListCheckWnd::Slot25(int, int) { +void UIMacroBlackListCheckWnd::OnLBtnDown(int, int) { } // OFFSET: 0x007EC780 // FUNCTION: fn_09797 -void UIMacroBlackListCheckWnd::Slot31(int, int) { +void UIMacroBlackListCheckWnd::OnLBtnUp(int, int) { } // OFFSET: 0x007EC790 // FUNCTION: fn_09798 -void UIMacroBlackListCheckWnd::Slot27(int, int) { +void UIMacroBlackListCheckWnd::OnMouseMove(int, int) { } // OFFSET: 0x007EC7A0 // FUNCTION: fn_09799 -void UIMacroBlackListCheckWnd::Slot19() { +void UIMacroBlackListCheckWnd::OnProcess() { this->Invalidate(); } diff --git a/Source/UI/UIMacroBlackListCheckWnd.h b/Source/UI/UIMacroBlackListCheckWnd.h index 7ba62e0e3..48a53476d 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.h +++ b/Source/UI/UIMacroBlackListCheckWnd.h @@ -10,12 +10,12 @@ class UIBitmapButton; class UIMacroBlackListCheckWnd : public UIFrameWnd { public: UIMacroBlackListCheckWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(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 ShuffleDigitButtons(); void Activate(unsigned char state, int duration); diff --git a/Source/UI/UIMacroDetectorWnd.cpp b/Source/UI/UIMacroDetectorWnd.cpp index 4201116b6..b9e393d13 100644 --- a/Source/UI/UIMacroDetectorWnd.cpp +++ b/Source/UI/UIMacroDetectorWnd.cpp @@ -24,22 +24,22 @@ static_assert(sizeof(CaptchaAnswerPacket) == 18); // OFFSET: 0x007EDC00 // FUNCTION: fn_09814 -void UIMacroDetectorWnd::Slot25(int, int) { +void UIMacroDetectorWnd::OnLBtnDown(int, int) { } // OFFSET: 0x007EDC10 // FUNCTION: fn_09815 -void UIMacroDetectorWnd::Slot31(int, int) { +void UIMacroDetectorWnd::OnLBtnUp(int, int) { } // OFFSET: 0x007EDC20 // FUNCTION: fn_09816 -void UIMacroDetectorWnd::Slot27(int, int) { +void UIMacroDetectorWnd::OnMouseMove(int, int) { } // OFFSET: 0x007EDC30 // FUNCTION: fn_09817 -void UIMacroDetectorWnd::Slot19() { +void UIMacroDetectorWnd::OnProcess() { if (this->messageTick + this->messageDuration < timeGetTime()) { this->message = ""; } diff --git a/Source/UI/UIMacroDetectorWnd.h b/Source/UI/UIMacroDetectorWnd.h index e0d9f413e..fcb7343cb 100644 --- a/Source/UI/UIMacroDetectorWnd.h +++ b/Source/UI/UIMacroDetectorWnd.h @@ -13,12 +13,12 @@ class UIBitmapButton; class UIMacroDetectorWnd : public UIFrameWnd { public: UIMacroDetectorWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void AddImageData(const void* data, int size); diff --git a/Source/UI/UIMacroReport.cpp b/Source/UI/UIMacroReport.cpp index 4f0e6a087..101abda2d 100644 --- a/Source/UI/UIMacroReport.cpp +++ b/Source/UI/UIMacroReport.cpp @@ -113,7 +113,7 @@ void CUIMacroReport::OnEditSubmit() { // OFFSET: 0x00A47C40 // FUNCTION: fn_16101 -void CUIMacroReport::Slot16() { +void CUIMacroReport::OnInit() { this->m_resolveSkin = true; this->Move((g_renderer->viewport.width - this->geometry.width) / 2, (g_renderer->viewport.height - this->geometry.height) / 2); @@ -135,13 +135,13 @@ void CUIMacroReport::OnReportTypeSelect(CUIRadioButton* button) { // OFFSET: 0x00A441F0 // FUNCTION: fn_16052 -void CUIMacroReport::Slot53() { +void CUIMacroReport::Initialize() { this->unknown_00B4 = 0; this->m_resolveSkin = false; this->Resize(0xE7, 0xBD); this->Move(0, 0); - this->Slot15(this->geometry.width, this->geometry.height); - this->Slot16(); + this->OnCreate(this->geometry.width, this->geometry.height); + this->OnInit(); } // OFFSET: 0x00A44170 @@ -160,7 +160,7 @@ static bool s_registered = [] { // OFFSET: 0x00A44240 // FUNCTION: fn_16053 -void CUIMacroReport::Slot15(int width, int height) { +void CUIMacroReport::OnCreate(int width, int height) { this->m_background = new CUIStaticImage(); this->m_background->SetSize(231, 172); this->m_background->Move(0, 17); diff --git a/Source/UI/UIMacroReport.h b/Source/UI/UIMacroReport.h index cc33669c8..51d691c56 100644 --- a/Source/UI/UIMacroReport.h +++ b/Source/UI/UIMacroReport.h @@ -31,9 +31,9 @@ public: __declspec(noinline) CUIMacroReport(); - void Slot15(int width, int height) override; - void Slot16() override; - void Slot53() override; + void OnCreate(int width, int height) override; + void OnInit() override; + void Initialize() override; void OnButtonClick(); void OnEditSubmit(); diff --git a/Source/UI/UIMacroUserInfoWnd.cpp b/Source/UI/UIMacroUserInfoWnd.cpp index 354911b62..116faf04a 100644 --- a/Source/UI/UIMacroUserInfoWnd.cpp +++ b/Source/UI/UIMacroUserInfoWnd.cpp @@ -173,13 +173,13 @@ std::string UIMacroReporterWnd::EllipsizeText(int maxWidth, const char* text, in // OFFSET: 0x007F0480 // FUNCTION: fn_09845 -bool UIMacroUserInfoWnd::Slot08() { +bool UIMacroUserInfoWnd::IsTransmitMouseInput() { return true; } // OFFSET: 0x007F0EE0 // FUNCTION: fn_09847 -void UIMacroUserInfoWnd::Slot15(int, int) { +void UIMacroUserInfoWnd::OnCreate(int, int) { this->AddCloseButton("", 0); } @@ -238,7 +238,7 @@ void UIMacroUserInfoWnd::Paint() { // OFFSET: 0x007F1160 // FUNCTION: fn_09850 -void UIMacroReporterWnd::Slot25(int x, int y) { +void UIMacroReporterWnd::OnLBtnDown(int x, int y) { if (this->unknown_010C == 1 && y > 17) { return; } @@ -261,7 +261,7 @@ void UIMacroReporterWnd::Slot25(int x, int y) { // OFFSET: 0x007F11F0 // FUNCTION: fn_09851 -void UIMacroReporterWnd::Slot31(int, int) { +void UIMacroReporterWnd::OnLBtnUp(int, int) { if (this != g_windowMgr.Capture()) { return; } @@ -273,7 +273,7 @@ void UIMacroReporterWnd::Slot31(int, int) { // OFFSET: 0x007F1230 // FUNCTION: fn_09852 -void UIMacroReporterWnd::Slot19() { +void UIMacroReporterWnd::OnProcess() { for (auto it = this->m_removedRows.begin(); it != this->m_removedRows.end();) { if (!(*it)->Disabled()) { ++it; @@ -288,7 +288,7 @@ void UIMacroReporterWnd::Slot19() { // OFFSET: 0x007F12A0 // FUNCTION: fn_09853 -void UIMacroReporterWnd::Slot35(int delta) { +void UIMacroReporterWnd::OnWheel(int delta) { if (this->m_scrollable == 1) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 7, 3, 0, 0, 0); @@ -422,7 +422,7 @@ int UIMacroUserInfoWnd::SendMsg( // OFFSET: 0x007F26C0 // FUNCTION: fn_09858 -void UIMacroReporterWnd::Slot11() { +void UIMacroReporterWnd::StoreInfo() { if (this->m_state) { this->m_state->width = this->geometry.width; this->m_state->height = this->geometry.height; @@ -455,7 +455,7 @@ void __stdcall SendMacroUserInfoPacket(std::uint16_t first, std::uint16_t second // OFFSET: 0x007F0490 // FUNCTION: fn_09846 -void UIMacroReporterWnd::Slot15(int, int) { +void UIMacroReporterWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/UIMacroUserInfoWnd.h b/Source/UI/UIMacroUserInfoWnd.h index f8c1c11d9..552590487 100644 --- a/Source/UI/UIMacroUserInfoWnd.h +++ b/Source/UI/UIMacroUserInfoWnd.h @@ -13,8 +13,8 @@ class UIScrollBar; class UIMacroUserInfoWnd : public UIFrameWnd { public: UIMacroUserInfoWnd(); - bool Slot08() override; - void Slot15(int width, int height) override; + bool IsTransmitMouseInput() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg( UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4 @@ -46,13 +46,13 @@ struct MacroReporterState { class UIMacroReporterWnd : public UIFrameWnd { public: UIMacroReporterWnd(); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int delta) override; int SendMsg( UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4 ) override; diff --git a/Source/UI/UIPreviewEquipWnd.cpp b/Source/UI/UIPreviewEquipWnd.cpp index 8a93c71f3..334332d12 100644 --- a/Source/UI/UIPreviewEquipWnd.cpp +++ b/Source/UI/UIPreviewEquipWnd.cpp @@ -73,7 +73,7 @@ void UIPreviewEquipWnd::DrawCharacter() { // OFFSET: 0x007F38A0 // FUNCTION: fn_09882 -void UIPreviewEquipWnd::Slot15(int width, int height) { +void UIPreviewEquipWnd::OnCreate(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -160,9 +160,9 @@ void UIPreviewEquipWnd::SyncFromPlayer() { this->m_render->unknown_002C = player->unknown_0454; this->m_render->unknown_0030 = player->unknown_0458; this->m_render->SetRobe(player->unknown_049C); - this->m_render->unknown_0048 = player->Slot56(); + this->m_render->unknown_0048 = player->GetMadogearType(); this->m_render->unknown_004C = player->unknown_02CC; - this->m_render->unknown_0050 = player->Slot46(); + this->m_render->unknown_0050 = player->GetBodyCostume(); *reinterpret_cast(&this->m_render->unknown_0054) = -5.0f; this->m_render->unknown_0058 = 136.0f; this->RefreshHeadgearLocations(); @@ -399,7 +399,7 @@ void UIPreviewEquipWnd::RefreshHeadgearLocations() { // OFFSET: 0x007F4830 // FUNCTION: fn_09888 -void UIPreviewEquipWnd::Slot11() { +void UIPreviewEquipWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -408,6 +408,6 @@ void UIPreviewEquipWnd::Slot11() { // OFFSET: 0x007F3DB0 // FUNCTION: fn_09884 -void UIPreviewEquipWnd::Slot19() { +void UIPreviewEquipWnd::OnProcess() { this->Invalidate(); } diff --git a/Source/UI/UIPreviewEquipWnd.h b/Source/UI/UIPreviewEquipWnd.h index 453e2b9a4..32c584077 100644 --- a/Source/UI/UIPreviewEquipWnd.h +++ b/Source/UI/UIPreviewEquipWnd.h @@ -12,10 +12,10 @@ class UIPreviewEquipWnd : public UIFrameWnd { public: UIPreviewEquipWnd(); ~UIPreviewEquipWnd() override; - void Slot11() override; + void StoreInfo() override; void Paint() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void DrawCharacter(); void RefreshHeadgearLocations(); diff --git a/Source/UI/UIRefiningWnd.cpp b/Source/UI/UIRefiningWnd.cpp index 800f6155a..1868ef501 100644 --- a/Source/UI/UIRefiningWnd.cpp +++ b/Source/UI/UIRefiningWnd.cpp @@ -75,7 +75,7 @@ UIRefining_BtnReturn::UIRefining_BtnReturn() : UIBitmapButton(), highlighted(1) // OFFSET: 0x007F5E30 // FUNCTION: fn_09907 -void UIRefiningWnd::Slot15(int width, int height) { +void UIRefiningWnd::OnCreate(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -131,7 +131,7 @@ void UIRefiningWnd::Slot15(int width, int height) { // OFFSET: 0x007F5270 // FUNCTION: fn_09902 -void UIRefiningWnd::Slot10(int x, int y, std::intptr_t value) { +void UIRefiningWnd::DragAndDrop(int x, int y, std::intptr_t value) { const ModeDragState* drag = reinterpret_cast(value); if (static_cast(x - 109) <= 46 && static_cast(y - 201) <= 46 && drag->source == 1) { this->SendMsg(this, 23, drag->id, 0, 0, 0); @@ -413,7 +413,7 @@ void UIRefining_Notice::Paint() { // OFFSET: 0x007F72A0 // FUNCTION: fn_09913 -void UIRefiningWnd::Slot26(int x, int y) { +void UIRefiningWnd::OnLBtnDblClk(int x, int y) { if (this->item.unknown_0000[1] > 0 && static_cast(x - 109) <= 46 && static_cast(y - 201) <= 46) { this->Reset(); } @@ -421,9 +421,9 @@ void UIRefiningWnd::Slot26(int x, int y) { // OFFSET: 0x007F72D0 // FUNCTION: fn_09914 -void UIRefiningWnd::Slot25(int x, int y) { +void UIRefiningWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -434,9 +434,9 @@ void UIRefiningWnd::Slot25(int x, int y) { // OFFSET: 0x007F7340 // FUNCTION: fn_09915 -void UIRefiningWnd::Slot31(int x, int y) { +void UIRefiningWnd::OnLBtnUp(int x, int y) { if (y < 17) { - UIFrameWnd::Slot31(x, y); + UIFrameWnd::OnLBtnUp(x, y); return; } @@ -522,7 +522,7 @@ void UIRefiningWnd::Slot31(int x, int y) { // OFFSET: 0x007F76C0 // FUNCTION: fn_09916 -void UIRefiningWnd::Slot28(int x, int y) { +void UIRefiningWnd::OnMouseHover(int x, int y) { if (this->state != 1) { return; } @@ -585,9 +585,9 @@ void UIRefiningWnd::Slot28(int x, int y) { // OFFSET: 0x007F7AA0 // FUNCTION: fn_09917 -void UIRefiningWnd::Slot19() { +void UIRefiningWnd::OnProcess() { if (this->notice) { - this->notice->Slot19(); + this->notice->OnProcess(); } if (this->state == 1 && this->refiningButton->Disabled() == 1 && this->item.unknown_0000[1] > 0 && this->selectedMaterial >= 0 && @@ -652,7 +652,7 @@ void UIRefiningWnd::Slot19() { // OFFSET: 0x007F7D80 // FUNCTION: fn_09918 -void UIRefining_Notice::Slot19() { +void UIRefining_Notice::OnProcess() { if (this->expireTick != 0 && timeGetTime() > this->expireTick) { this->expireTick = 0; if (this->autoShown == 1) { @@ -670,12 +670,12 @@ void UIRefining_Notice::Slot19() { // OFFSET: 0x007F7E10 // FUNCTION: fn_09919 -void UIRefiningWnd::Slot32(int x, int y) { +void UIRefiningWnd::OnRBtnDown(int x, int y) { } // OFFSET: 0x007F7E20 // FUNCTION: fn_09920 -void UIRefiningWnd::Slot33(int x, int y) { +void UIRefiningWnd::OnRBtnUp(int x, int y) { if (y < 17) { return; } diff --git a/Source/UI/UIRefiningWnd.h b/Source/UI/UIRefiningWnd.h index d48b5b3d2..9e1e9f53a 100644 --- a/Source/UI/UIRefiningWnd.h +++ b/Source/UI/UIRefiningWnd.h @@ -57,7 +57,7 @@ public: // INLINED UIRefining_Notice() : UIStaticText(), savedHighlight(0), expireTick(0), autoShown(0), highlight(0) {} - void Slot19() override; + void OnProcess() override; void Paint() override; void SetNotice(const char* value, int duration, unsigned char highlight); @@ -71,16 +71,16 @@ public: class UIRefiningWnd : public UIFrameWnd { public: UIRefiningWnd(); - void Slot10(int x, int y, std::intptr_t value) override; - void Slot15(int width, int height) override; - void Slot19() override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(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; int SlotAt(int x, int y); void Reset(); diff --git a/Source/UI/UIReputeWnd.cpp b/Source/UI/UIReputeWnd.cpp index 54390c36d..edbcfecbc 100644 --- a/Source/UI/UIReputeWnd.cpp +++ b/Source/UI/UIReputeWnd.cpp @@ -42,13 +42,13 @@ UIReputeWnd::UIReputeWnd() // OFFSET: 0x0060F170 // FUNCTION: fn_04312 -bool UIReputeWnd::Slot02() { +bool UIReputeWnd::IsFrameWnd() { return true; } // OFFSET: 0x0060F180 // FUNCTION: fn_04313 -void UIReputeWnd::Slot15(int width, int height) { +void UIReputeWnd::OnCreate(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/UIReputeWnd.h b/Source/UI/UIReputeWnd.h index f7e13f0a8..7df69638f 100644 --- a/Source/UI/UIReputeWnd.h +++ b/Source/UI/UIReputeWnd.h @@ -16,8 +16,8 @@ class UIEditCtrl; class UIReputeWnd : public UIFrameWnd { public: UIReputeWnd(); - bool Slot02() override; - void Slot15(int width, int height) override; + bool IsFrameWnd() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void FilterByGroup(const std::string& group); diff --git a/Source/UI/UIRoundBoxTooltipWnd.cpp b/Source/UI/UIRoundBoxTooltipWnd.cpp index e772b423d..9b770fb44 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.cpp +++ b/Source/UI/UIRoundBoxTooltipWnd.cpp @@ -20,7 +20,7 @@ // OFFSET: 0x0099A1F0 // FUNCTION: fn_13540 -void UIRoundBoxTooltipWnd::Slot15(int width, int height) { +void UIRoundBoxTooltipWnd::OnCreate(int width, int height) { if (this->viewer) { return; } diff --git a/Source/UI/UIRoundBoxTooltipWnd.h b/Source/UI/UIRoundBoxTooltipWnd.h index 3991204c2..8ff4983d0 100644 --- a/Source/UI/UIRoundBoxTooltipWnd.h +++ b/Source/UI/UIRoundBoxTooltipWnd.h @@ -18,7 +18,7 @@ public: class UIRoundBoxTooltipWnd : public UIFrameWnd { public: UIRoundBoxTooltipWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/UIScrollWnd.cpp b/Source/UI/UIScrollWnd.cpp index db0ebcd65..bb46d59c4 100644 --- a/Source/UI/UIScrollWnd.cpp +++ b/Source/UI/UIScrollWnd.cpp @@ -18,7 +18,7 @@ UIScrollWnd::UIScrollWnd(int width, int height, unsigned char cached) : UIWindow(cached), viewWidth(0), viewHeight(0), contentWidth(0), contentHeight(0), horizontalBar(nullptr), scrollBar(nullptr), scrollBarWidth(13), scrollBarHeight(13), unknown_009C(0), scrollPosition(0), unknown_00A4(0), wheelScroll(0) { this->UIWindow::Resize(width, height); - this->Slot15(width, height); + this->OnCreate(width, height); } // OFFSET: 0x009AC2B0 @@ -59,7 +59,7 @@ void UIScrollWnd::AddScrollChild(UIWindow* child) { } } - this->Slot53(); + this->UpdateScrollRange(); } // OFFSET: 0x009AC7B0 @@ -68,7 +68,7 @@ void UIScrollWnd::MoveScrollChild(UIWindow* child, int x, int y) { child->Move(x, y); this->childOrigins[child].first = x; this->childOrigins[child].second = y; - this->Slot53(); + this->UpdateScrollRange(); } // OFFSET: 0x009AC890 @@ -268,7 +268,7 @@ RenderPrimitive* UIScrollWnd::BuildPrimitive(int x, int y, int sourceX, int sour // OFFSET: 0x009AD3A0 // FUNCTION: fn_13783 -__declspec(noinline) void UIScrollWnd::Slot15(int width, int height) { +__declspec(noinline) void UIScrollWnd::OnCreate(int width, int height) { this->horizontalBar = new UIScrollBar(); this->horizontalBar->Configure(0, height - this->scrollBarHeight, 0, width - this->scrollBarWidth); this->AddChild(this->horizontalBar); @@ -279,7 +279,7 @@ __declspec(noinline) void UIScrollWnd::Slot15(int width, int height) { // OFFSET: 0x009AD4A0 // FUNCTION: fn_13784 -void UIScrollWnd::Slot35(int delta) { +void UIScrollWnd::OnWheel(int delta) { if (this->wheelScroll == 1) { if (delta < 0) { this->SendMsg(this->scrollBar, 7, 3, 0, 0, 0); @@ -291,7 +291,7 @@ void UIScrollWnd::Slot35(int delta) { // OFFSET: 0x009AD4E0 // FUNCTION: fn_13785 -void UIScrollWnd::Slot53() { +void UIScrollWnd::UpdateScrollRange() { if (!this->horizontalBar || !this->scrollBar) { return; } @@ -430,7 +430,7 @@ void UIScrollWnd::Resize(int width, int height) { this->horizontalBar->Resize(width - this->scrollBarWidth, this->scrollBarHeight); this->horizontalBar->Move(0, height - this->scrollBarHeight); } - this->Slot53(); + this->UpdateScrollRange(); } // OFFSET: 0x009AD940 diff --git a/Source/UI/UIScrollWnd.h b/Source/UI/UIScrollWnd.h index cb714cd07..c40eba861 100644 --- a/Source/UI/UIScrollWnd.h +++ b/Source/UI/UIScrollWnd.h @@ -14,11 +14,11 @@ public: UIScrollWnd(int width, int height, unsigned char cached); ~UIScrollWnd() override; void Resize(int width, int height) override; - void Slot15(int width, int height) override; - void Slot35(int delta) override; + void OnCreate(int width, int height) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; RenderPrimitive* DrawPrimitive() override; - virtual void Slot53(); + virtual void UpdateScrollRange(); RenderPrimitive* BuildPrimitive(int x, int y, int sourceX, int sourceY, int width, int height, CTexture* texture, std::uint32_t color); void Clear(); diff --git a/Source/UI/UISlotBitmap.cpp b/Source/UI/UISlotBitmap.cpp index 56c218e4b..9ed3b846d 100644 --- a/Source/UI/UISlotBitmap.cpp +++ b/Source/UI/UISlotBitmap.cpp @@ -3,7 +3,7 @@ // OFFSET: 0x0085ADA0 // FUNCTION: fn_10789 -void UISlotBitmap::Slot15(int, int) { +void UISlotBitmap::OnCreate(int, int) { if (this->unknown_00B8 == 1) { this->addButton = new UIBitmapButton(); this->addButton->SetBitmap("유저인터페이스\\select_character\\btn_add_out.bmp", 0, 0); @@ -21,7 +21,7 @@ void UISlotBitmap::Slot15(int, int) { // OFFSET: 0x0085E980 // FUNCTION: fn_10833 -void UISlotBitmap::Slot26(int, int) { +void UISlotBitmap::OnLBtnDblClk(int, int) { if (this->parent) { this->parent->SendMsg(this, 6, 184, 0, 0, 0); } @@ -29,7 +29,7 @@ void UISlotBitmap::Slot26(int, int) { // OFFSET: 0x0085ED30 // FUNCTION: fn_10846 -void UISlotBitmap::Slot25(int, int) { +void UISlotBitmap::OnLBtnDown(int, int) { if (this->parent) { this->parent->SendMsg(this, 13, this->slot, 0, 0, 0); this->parent->SendMsg(this, 6, this->geometry.id, 0, 0, 0); @@ -38,7 +38,7 @@ void UISlotBitmap::Slot25(int, int) { // OFFSET: 0x0085FE60 // FUNCTION: fn_10887 -void UISlotBitmap::Slot32(int, int) { +void UISlotBitmap::OnRBtnDown(int, int) { if (this->parent) { this->parent->SendMsg(this, 13, this->slot, 0, 0, 0); this->parent->SendMsg(this, 6, this->geometry.id, 226, 0, 0); diff --git a/Source/UI/UISlotBitmap.h b/Source/UI/UISlotBitmap.h index d0da76443..dcd8e0ad9 100644 --- a/Source/UI/UISlotBitmap.h +++ b/Source/UI/UISlotBitmap.h @@ -9,10 +9,10 @@ class UISlotBitmap : public UIStaticBitmap { public: UISlotBitmap(int slot); UISlotBitmap(int slot, unsigned char flag); - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot32(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnRBtnDown(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; /* 00B8 */ unsigned char unknown_00B8; diff --git a/Source/UI/UIStaticBitmap.cpp b/Source/UI/UIStaticBitmap.cpp index acc49c1fd..5db3cdaf4 100644 --- a/Source/UI/UIStaticBitmap.cpp +++ b/Source/UI/UIStaticBitmap.cpp @@ -55,27 +55,27 @@ void UIStaticBitmap::Paint() { // OFFSET: 0x0085EE10 // FUNCTION: fn_10849 -void UIStaticBitmap::Slot25(int x, int y) { - this->parent->Slot25((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticBitmap::OnLBtnDown(int x, int y) { + this->parent->OnLBtnDown((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085EA30 // FUNCTION: fn_10836 -void UIStaticBitmap::Slot26(int x, int y) { - this->parent->Slot26((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticBitmap::OnLBtnDblClk(int x, int y) { + this->parent->OnLBtnDblClk((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085F8A0 // FUNCTION: fn_10872 -void UIStaticBitmap::Slot27(int x, int y) { - this->parent->Slot27((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticBitmap::OnMouseMove(int x, int y) { + this->parent->OnMouseMove((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085F500 // FUNCTION: fn_10865 -void UIStaticBitmap::Slot28(int x, int y) { +void UIStaticBitmap::OnMouseHover(int x, int y) { if (this->forwardHover != 0) { - this->parent->Slot28(x, y); + this->parent->OnMouseHover(x, y); } if (!this->tooltip.empty()) { @@ -94,24 +94,24 @@ void UIStaticBitmap::ResetCursor(int x, int y) { // OFFSET: 0x0085F000 // FUNCTION: fn_10854 -void UIStaticBitmap::Slot31(int x, int y) { - this->parent->Slot31((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticBitmap::OnLBtnUp(int x, int y) { + this->parent->OnLBtnUp((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085FEA0 // FUNCTION: fn_10888 -void UIStaticBitmap::Slot32(int x, int y) { - this->parent->Slot32((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticBitmap::OnRBtnDown(int x, int y) { + this->parent->OnRBtnDown((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x0085FF00 // FUNCTION: fn_10890 -void UIStaticBitmap::Slot33(int x, int y) { - this->parent->Slot33((x + this->geometry.x), (y + this->geometry.y)); +void UIStaticBitmap::OnRBtnUp(int x, int y) { + this->parent->OnRBtnUp((x + this->geometry.x), (y + this->geometry.y)); } // OFFSET: 0x00860010 // FUNCTION: fn_10896 -void UIStaticBitmap::Slot35(int value) { - this->parent->Slot35(value); +void UIStaticBitmap::OnWheel(int value) { + this->parent->OnWheel(value); } diff --git a/Source/UI/UIStaticBitmap.h b/Source/UI/UIStaticBitmap.h index 7f25bd226..872f231b4 100644 --- a/Source/UI/UIStaticBitmap.h +++ b/Source/UI/UIStaticBitmap.h @@ -10,15 +10,15 @@ public: UIStaticBitmap(); ~UIStaticBitmap() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int value) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int value) override; void SetBitmap(const char* name); void SetTooltip(const char* text); diff --git a/Source/UI/UIStaticItem.h b/Source/UI/UIStaticItem.h index dbb52fe80..872cd6136 100644 --- a/Source/UI/UIStaticItem.h +++ b/Source/UI/UIStaticItem.h @@ -11,8 +11,8 @@ public: UIStaticItem(); ~UIStaticItem() override; void Paint() override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(int x, int y) override; protected: /* 0080 */ ITEM_INFO m_item; @@ -21,7 +21,7 @@ protected: class UIStaticItem_Illust : public UIStaticItem { public: void Paint() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; }; #endif diff --git a/Source/UI/Window/FrameFocus.cpp b/Source/UI/Window/FrameFocus.cpp index cffc13ad6..b501b34d8 100644 --- a/Source/UI/Window/FrameFocus.cpp +++ b/Source/UI/Window/FrameFocus.cpp @@ -235,7 +235,7 @@ void UIWindowMgr::CancelActiveDialog() { } for (auto entry = this->rendered.begin(); entry != this->rendered.end(); ++entry) { - if ((*entry)->Slot02()) { + if ((*entry)->IsFrameWnd()) { (*entry)->SendMsg(nullptr, 20, 0, 0, 0, 0); } } diff --git a/Source/UI/Window/InputFocus.cpp b/Source/UI/Window/InputFocus.cpp index bf57c692a..fe1bd24f2 100644 --- a/Source/UI/Window/InputFocus.cpp +++ b/Source/UI/Window/InputFocus.cpp @@ -5,15 +5,15 @@ // FUNCTION: fn_17256 void UIWindowMgr::SetFocus(UIWindow* value) { if (this->hoverWindow) { - const bool retained = value && value->Slot06() == this->hoverWindow; - this->hoverWindow->Slot24(retained); + const bool retained = value && value->GetEditWindow() == this->hoverWindow; + this->hoverWindow->OnFinishEdit(retained); } if (value) { - this->hoverWindow = value->Slot06(); + this->hoverWindow = value->GetEditWindow(); if (this->hoverWindow) { - this->hoverWindow->Slot23(); + this->hoverWindow->OnBeginEdit(); } } else { this->hoverWindow = nullptr; @@ -28,14 +28,14 @@ void UIWindowMgr::FocusFirst() { for (auto it = parent->m_children.begin(); it != parent->m_children.end(); ++it) { UIWindow* child = *it; - if (child->Slot05()) { + if (child->IsEditable()) { this->SetFocus(child); return; } } if (this->hoverWindow) { - this->hoverWindow->Slot24(0); + this->hoverWindow->OnFinishEdit(0); } } @@ -50,14 +50,14 @@ void UIWindowMgr::FocusLast() { for (auto it = parent->m_children.rbegin(); it != parent->m_children.rend(); ++it) { UIWindow* child = *it; - if (child->Slot05()) { + if (child->IsEditable()) { this->SetFocus(child); return; } } if (this->hoverWindow) { - this->hoverWindow->Slot24(0); + this->hoverWindow->OnFinishEdit(0); } } @@ -73,7 +73,7 @@ void UIWindowMgr::FocusNext() { UIWindow* next = this->hoverWindow->parent->NextFocusable(this->hoverWindow); if (next) { - if (next->Slot05()) { + if (next->IsEditable()) { this->SetFocus(next); } } else { @@ -96,7 +96,7 @@ void UIWindowMgr::FocusPrevious() { UIWindow* previous = this->hoverWindow->parent->PreviousFocusable(this->hoverWindow); if (previous) { - if (previous->Slot05()) { + if (previous->IsEditable()) { this->SetFocus(previous); } } else { diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.cpp b/Source/UI/Window/UIAccountLimitedToolWnd.cpp index ef0aa2712..03c4db1cf 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.cpp +++ b/Source/UI/Window/UIAccountLimitedToolWnd.cpp @@ -50,7 +50,7 @@ struct AccountLimitedRange { // OFFSET: 0x0094A450 // FUNCTION: fn_12890 -void UIAccountLimitedToolWnd::Slot15(int, int) { +void UIAccountLimitedToolWnd::OnCreate(int, int) { this->AddCloseButton("", 0); const int editPositions[15][2] = { diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.h b/Source/UI/Window/UIAccountLimitedToolWnd.h index 36b73c462..512d5cd77 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.h +++ b/Source/UI/Window/UIAccountLimitedToolWnd.h @@ -13,7 +13,7 @@ class UITextViewer; class UIAccountLimitedToolWnd : public UIFrameWnd { public: UIAccountLimitedToolWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIBalloonOpenBtn.cpp b/Source/UI/Window/UIBalloonOpenBtn.cpp index 241261300..d9bfbdc71 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.cpp +++ b/Source/UI/Window/UIBalloonOpenBtn.cpp @@ -21,7 +21,7 @@ void UIBalloonOpenBtn::Paint() { // OFFSET: 0x0094F0E0 // FUNCTION: fn_12931 -void UIBalloonOpenBtn::Slot19() { +void UIBalloonOpenBtn::OnProcess() { if (this->m_balloon) { const std::int64_t elapsed = static_cast(timeGetTime()) - this->m_openTime; if (elapsed > this->m_openDelay) { diff --git a/Source/UI/Window/UIBalloonOpenBtn.h b/Source/UI/Window/UIBalloonOpenBtn.h index 74f850ada..092434f0a 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.h +++ b/Source/UI/Window/UIBalloonOpenBtn.h @@ -12,8 +12,8 @@ class UIBalloonOpenBtn : public UIFrameWnd { public: UIBalloonOpenBtn(); void Paint() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: diff --git a/Source/UI/Window/UIBank_NewWnd.h b/Source/UI/Window/UIBank_NewWnd.h index 35dcfbcdb..8a16b9c16 100644 --- a/Source/UI/Window/UIBank_NewWnd.h +++ b/Source/UI/Window/UIBank_NewWnd.h @@ -8,8 +8,8 @@ class UIEditCtrl; class UIBank_NewWnd : public UIFrameWnd { public: UIBank_NewWnd(); - bool Slot03() override; - void Slot15(int width, int height) override; + bool NeedsFrameRefresh() override; + void OnCreate(int width, int height) override; long long AdjustAmount(int amount); long long TransactionAmount(unsigned char deposit); void Paint() override; diff --git a/Source/UI/Window/UIBasicInfoWnd.cpp b/Source/UI/Window/UIBasicInfoWnd.cpp index aa8ae9b94..7868e3f2b 100644 --- a/Source/UI/Window/UIBasicInfoWnd.cpp +++ b/Source/UI/Window/UIBasicInfoWnd.cpp @@ -72,7 +72,7 @@ UIBasicInfoWnd::UIBasicInfoWnd() : UIFrameWnd(0) { // OFFSET: 0x00998190 // FUNCTION: fn_13489 -bool UIBasicInfoWnd::Slot03() { +bool UIBasicInfoWnd::NeedsFrameRefresh() { return true; } @@ -156,7 +156,7 @@ void UIBasicInfoWnd::RefreshLayout() { // OFFSET: 0x00999BC0 // FUNCTION: fn_13499 -void UIBasicInfoWnd::Slot11() { +void UIBasicInfoWnd::StoreInfo() { if (this->saved) { this->saved->height = this->geometry.height; this->saved->width = this->geometry.width; @@ -168,15 +168,15 @@ void UIBasicInfoWnd::Slot11() { // OFFSET: 0x00999360 // FUNCTION: fn_13494 -void UIBasicInfoWnd::Slot25(int x, int y) { +void UIBasicInfoWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x00999330 // FUNCTION: fn_13493 -void UIBasicInfoWnd::Slot26(int x, int y) { +void UIBasicInfoWnd::OnLBtnDblClk(int x, int y) { if (y < 17) { this->SendMsg(this, 6, 202, 0, 0, 0); } @@ -184,8 +184,8 @@ void UIBasicInfoWnd::Slot26(int x, int y) { // OFFSET: 0x00999430 // FUNCTION: fn_13496 -void UIBasicInfoWnd::Slot27(int x, int y) { - UIFrameWnd::Slot27(x, y); +void UIBasicInfoWnd::OnMouseMove(int x, int y) { + UIFrameWnd::OnMouseMove(x, y); if (UIWindow* window = g_windowMgr.LookupWindow(307)) { int screenX = 0; int screenY = 0; @@ -196,7 +196,7 @@ void UIBasicInfoWnd::Slot27(int x, int y) { // OFFSET: 0x00999380 // FUNCTION: fn_13495 -void UIBasicInfoWnd::Slot28(int x, int y) { +void UIBasicInfoWnd::OnMouseHover(int x, int y) { if (this->geometry.height != this->expandedHeight) { return; } @@ -521,7 +521,7 @@ void UIBasicInfoWnd::DrawCollapsed() { // OFFSET: 0x009983C0 // FUNCTION: fn_13491 -void UIBasicInfoWnd::Slot15(int width, int height) { +void UIBasicInfoWnd::OnCreate(int width, int height) { this->AddBaseButton(); UIBitmapButton* minimizeButton = this->AddMinimizeButton("Alt+V, Ctrl+V", 0); diff --git a/Source/UI/Window/UIBasicInfoWnd.h b/Source/UI/Window/UIBasicInfoWnd.h index 2f8000913..a8facd237 100644 --- a/Source/UI/Window/UIBasicInfoWnd.h +++ b/Source/UI/Window/UIBasicInfoWnd.h @@ -9,13 +9,13 @@ class UIStaticText; class UIBasicInfoWnd : public UIFrameWnd { public: UIBasicInfoWnd(); - bool Slot03() override; - void Slot11() override; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; + bool NeedsFrameRefresh() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(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 Paint() override; diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.cpp b/Source/UI/Window/UIBattleMsgOptionWnd.cpp index 64c4a33c2..977524986 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.cpp +++ b/Source/UI/Window/UIBattleMsgOptionWnd.cpp @@ -17,7 +17,7 @@ // OFFSET: 0x009335E0 // FUNCTION: fn_12726 -void UIBattleMsgOptionWnd::Slot35(int delta) { +void UIBattleMsgOptionWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { int step = this->m_visibleRows - 1; if (step > 3) { @@ -70,7 +70,7 @@ UIBattleMsgOptionWnd::UIBattleMsgOptionWnd() : UIFrameWnd(0) { // OFFSET: 0x0091EC40 // FUNCTION: fn_12636 -void UIBattleMsgOptionWnd::Slot15(int, int height) { +void UIBattleMsgOptionWnd::OnCreate(int, int height) { this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 14, 1, this->geometry.height - 38); this->AddChild(this->m_scrollBar); @@ -108,17 +108,17 @@ int UIBattleMsgOptionWnd::RowAt(int x, int y) { // OFFSET: 0x009305F0 // FUNCTION: fn_12685 -void UIBattleMsgOptionWnd::Slot26(int x, int y) { +void UIBattleMsgOptionWnd::OnLBtnDblClk(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x00930A80 // FUNCTION: fn_12692 -void UIBattleMsgOptionWnd::Slot25(int x, int y) { +void UIBattleMsgOptionWnd::OnLBtnDown(int x, int y) { if (y < 17) { - this->UIFrameWnd::Slot25(x, y); + this->UIFrameWnd::OnLBtnDown(x, y); return; } @@ -147,7 +147,7 @@ void UIBattleMsgOptionWnd::Slot25(int x, int y) { // OFFSET: 0x009317A0 // FUNCTION: fn_12707 -void UIBattleMsgOptionWnd::Slot28(int x, int y) { +void UIBattleMsgOptionWnd::OnMouseHover(int x, int y) { const int previous = this->unknown_00B8; this->unknown_00B8 = this->RowAt(x, y); if (previous != this->unknown_00B8) { diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.h b/Source/UI/Window/UIBattleMsgOptionWnd.h index c67a61de2..9ec5104c1 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.h +++ b/Source/UI/Window/UIBattleMsgOptionWnd.h @@ -12,12 +12,12 @@ class UIScrollBar; class UIBattleMsgOptionWnd : public UIFrameWnd { public: UIBattleMsgOptionWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; int RowAt(int x, int y); virtual void UpdateScrollBar(); diff --git a/Source/UI/Window/UIBitmapTab.cpp b/Source/UI/Window/UIBitmapTab.cpp index b97b06757..7a60b60ac 100644 --- a/Source/UI/Window/UIBitmapTab.cpp +++ b/Source/UI/Window/UIBitmapTab.cpp @@ -21,7 +21,7 @@ void UIBitmapTab::Paint() { // OFFSET: 0x0085EA90 // FUNCTION: fn_10838 -void UIBitmapTab::Slot25(int, int y) { +void UIBitmapTab::OnLBtnDown(int, int y) { if (!this->parent) { return; } @@ -43,9 +43,9 @@ void UIBitmapTab::Slot25(int, int y) { // OFFSET: 0x00855190 // FUNCTION: fn_10752 -void UIBitmapTab::Slot10(int argument1, int argument2, std::intptr_t argument3) { +void UIBitmapTab::DragAndDrop(int argument1, int argument2, std::intptr_t argument3) { if (this->parent) { - this->parent->Slot10(argument1, argument2, argument3); + this->parent->DragAndDrop(argument1, argument2, argument3); } } diff --git a/Source/UI/Window/UIBitmapTab.h b/Source/UI/Window/UIBitmapTab.h index 3de40a387..cd4db9464 100644 --- a/Source/UI/Window/UIBitmapTab.h +++ b/Source/UI/Window/UIBitmapTab.h @@ -13,9 +13,9 @@ struct BitmapTabEntry { class UIBitmapTab : public UIWindow { public: - void Slot10(int argument1, int argument2, std::intptr_t argument3) override; + void DragAndDrop(int argument1, int argument2, std::intptr_t argument3) override; void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; /* 007C */ std::vector tabs; diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Window/UIChangeNameWnd.cpp index 0b4f190e4..618d05883 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Window/UIChangeNameWnd.cpp @@ -47,7 +47,7 @@ void UIChangeNameWnd::Paint() { // OFFSET: 0x0091EDA0 // FUNCTION: fn_12637 -void UIChangeNameWnd::Slot15(int, int) { +void UIChangeNameWnd::OnCreate(int, int) { { const std::string prefix("유저인터페이스\\"); this->m_okButton = new UIBitmapButton(); diff --git a/Source/UI/Window/UIChangeNameWnd.h b/Source/UI/Window/UIChangeNameWnd.h index 3a5445f02..1eff52316 100644 --- a/Source/UI/Window/UIChangeNameWnd.h +++ b/Source/UI/Window/UIChangeNameWnd.h @@ -12,7 +12,7 @@ class UIBitmapEditCtrl; class UIChangeNameWnd : public UIFrameWnd { public: UIChangeNameWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; int IsNameWithinLimit(std::string name, int limit); diff --git a/Source/UI/Window/UIChatRoomWnd.h b/Source/UI/Window/UIChatRoomWnd.h index cf25cf7a7..6a7118d61 100644 --- a/Source/UI/Window/UIChatRoomWnd.h +++ b/Source/UI/Window/UIChatRoomWnd.h @@ -20,8 +20,8 @@ class UIChatRoomWnd : public UIFrameWnd { public: UIChatRoomWnd(); void Move(int x, int y) override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SaveChatLog(); diff --git a/Source/UI/Window/UICntWnd.h b/Source/UI/Window/UICntWnd.h index a18127bfd..2663b27f1 100644 --- a/Source/UI/Window/UICntWnd.h +++ b/Source/UI/Window/UICntWnd.h @@ -11,7 +11,7 @@ public: UICntWnd(); ~UICntWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UICollectionSystemWnd.cpp b/Source/UI/Window/UICollectionSystemWnd.cpp index e67ae5237..1fa9a1c42 100644 --- a/Source/UI/Window/UICollectionSystemWnd.cpp +++ b/Source/UI/Window/UICollectionSystemWnd.cpp @@ -27,7 +27,7 @@ CUICollectionSystemWnd::CUICollectionSystemWnd() // OFFSET: 0x0091EC30 // FUNCTION: fn_12635 -void CUICollectionSystemWnd::Slot15(int, int) {} +void CUICollectionSystemWnd::OnCreate(int, int) {} // OFFSET: 0x0092B830 // FUNCTION: fn_12658 @@ -65,7 +65,7 @@ void CUICollectionSystemWnd::Paint() { // OFFSET: 0x00930A40 // FUNCTION: fn_12691 -void CUICollectionSystemWnd::Slot25(int, int) { +void CUICollectionSystemWnd::OnLBtnDown(int, int) { if (this->unknown_00BC == 0) { this->unknown_00BC = 1; g_modeMgr.GetGameMode()->SendMsg(282, this->unknown_00B8, 0, 0, 0); @@ -74,7 +74,7 @@ void CUICollectionSystemWnd::Slot25(int, int) { // OFFSET: 0x00932E20 // FUNCTION: fn_12717 -void CUICollectionSystemWnd::Slot19() { +void CUICollectionSystemWnd::OnProcess() { this->Invalidate(); const std::uint32_t now = timeGetTime(); if (this->m_frame == this->m_lastFrame) { diff --git a/Source/UI/Window/UICollectionSystemWnd.h b/Source/UI/Window/UICollectionSystemWnd.h index 409407237..aa66e4fd9 100644 --- a/Source/UI/Window/UICollectionSystemWnd.h +++ b/Source/UI/Window/UICollectionSystemWnd.h @@ -11,10 +11,10 @@ class CSprRes; class CUICollectionSystemWnd : public UIFrameWnd { public: CUICollectionSystemWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot19() override; - void Slot25(int x, int y) override; + void OnProcess() override; + void OnLBtnDown(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; private: diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index 2ab1f25a1..ff43a2395 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -252,41 +252,41 @@ bool CUIControl::CanHitTest() { // OFFSET: 0x009EEAD0 // FUNCTION: fn_14634 -void CUIControl::Slot10(int x, int y, std::intptr_t value) { +void CUIControl::DragAndDrop(int x, int y, std::intptr_t value) { if (this->parent) { - this->parent->Slot10(x + this->geometry.x, y + this->geometry.y, value); + this->parent->DragAndDrop(x + this->geometry.x, y + this->geometry.y, value); } } // OFFSET: 0x009EF680 // FUNCTION: fn_14639 -void CUIControl::Slot25(int x, int y) { +void CUIControl::OnLBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot25(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnDown(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF650 // FUNCTION: fn_14638 -void CUIControl::Slot26(int x, int y) { +void CUIControl::OnLBtnDblClk(int x, int y) { if (this->parent) { - this->parent->Slot26(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnDblClk(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF710 // FUNCTION: fn_14642 -void CUIControl::Slot27(int x, int y) { +void CUIControl::OnMouseMove(int x, int y) { if (this->parent) { - this->parent->Slot27(x + this->geometry.x, y + this->geometry.y); + this->parent->OnMouseMove(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF6E0 // FUNCTION: fn_14641 -void CUIControl::Slot28(int x, int y) { +void CUIControl::OnMouseHover(int x, int y) { if (this->parent) { - this->parent->Slot28(x + this->geometry.x, y + this->geometry.y); + this->parent->OnMouseHover(x + this->geometry.x, y + this->geometry.y); } } @@ -300,41 +300,41 @@ void CUIControl::ResetCursor(int x, int y) { // OFFSET: 0x009EF6B0 // FUNCTION: fn_14640 -void CUIControl::Slot31(int x, int y) { +void CUIControl::OnLBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot31(x + this->geometry.x, y + this->geometry.y); + this->parent->OnLBtnUp(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF7A0 // FUNCTION: fn_14645 -void CUIControl::Slot32(int x, int y) { +void CUIControl::OnRBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot32(x + this->geometry.x, y + this->geometry.y); + this->parent->OnRBtnDown(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF7D0 // FUNCTION: fn_14646 -void CUIControl::Slot33(int x, int y) { +void CUIControl::OnRBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot33(x + this->geometry.x, y + this->geometry.y); + this->parent->OnRBtnUp(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF770 // FUNCTION: fn_14644 -void CUIControl::Slot34(int x, int y) { +void CUIControl::OnRBtnDblClk(int x, int y) { if (this->parent) { - this->parent->Slot34(x + this->geometry.x, y + this->geometry.y); + this->parent->OnRBtnDblClk(x + this->geometry.x, y + this->geometry.y); } } // OFFSET: 0x009EF800 // FUNCTION: fn_14647 -void CUIControl::Slot35(int value) { +void CUIControl::OnWheel(int value) { if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -354,17 +354,17 @@ void CUIControl::Invalidate() { // OFFSET: 0x009EF820 // FUNCTION: fn_14648 -void CUIControl::Slot52(int value) { - this->Slot53(value); +void CUIControl::ApplySkin(int value) { + this->LoadSkin(value); for (UIWindow* child : this->m_children) { - child->Slot52(value); + child->ApplySkin(value); } } // OFFSET: 0x009D3FC0 // FUNCTION: fn_14036 -void CUIControl::Slot53(int) { +void CUIControl::LoadSkin(int) { } // OFFSET: 0x009C0220 @@ -407,7 +407,7 @@ void CUIVScrollBar::SetPosition(int value) { this->position = *clamped; } this->Show(this->total > this->visible); - this->Slot54(); + this->UpdateThumb(); if (this->onChange) { this->onChange(this->position); } @@ -416,7 +416,7 @@ void CUIVScrollBar::SetPosition(int value) { // OFFSET: 0x009F23B0 // FUNCTION: fn_14709 -void CUIVScrollBar::Slot25(int, int y) { +void CUIVScrollBar::OnLBtnDown(int, int y) { const int top = this->thumb->geometry.y; if (y < top) { this->SetPosition(this->position - this->step); @@ -433,14 +433,14 @@ void CUITab::Paint() { // OFFSET: 0x009F2400 // FUNCTION: fn_14710 -void CUIVThumb::Slot25(int, int y) { +void CUIVThumb::OnLBtnDown(int, int y) { g_windowMgr.SetCapture(this); this->dragOrigin = y; } // OFFSET: 0x009F2420 // FUNCTION: fn_14711 -void CUIVThumb::Slot31(int, int y) { +void CUIVThumb::OnLBtnUp(int, int y) { if (this == g_windowMgr.Capture()) { g_windowMgr.ReleaseCapture(); } @@ -449,7 +449,7 @@ void CUIVThumb::Slot31(int, int y) { // OFFSET: 0x009F24B0 // FUNCTION: fn_14713 -void CUIVThumb::Slot27(int, int y) { +void CUIVThumb::OnMouseMove(int, int y) { if (this == g_windowMgr.Capture() && y != this->dragOrigin && this->onDrag) { this->onDrag(y - this->dragOrigin); } @@ -506,14 +506,14 @@ void CUIHThumb::Paint() { // OFFSET: 0x009EE1E0 // FUNCTION: fn_14600 -void CUIHThumb::Slot25(int x, int) { +void CUIHThumb::OnLBtnDown(int x, int) { g_windowMgr.SetCapture(this); this->dragOrigin = x; } // OFFSET: 0x009EE200 // FUNCTION: fn_14601 -void CUIHThumb::Slot31(int x, int) { +void CUIHThumb::OnLBtnUp(int x, int) { if (this == g_windowMgr.Capture()) { g_windowMgr.ReleaseCapture(); } @@ -522,7 +522,7 @@ void CUIHThumb::Slot31(int x, int) { // OFFSET: 0x009EE230 // FUNCTION: fn_14602 -void CUIHThumb::Slot27(int x, int) { +void CUIHThumb::OnMouseMove(int x, int) { if (this == g_windowMgr.Capture() && x != this->dragOrigin && this->onDrag) { this->onDrag(x - this->dragOrigin); } @@ -536,7 +536,7 @@ void CUIThumb::ResetCursor(int, int) { // OFFSET: 0x009F2450 // FUNCTION: fn_14712 -void CUIThumb::Slot28(int, int) { +void CUIThumb::OnMouseHover(int, int) { if (!this->tooltip.empty()) { int screenX = 0; int screenY = -20; @@ -547,7 +547,7 @@ void CUIThumb::Slot28(int, int) { // OFFSET: 0x009F2500 // FUNCTION: fn_14715 -void CUIVScrollBar::Slot35(int value) { +void CUIVScrollBar::OnWheel(int value) { this->SetPosition(value > 0 ? this->position - this->step : this->step + this->position); } @@ -558,7 +558,7 @@ void CUIThumb::SetImages(const std::string& top, const std::string& middle, cons this->topName = top; this->middleName = middle; this->bottomName = bottom; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -567,7 +567,7 @@ void CUIThumb::SetImages(const std::string& top, const std::string& middle, cons void CUIThumb::SetImage(const std::string& name) { this->resizable = 0; this->middleName = name; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -579,7 +579,7 @@ void CUIVScrollBar::Show(int visible) { // OFFSET: 0x009F25C0 // FUNCTION: fn_14717 -void CUIVScrollBar::Slot54() { +void CUIVScrollBar::UpdateThumb() { CUIThumb* bar = this->thumb; float offset; if (bar->resizable) { @@ -623,7 +623,7 @@ void CUIVScrollBar::Paint() { // OFFSET: 0x009F2800 // FUNCTION: fn_14719 -void CUIVScrollBar::Slot53(int resolveSkin) { +void CUIVScrollBar::LoadSkin(int resolveSkin) { this->background = CResPtr(this->LoadBitmapResource(this->backgroundName, resolveSkin)); } @@ -680,7 +680,7 @@ void CUIVScrollBar::SetThumbImages(const std::string& top, const std::string& mi bar->topName = top; bar->middleName = middle; bar->bottomName = bottom; - bar->Slot53(0); + bar->LoadSkin(0); bar->Invalidate(); this->Invalidate(); } @@ -699,7 +699,7 @@ void CUIVScrollBar::SetThumbImage(const std::string& name) { CUIThumb* bar = this->thumb; bar->resizable = 0; bar->middleName = name; - bar->Slot53(0); + bar->LoadSkin(0); bar->Invalidate(); } @@ -716,7 +716,7 @@ void CUIVScrollBar::SetThumbTooltip(const std::string& text) { // FUNCTION: fn_14731 void CUIVScrollBar::SetBackground(const std::string& name) { this->backgroundName = name; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -768,7 +768,7 @@ void CUIVThumb::Paint() { #pragma inline_depth(0) // OFFSET: 0x009F1650 // FUNCTION: fn_14692 -void CUITabButton::Slot47() { +void CUITabButton::OnMouseEnter() { if (this->state != 1) { this->SetState(2); } @@ -776,7 +776,7 @@ void CUITabButton::Slot47() { // OFFSET: 0x009F1670 // FUNCTION: fn_14693 -void CUITabButton::Slot48() { +void CUITabButton::OnMouseLeave() { if (this->state != 1) { this->SetState(0); } @@ -803,13 +803,13 @@ void CUIButton::SetOnClick(std::function handler) { // OFFSET: 0x009EE920 // FUNCTION: fn_14627 -void CUIButton::Slot26(int x, int y) { - this->Slot25(x, y); +void CUIButton::OnLBtnDblClk(int x, int y) { + this->OnLBtnDown(x, y); } // OFFSET: 0x009EE930 // FUNCTION: fn_14628 -void CUIButton::Slot25(int, int) { +void CUIButton::OnLBtnDown(int, int) { this->SetState(1); if (!this->disabled) { g_windowMgr.SetCapture(this); @@ -818,11 +818,11 @@ void CUIButton::Slot25(int, int) { // OFFSET: 0x009EE970 // FUNCTION: fn_14629 -void CUIButton::Slot31(int, int) { +void CUIButton::OnLBtnUp(int, int) { this->SetState(2); if (this == g_windowMgr.Capture()) { if (!this->disabled && this->unknown_00C4) { - this->unknown_00C4->Slot02(); + this->unknown_00C4->IsFrameWnd(); } g_windowMgr.ReleaseCapture(); } @@ -830,15 +830,15 @@ void CUIButton::Slot31(int, int) { // OFFSET: 0x009EE9D0 // FUNCTION: fn_14630 -void CUIButton::Slot47() { +void CUIButton::OnMouseEnter() { this->SetState(2); } // OFFSET: 0x009EEA00 // FUNCTION: fn_14631 -void CUIButton::Slot28(int, int) { +void CUIButton::OnMouseHover(int, int) { if (this->unknown_00EC) { - this->unknown_00EC->Slot02(); + this->unknown_00EC->IsFrameWnd(); } if (this->tooltip.empty()) { @@ -855,7 +855,7 @@ void CUIButton::Slot28(int, int) { // OFFSET: 0x009EEA70 // FUNCTION: fn_14632 -void CUIButton::Slot48() { +void CUIButton::OnMouseLeave() { this->SetState(0); } @@ -908,12 +908,12 @@ void CUITextButton::DrawVerticalLabel() { // FUNCTION: fn_14564 void CUITextButton::Paint() { this->ClearSurface(0xFFFF00FF); - this->Slot55(); + this->DrawLabel(); } // OFFSET: 0x009ECF60 // FUNCTION: fn_14565 -void CUITextButton::Slot28(int, int) { +void CUITextButton::OnMouseHover(int, int) { if (!this->tooltipText.empty()) { int screenX = 0; int screenY = -20; @@ -956,7 +956,7 @@ void CUITextButton::SetShadow(bool enabled, std::uint32_t color) { // FUNCTION: fn_14407 void CUIBasicButton::Resize(int width, int height) { UIWindow::Resize(width, height); - this->Slot53(0); + this->LoadSkin(0); } // OFFSET: 0x009E1DE0 @@ -965,8 +965,8 @@ void CUIBasicButton::Create(int width, int height) { this->defaultWidth = width; this->SetAlign(6, 6); this->Resize(width, height); - this->Slot15(width, height); - this->Slot16(); + this->OnCreate(width, height); + this->OnInit(); } // OFFSET: 0x009E1F90 @@ -994,12 +994,12 @@ void CUIBasicButton::Paint() { this->DrawBitmap(this->geometry.width - right->image.width, 0, right, false); } - this->Slot55(); + this->DrawLabel(); } // OFFSET: 0x009E20B0 // FUNCTION: fn_14406 -void CUIBasicButton::Slot53(int resolveSkin) { +void CUIBasicButton::LoadSkin(int resolveSkin) { this->leftImages[0] = CResPtr(this->LoadBitmapResource("유저인터페이스\\basic_interface\\btn_out_left.bmp", resolveSkin)); this->leftImages[1] = CResPtr(this->LoadBitmapResource("유저인터페이스\\basic_interface\\btn_press_left.bmp", resolveSkin)); this->leftImages[2] = CResPtr(this->LoadBitmapResource("유저인터페이스\\basic_interface\\btn_over_left.bmp", resolveSkin)); @@ -1016,7 +1016,7 @@ void CUIBasicButton::Slot53(int resolveSkin) { // OFFSET: 0x009F26B0 // FUNCTION: fn_14718 -void CUIThumb::Slot53(int resolveSkin) { +void CUIThumb::LoadSkin(int resolveSkin) { this->middle = CResPtr(this->LoadBitmapResource(this->middleName, resolveSkin)); if (this->resizable) { this->top = CResPtr(this->LoadBitmapResource(this->topName, resolveSkin)); @@ -1154,7 +1154,7 @@ void CUITabButton::SetSelected(bool selected) { this->page->Show(selected); } if (selected && this->unknown_00C4) { - this->unknown_00C4->Slot02(); + this->unknown_00C4->IsFrameWnd(); } this->Invalidate(); } @@ -1169,13 +1169,13 @@ void CUITabButton::SetSkinColors(int normalColumn, int normalRow, int selectedCo this->borderCell.column = borderColumn; this->borderCell.row = borderRow; this->useSkinColors = 1; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } // OFFSET: 0x009F1600 // FUNCTION: fn_14690 -void CUITabButton::Slot25(int, int) { +void CUITabButton::OnLBtnDown(int, int) { if (!this->disabled) { g_windowMgr.SetCapture(this); if (this->parent) { @@ -1186,7 +1186,7 @@ void CUITabButton::Slot25(int, int) { // OFFSET: 0x009F1630 // FUNCTION: fn_14691 -void CUITabButton::Slot31(int, int) { +void CUITabButton::OnLBtnUp(int, int) { if (this == g_windowMgr.Capture()) { g_windowMgr.ReleaseCapture(); } @@ -1194,11 +1194,11 @@ void CUITabButton::Slot31(int, int) { // OFFSET: 0x009F1690 // FUNCTION: fn_14694 -void CUITabButton::Slot53(int resolveSkin) { +void CUITabButton::LoadSkin(int resolveSkin) { this->normalColor = SkinPaletteColor(ResourceMgr::Instance(), this->normalCell, resolveSkin); this->selectedColor = SkinPaletteColor(ResourceMgr::Instance(), this->selectedCell, resolveSkin); this->borderColor = SkinPaletteColor(ResourceMgr::Instance(), this->borderCell, resolveSkin); - this->CUIImageTextButton::Slot53(resolveSkin); + this->CUIImageTextButton::LoadSkin(resolveSkin); } // OFFSET: 0x009ED6D0 @@ -1248,7 +1248,7 @@ void CUIStaticImage::Paint() { // OFFSET: 0x009F0840 // FUNCTION: fn_14666 -void CUIStaticImage::Slot28(int, int) { +void CUIStaticImage::OnMouseHover(int, int) { int x = 0; int y = -8; this->ToScreen(x, y); @@ -1257,7 +1257,7 @@ void CUIStaticImage::Slot28(int, int) { // OFFSET: 0x009F08A0 // FUNCTION: fn_14667 -void CUIStaticImage::Slot53(int resolveSkin) { +void CUIStaticImage::LoadSkin(int resolveSkin) { this->image = CResPtr(this->LoadBitmapResource(this->imageName, resolveSkin)); } @@ -1265,7 +1265,7 @@ void CUIStaticImage::Slot53(int resolveSkin) { // FUNCTION: fn_14668 void CUIStaticImage::SetImage(const std::string& name) { this->imageName = name; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -1297,7 +1297,7 @@ void CUITitleBar::SetImages(const std::string& left, const std::string& middle, this->leftName = left; this->middleName = middle; this->rightName = right; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -1342,7 +1342,7 @@ void CUITitleBar::Paint() { // OFFSET: 0x009F1AA0 // FUNCTION: fn_14699 -void CUITitleBar::Slot53(int resolveSkin) { +void CUITitleBar::LoadSkin(int resolveSkin) { this->middle = CResPtr(this->LoadBitmapResource(this->middleName, resolveSkin)); if (this->resizable) { this->left = CResPtr(this->LoadBitmapResource(this->leftName, resolveSkin)); @@ -1469,7 +1469,7 @@ void CUIImageButton::Paint() { // OFFSET: 0x009EF900 // FUNCTION: fn_14650 -void CUIImageButton::Slot53(int resolveSkin) { +void CUIImageButton::LoadSkin(int resolveSkin) { this->images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->images[2] = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -1483,7 +1483,7 @@ void CUIImageButton::SetImages(const std::string& normal, const std::string& hov this->imageNames[1] = hover; this->imageNames[2] = pressed; this->disabledName = inactive; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -1509,7 +1509,7 @@ void CUICheckBox::Paint() { // OFFSET: 0x009E3230 // FUNCTION: fn_14412 -void CUICheckBox::Slot25(int, int) { +void CUICheckBox::OnLBtnDown(int, int) { if (this->disabled) { return; } @@ -1524,7 +1524,7 @@ void CUICheckBox::Slot25(int, int) { // OFFSET: 0x009E3290 // FUNCTION: fn_14413 -void CUICheckBox::Slot31(int, int) { +void CUICheckBox::OnLBtnUp(int, int) { if (this == g_windowMgr.Capture()) { g_windowMgr.ReleaseCapture(); } @@ -1555,7 +1555,7 @@ CUIImageTextButton::~CUIImageTextButton() = default; // OFFSET: 0x009E8150 // FUNCTION: fn_14490 -void CUIImageTextButton::Slot53(int resolveSkin) { +void CUIImageTextButton::LoadSkin(int resolveSkin) { this->images[0] = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->images[1] = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->images[2] = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -1569,13 +1569,13 @@ void CUIImageTextButton::SetImages(const std::string& normal, const std::string& this->imageNames[1] = hover; this->imageNames[2] = pressed; this->disabledName = inactive; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } // OFFSET: 0x009F01B0 // FUNCTION: fn_14656 -void CUIListItem::Slot25(int, int) { +void CUIListItem::OnLBtnDown(int, int) { if (!this->frozen) { g_windowMgr.SetCapture(this); if (this->onPress) { @@ -1586,7 +1586,7 @@ void CUIListItem::Slot25(int, int) { // OFFSET: 0x009F0210 // FUNCTION: fn_14658 -void CUIListItem::Slot47() { +void CUIListItem::OnMouseEnter() { if (this->onHover) { this->onHover(this); } @@ -1594,7 +1594,7 @@ void CUIListItem::Slot47() { // OFFSET: 0x009F01F0 // FUNCTION: fn_14657 -void CUIListItem::Slot31(int, int) { +void CUIListItem::OnLBtnUp(int, int) { if (this == g_windowMgr.Capture()) { g_windowMgr.ReleaseCapture(); } @@ -1602,9 +1602,9 @@ void CUIListItem::Slot31(int, int) { // OFFSET: 0x009F0230 // FUNCTION: fn_14659 -void CUIListItem::Slot27(int, int) { +void CUIListItem::OnMouseMove(int, int) { if (this->selected != 2) { - this->Slot47(); + this->OnMouseEnter(); } } @@ -1671,44 +1671,44 @@ void CUIListBoxEx::Paint() { // OFFSET: 0x009D2490 // FUNCTION: fn_14019 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x009D24D0 // FUNCTION: fn_14020 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x009D2510 // FUNCTION: fn_14021 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } // OFFSET: 0x009D2550 // FUNCTION: fn_14022 template <> -void CUIListBoxEx::Slot35(int value) { +void CUIListBoxEx::OnWheel(int value) { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { - this->scrollBar->Slot35(value); + this->scrollBar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -1979,7 +1979,7 @@ void CUIListBoxEx::AddNewItem // OFFSET: 0x009D3360 // FUNCTION: fn_14030 template <> -void CUIListBox::Slot53(int resolveSkin) { +void CUIListBox::LoadSkin(int resolveSkin) { this->NormalImage() = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->unknown_0084 = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->unknown_0088 = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -1992,7 +1992,7 @@ void CUIListBox::Slot53(int resolveSkin) { // OFFSET: 0x009D3570 // FUNCTION: fn_14031 template <> -void CUIListBox::Slot53(int resolveSkin) { +void CUIListBox::LoadSkin(int resolveSkin) { this->NormalImage() = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->unknown_0084 = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->unknown_0088 = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -2005,7 +2005,7 @@ void CUIListBox::Slot53(int resolveSkin) { // OFFSET: 0x009D3780 // FUNCTION: fn_14032 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { this->NormalImage() = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->unknown_0084 = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->unknown_0088 = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -2018,7 +2018,7 @@ void CUIListBoxEx::Slot5 // OFFSET: 0x009D3990 // FUNCTION: fn_14033 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { this->NormalImage() = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->unknown_0084 = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->unknown_0088 = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -2031,7 +2031,7 @@ void CUIListBoxEx: // OFFSET: 0x009D3BA0 // FUNCTION: fn_14034 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { this->NormalImage() = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->unknown_0084 = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->unknown_0088 = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -2044,7 +2044,7 @@ void CUIListBoxEx::Slo // OFFSET: 0x009D3DB0 // FUNCTION: fn_14035 template <> -void CUIListBoxEx::Slot53(int resolveSkin) { +void CUIListBoxEx::LoadSkin(int resolveSkin) { this->NormalImage() = CResPtr(this->LoadBitmapResource(this->imageNames[0], resolveSkin)); this->unknown_0084 = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); this->unknown_0088 = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); @@ -2114,8 +2114,8 @@ template void CUIListBoxEx::OnScroll(int); template void CUIListBox::Paint(); template void CUIListBox::Paint(); -template void CUIListBox::Slot35(int); -template void CUIListBox::Slot35(int); +template void CUIListBox::OnWheel(int); +template void CUIListBox::OnWheel(int); // OFFSET: 0x009F1D40 // FUNCTION: fn_14703 @@ -2175,7 +2175,7 @@ void CUIHScrollBar::Paint() { // OFFSET: 0x009EE1B0 // FUNCTION: fn_14599 -void CUIHScrollBar::Slot25(int x, int) { +void CUIHScrollBar::OnLBtnDown(int x, int) { const int left = this->thumb->geometry.x; if (x < left) { this->PageUp(); @@ -2186,7 +2186,7 @@ void CUIHScrollBar::Slot25(int x, int) { // OFFSET: 0x009EE270 // FUNCTION: fn_14603 -void CUIHScrollBar::Slot35(int value) { +void CUIHScrollBar::OnWheel(int value) { if (value > 0) { this->PageDown(); } else { @@ -2196,7 +2196,7 @@ void CUIHScrollBar::Slot35(int value) { // OFFSET: 0x009EE290 // FUNCTION: fn_14604 -void CUIHScrollBar::Slot54() { +void CUIHScrollBar::UpdateThumb() { CUIThumb* bar = this->thumb; float offset; if (bar->resizable) { @@ -2263,7 +2263,7 @@ bool CUIPadding::CanHitTest() { // OFFSET: 0x009EAE20 // FUNCTION: fn_14543 -void CUIRadioButton::Slot25(int, int) { +void CUIRadioButton::OnLBtnDown(int, int) { if (this->disabled) { return; } @@ -2307,21 +2307,21 @@ void CUITextViewer::Paint() { // OFFSET: 0x009EA250 // FUNCTION: fn_14516 -void CUITextViewer::Slot19() { +void CUITextViewer::OnProcess() { for (UIWindow* child : this->m_children) { - child->Slot19(); + child->OnProcess(); } } // OFFSET: 0x009EA280 // FUNCTION: fn_14517 -void CUITextViewer::Slot35(int value) { +void CUITextViewer::OnWheel(int value) { CUIVScrollBar* bar = this->scrollBar; if (!bar->dragging && bar->total > bar->visible) { - bar->Slot35(value); + bar->OnWheel(value); } else if (this->parent) { - this->parent->Slot35(value); + this->parent->OnWheel(value); } } @@ -2503,7 +2503,7 @@ void CUIResizer::Paint() { // OFFSET: 0x009E9430 // FUNCTION: fn_14504 -void CUIResizer::Slot25(int x, int y) { +void CUIResizer::OnLBtnDown(int x, int y) { if (!this->parent) { return; } @@ -2523,13 +2523,13 @@ void CUIResizer::Slot25(int x, int y) { // OFFSET: 0x009E94B0 // FUNCTION: fn_14505 -void CUIResizer::Slot31(int x, int y) { +void CUIResizer::OnLBtnUp(int x, int y) { if (!this->parent || this != g_windowMgr.Capture()) { return; } g_windowMgr.ReleaseCapture(); - this->parent->Slot36(); + this->parent->RefreshSnap(); int screenX = x; int screenY = y; this->ToScreen(screenX, screenY); @@ -2544,7 +2544,7 @@ void CUIResizer::Slot31(int x, int y) { // OFFSET: 0x009E9540 // FUNCTION: fn_14506 -void CUIResizer::Slot27(int x, int y) { +void CUIResizer::OnMouseMove(int x, int y) { if (!this->parent || this != g_windowMgr.Capture()) { return; } @@ -2587,7 +2587,7 @@ void CUIResizer::ResetCursor(int, int) { // OFFSET: 0x009E96C0 // FUNCTION: fn_14508 -void CUIResizer::Slot53(int resolveSkin) { +void CUIResizer::LoadSkin(int resolveSkin) { this->image = CResPtr(this->LoadBitmapResource(this->imageName, resolveSkin)); if (this->image) { this->Resize(this->image->image.width, this->image->image.height); @@ -2601,7 +2601,7 @@ void CUIResizer::Slot53(int resolveSkin) { // FUNCTION: fn_14509 void CUIResizer::SetImage(const std::string& name) { this->imageName = name; - this->Slot53(0); + this->LoadSkin(0); this->Invalidate(); } @@ -2838,7 +2838,7 @@ CUITabInfo::CUITabInfo() : CUIListItem(), unknown_00E8(nullptr), unknown_00EC(nu // OFFSET: 0x009F2EC0 // FUNCTION: fn_14733 -void CUIVScrollBar::Slot55(int value) { +void CUIVScrollBar::ScrollBy(int value) { const int target = this->position - value % this->step + value; if (target != this->position) { this->SetPosition(target); @@ -2847,9 +2847,9 @@ void CUIVScrollBar::Slot55(int value) { // OFFSET: 0x009F0A70 // FUNCTION: fn_14670 -void CUIStaticText::Slot28(int x, int y) { +void CUIStaticText::OnMouseHover(int x, int y) { if (this->Tooltip().empty()) { - CUIControl::Slot28(x, y); + CUIControl::OnMouseHover(x, y); return; } @@ -3045,7 +3045,7 @@ __declspec(noinline) void CUITextButton::SetText(const std::string& value) { // OFFSET: 0x009EC930 // FUNCTION: fn_14561 -void CUITextButton::Slot54(int) { +void CUITextButton::ResizeToText(int) { if (this->orientation == 1) { const int height = this->VerticalTextHeight(this->displayText.c_str(), 0, this->fontIndex, this->fontHeight, this->bold ); @@ -3073,7 +3073,7 @@ void CUITextButton::Slot54(int) { // OFFSET: 0x009F1210 // FUNCTION: fn_14688 -void CUITabButton::Slot54(int padding) { +void CUITabButton::ResizeToText(int padding) { if (this->orientation == 1) { const int height = this->VerticalTextHeight(this->displayText.c_str(), 0, this->fontIndex, this->fontHeight, this->bold ); @@ -3101,7 +3101,7 @@ void CUITabButton::Slot54(int padding) { // OFFSET: 0x009ECA30 // FUNCTION: fn_14562 -void CUITextButton::Slot55() { +void CUITextButton::DrawLabel() { if (this->displayText.size() == 0) { return; } @@ -3156,7 +3156,7 @@ void CUITextButton::Slot55() { // OFFSET: 0x009E1E20 // FUNCTION: fn_14404 -void CUIBasicButton::Slot55() { +void CUIBasicButton::DrawLabel() { if (this->displayText.size() == 0) { return; } @@ -3226,7 +3226,7 @@ void CUIImageTextButton::Paint() { if (image) { this->DrawBitmap(0, 0, &image->image, false); } - this->CUITextButton::Slot55(); + this->CUITextButton::DrawLabel(); } // OFFSET: 0x009F1320 @@ -3271,7 +3271,7 @@ void CUITabButton::Paint() { this->FillRegion(this->geometry.width - 1, 3, 1, this->geometry.height - 3, this->borderColor); this->FillRegion(0, this->geometry.height - 1, this->geometry.width, 1, this->borderColor); } - this->CUITextButton::Slot55(); + this->CUITextButton::DrawLabel(); } // OFFSET: 0x009EC430 @@ -3297,7 +3297,7 @@ CUIBasicButton::CUIBasicButton() // OFFSET: 0x009E9F00 // FUNCTION: fn_14513 -void CUITextViewer::Slot15(int width, int height) { +void CUITextViewer::OnCreate(int width, int height) { this->padding = new CUIPadding(); this->padding->SetSize(width, height); this->AddChild(this->padding); @@ -3471,7 +3471,7 @@ CUIFrameWnd* CUIRegisterMgr::Create(int key) { CUIFrameWnd* window = entry->second(); window->SetId(key); - window->Slot53(); + window->Initialize(); if (static_cast(window->unknown_00B4) != 0) { auto position = this->unknown_000C.find(key); @@ -3547,7 +3547,7 @@ CUIHThumb::CUIHThumb() : CUIVThumb() { // OFFSET: 0x009EDBE0 // FUNCTION: fn_14596 -void CUIHScrollBar::Slot15(int, int) { +void CUIHScrollBar::OnCreate(int, int) { if (!this->upButton) { this->upButton = new CUIImageButton(); this->upButton->Show(0); @@ -3563,7 +3563,7 @@ void CUIHScrollBar::Slot15(int, int) { if (!this->thumb) { this->thumb = new CUIHThumb(); this->thumb->Show(0); - const std::function onDrag = [this](int value) { this->Slot55(value); }; + const std::function onDrag = [this](int value) { this->ScrollBy(value); }; AssignHandler(this->thumb->onDrag, onDrag); this->AddChild(this->thumb); } @@ -3571,7 +3571,7 @@ void CUIHScrollBar::Slot15(int, int) { // OFFSET: 0x009F1DE0 // FUNCTION: fn_14706 -void CUIVScrollBar::Slot15(int, int) { +void CUIVScrollBar::OnCreate(int, int) { if (!this->upButton) { this->upButton = new CUIImageButton(); this->upButton->Show(0); @@ -3587,7 +3587,7 @@ void CUIVScrollBar::Slot15(int, int) { if (!this->thumb) { this->thumb = new CUIVThumb(); this->thumb->Show(0); - const std::function onDrag = [this](int value) { this->Slot55(value); }; + const std::function onDrag = [this](int value) { this->ScrollBy(value); }; AssignHandler(this->thumb->onDrag, onDrag); this->AddChild(this->thumb); } @@ -3651,7 +3651,7 @@ void CUIListItem::SetImageResources(CBitmapRes* normal, CBitmapRes* hover, CBitm // OFFSET: 0x009ED5C0 // FUNCTION: fn_14580 -void CUIEditBox::Slot15(int width, int height) { +void CUIEditBox::OnCreate(int width, int height) { this->edit = new CUIEditCtrl(); this->edit->SetSize(width, height); this->edit->invalidatesParent = 1; diff --git a/Source/UI/Window/UIControl.h b/Source/UI/Window/UIControl.h index 2d9c32131..f3b0af093 100644 --- a/Source/UI/Window/UIControl.h +++ b/Source/UI/Window/UIControl.h @@ -63,20 +63,20 @@ public: } ~CUIControl() override; bool CanHitTest() override; - void Slot10(int x, int y, std::intptr_t value) override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - __declspec(noinline) void Slot28(int x, int y) override; + void DragAndDrop(int x, int y, std::intptr_t value) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + __declspec(noinline) void OnMouseHover(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot32(int x, int y) override; - void Slot33(int x, int y) override; - void Slot34(int x, int y) override; - void Slot35(int value) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnDown(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnRBtnDblClk(int x, int y) override; + void OnWheel(int value) override; void Invalidate() override; - void Slot52(int value) override; - virtual void Slot53(int value); + void ApplySkin(int value) override; + virtual void LoadSkin(int value); bool IsPointInside(int x, int y); UIWindow* FindChildById(int id); @@ -108,13 +108,13 @@ class CUIButton : public CUIControl { public: CUIButton(); ~CUIButton() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot26(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int argument1, int argument2) override; - void Slot47() override; - void Slot48() override; + void OnLBtnUp(int argument1, int argument2) override; + void OnMouseEnter() override; + void OnMouseLeave() override; void SetState(int value); void SetOnClick(std::function handler); @@ -133,10 +133,10 @@ class CUITextButton : public CUIButton { public: CUITextButton(); ~CUITextButton() override; - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void Paint() override; - virtual void Slot54(int value); - virtual void Slot55(); + virtual void ResizeToText(int value); + virtual void DrawLabel(); void SetShadow(bool enabled, std::uint32_t color); void SetOutline(bool enabled, std::uint32_t color); @@ -178,7 +178,7 @@ public: CUIImageTextButton(); ~CUIImageTextButton() override; void Paint() override; - void Slot53(int resolveSkin) override; + void LoadSkin(int resolveSkin) override; void SetImages(const std::string& normal, const std::string& hover, const std::string& pressed, const std::string& inactive); @@ -195,8 +195,8 @@ public: ~CUIBasicButton() override; void Resize(int width, int height) override; void Paint() override; - void Slot53(int resolveSkin) override; - void Slot55() override; + void LoadSkin(int resolveSkin) override; + void DrawLabel() override; void Create(int width, int height); void SetAutoWidth(bool enabled); @@ -214,13 +214,13 @@ public: class CUITabButton : public CUIImageTextButton { public: CUITabButton(); - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot47() override; - void Slot48() override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnMouseEnter() override; + void OnMouseLeave() override; void Paint() override; - void Slot53(int resolveSkin) override; - void Slot54(int padding) override; + void LoadSkin(int resolveSkin) override; + void ResizeToText(int padding) override; __declspec(noinline) void SetSelected(bool selected); void SetSkinColors(int normalColumn, int normalRow, int selectedColumn, int selectedRow, int borderColumn, int borderRow); @@ -241,7 +241,7 @@ public: CUIImageButton(); ~CUIImageButton() override; void Paint() override; - void Slot53(int resolveSkin) override; + void LoadSkin(int resolveSkin) override; void SetImages(const std::string& normal, const std::string& hover, const std::string& pressed, const std::string& inactive); @@ -260,8 +260,8 @@ public: } void Paint() override; - void Slot28(int x, int y) override; - void Slot53(int resolveSkin) override; + void OnMouseHover(int x, int y) override; + void LoadSkin(int resolveSkin) override; void SetImage(const std::string& name); @@ -282,7 +282,7 @@ public: void Resize(int width, int height) override; void Paint() override; - void Slot53(int resolveSkin) override; + void LoadSkin(int resolveSkin) override; void SetImages(const std::string& left, const std::string& middle, const std::string& right); void SetSecondButton(CUIButton* button); @@ -315,7 +315,7 @@ public: edit(nullptr), onSubmit() { } - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Resize(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -347,11 +347,11 @@ public: } void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; - void Slot53(int resolveSkin) override; + void OnLBtnUp(int x, int y) override; + void LoadSkin(int resolveSkin) override; void SetImage(const std::string& name); diff --git a/Source/UI/Window/UIDebuffRemoveWnd.cpp b/Source/UI/Window/UIDebuffRemoveWnd.cpp index 510429382..e288fb30c 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.cpp +++ b/Source/UI/Window/UIDebuffRemoveWnd.cpp @@ -23,17 +23,17 @@ void UIDebuffRemoveWnd::Paint() { // OFFSET: 0x0094EE60 // FUNCTION: fn_12917 -void UIDebuffRemoveWnd::Slot25(int x, int y) { +void UIDebuffRemoveWnd::OnLBtnDown(int x, int y) { } // OFFSET: 0x0094EF00 // FUNCTION: fn_12922 -void UIDebuffRemoveWnd::Slot31(int x, int y) { +void UIDebuffRemoveWnd::OnLBtnUp(int x, int y) { } // OFFSET: 0x0094F030 // FUNCTION: fn_12928 -void UIDebuffRemoveWnd::Slot27(int x, int y) { +void UIDebuffRemoveWnd::OnMouseMove(int x, int y) { } // OFFSET: 0x00950400 diff --git a/Source/UI/Window/UIDebuffRemoveWnd.h b/Source/UI/Window/UIDebuffRemoveWnd.h index 3a9c924f9..d637374f6 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.h +++ b/Source/UI/Window/UIDebuffRemoveWnd.h @@ -8,11 +8,11 @@ class UIBasicButton; class UIDebuffRemoveWnd : public UIFrameWnd { public: UIDebuffRemoveWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; protected: diff --git a/Source/UI/Window/UIEmblemWnd.cpp b/Source/UI/Window/UIEmblemWnd.cpp index 52196a84a..e6e22d361 100644 --- a/Source/UI/Window/UIEmblemWnd.cpp +++ b/Source/UI/Window/UIEmblemWnd.cpp @@ -13,7 +13,7 @@ // OFFSET: 0x0085ACD0 // FUNCTION: fn_10787 -void UIEmblemWnd::Slot15(int, int) { +void UIEmblemWnd::OnCreate(int, int) { } // OFFSET: 0x0085CE40 @@ -38,7 +38,7 @@ void UIEmblemWnd::Paint() { // OFFSET: 0x0085FAF0 // FUNCTION: fn_10883 -void UIEmblemWnd::Slot19() { +void UIEmblemWnd::OnProcess() { if (g_serviceOptions.Get(243)) { if (this->geometry.width == 24) { this->Resize(28, 28); diff --git a/Source/UI/Window/UIEmblemWnd.h b/Source/UI/Window/UIEmblemWnd.h index 906a42f07..ef13f4c1c 100644 --- a/Source/UI/Window/UIEmblemWnd.h +++ b/Source/UI/Window/UIEmblemWnd.h @@ -8,8 +8,8 @@ class UIEmblemWnd : public UIWindow { public: UIEmblemWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIEscOptionWnd.cpp b/Source/UI/Window/UIEscOptionWnd.cpp index 17a7facdd..2cffc3375 100644 --- a/Source/UI/Window/UIEscOptionWnd.cpp +++ b/Source/UI/Window/UIEscOptionWnd.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0091F4F0 // FUNCTION: fn_12638 -void UIEscOptionWnd::Slot15(int, int) { +void UIEscOptionWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\"); const char* names[7] = {"esc_01", "esc_001", "esc_08", "esc_09", "esc_02", "esc_05", "esc_10"}; int ids[7] = {371, 458, 370, 251, 185, 353, 372}; diff --git a/Source/UI/Window/UIEscOptionWnd.h b/Source/UI/Window/UIEscOptionWnd.h index be6d2b2b5..6f9951a76 100644 --- a/Source/UI/Window/UIEscOptionWnd.h +++ b/Source/UI/Window/UIEscOptionWnd.h @@ -12,7 +12,7 @@ class UIEscOptionWnd : public UIFrameWnd { public: UIEscOptionWnd(); void Paint() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) 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 LayoutButtons(); diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 4099afbe7..f6b3020db 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -72,7 +72,7 @@ UIFrameWnd::~UIFrameWnd() = default; // OFFSET: 0x005C4640 // FUNCTION: fn_03570 -bool UIFrameWnd::Slot02() { +bool UIFrameWnd::IsFrameWnd() { return true; } @@ -80,19 +80,19 @@ bool UIFrameWnd::Slot02() { // FUNCTION: fn_11735 void UIFrameWnd::Move(int x, int y) { this->geometry.Move(x, y); - this->Slot36(); + this->RefreshSnap(); } // OFFSET: 0x008BB3F0 // FUNCTION: fn_11797 -void UIFrameWnd::Slot12() { +void UIFrameWnd::StoreMoveOrigin() { this->m_originX = this->geometry.x; this->m_originY = this->geometry.y; } // OFFSET: 0x008AD170 // FUNCTION: fn_11736 -void UIFrameWnd::Slot13(int dx, int dy) { +void UIFrameWnd::MoveFromOrigin(int dx, int dy) { this->geometry.x = this->m_originX + dx; this->geometry.y = this->m_originY + dy; } @@ -119,7 +119,7 @@ static __forceinline void RaiseWindow(UIWindow* window) { // OFFSET: 0x008BA1E0 // FUNCTION: fn_11779 -void UIFrameWnd::Slot25(int x, int y) { +void UIFrameWnd::OnLBtnDown(int x, int y) { RaiseWindow(this); g_windowMgr.SetCapture(this); int screenX = x; @@ -136,7 +136,7 @@ void UIFrameWnd::Slot25(int x, int y) { // OFFSET: 0x008BA510 // FUNCTION: fn_11786 -void UIFrameWnd::Slot27(int x, int y) { +void UIFrameWnd::OnMouseMove(int x, int y) { if (g_windowMgr.Capture() != this || x <= -g_configuredScreenWidth || y <= -g_configuredScreenHeight) { return; } @@ -152,7 +152,7 @@ void UIFrameWnd::Slot27(int x, int y) { return; } - this->Slot13(dx, dy); + this->MoveFromOrigin(dx, dy); int ownX, ownY; g_windowMgr.ConstrainSnap(this, ownX, ownY, 0); int groupX = dx, groupY = dy; @@ -166,19 +166,19 @@ void UIFrameWnd::Slot27(int x, int y) { groupY = ownY; } - this->Slot13(dx + groupX, dy + groupY); + this->MoveFromOrigin(dx + groupX, dy + groupY); g_windowMgr.StoreSnapRectangle(this); g_snapMgr.MoveConnected(this, dx + groupX, dy + groupY); } // OFFSET: 0x008BA3C0 // FUNCTION: fn_11783 -void UIFrameWnd::Slot28(int, int) { +void UIFrameWnd::OnMouseHover(int, int) { } // OFFSET: 0x008BA2C0 // FUNCTION: fn_11781 -void UIFrameWnd::Slot31(int, int) { +void UIFrameWnd::OnLBtnUp(int, int) { if (g_windowMgr.Capture() != this) { return; } @@ -192,7 +192,7 @@ void UIFrameWnd::Slot31(int, int) { // OFFSET: 0x008BB340 // FUNCTION: fn_11796 -void UIFrameWnd::Slot36() { +void UIFrameWnd::RefreshSnap() { int x, y; g_windowMgr.ConstrainSnap(this, x, y, 0); this->geometry.x += x; @@ -229,13 +229,13 @@ int UIFrameWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::int // OFFSET: 0x005C4420 // FUNCTION: fn_03559 -std::vector UIFrameWnd::Slot44() { +std::vector UIFrameWnd::GetReplayData() { return {}; } // OFFSET: 0x005C44F0 // FUNCTION: fn_03562 -int UIFrameWnd::Slot46() { +int UIFrameWnd::GetWindowType() { return 1; } @@ -398,7 +398,7 @@ UICheckBox* UIFrameWnd::AddCheckBox(int id, int width, int height, const char* t // OFFSET: 0x008BA280 // FUNCTION: fn_11780 -void UIReplayListBox::Slot25(int x, int y) { +void UIReplayListBox::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); this->Invalidate(); this->parent->SendMsg(nullptr, 80, 0, 0, 0, 0); @@ -406,12 +406,12 @@ void UIReplayListBox::Slot25(int x, int y) { // OFFSET: 0x008BA500 // FUNCTION: fn_11785 -void UINoticeWnd::Slot28(int, int) { +void UINoticeWnd::OnMouseHover(int, int) { } // OFFSET: 0x008BA310 // FUNCTION: fn_11782 -void UIReplayButton::Slot31(int x, int y) { +void UIReplayButton::OnLBtnUp(int x, int y) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { return; } @@ -434,7 +434,7 @@ void UIReplayButton::Slot31(int x, int y) { // OFFSET: 0x008BA3D0 // FUNCTION: fn_11784 -void UIMonsterInfoWnd::Slot28(int x, int y) { +void UIMonsterInfoWnd::OnMouseHover(int x, int y) { if (x < 161 || x > 259 || y < 31 || y > 41) { return; } diff --git a/Source/UI/Window/UIFrameWnd.h b/Source/UI/Window/UIFrameWnd.h index d4a6c2657..c52d51915 100644 --- a/Source/UI/Window/UIFrameWnd.h +++ b/Source/UI/Window/UIFrameWnd.h @@ -12,18 +12,18 @@ class UIFrameWnd : public UIWindow { public: UIFrameWnd(unsigned char cached); ~UIFrameWnd() override; - bool Slot02() override; + bool IsFrameWnd() override; void Move(int x, int y) override; - void Slot12() override; - void Slot13(int dx, int dy) override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot36() override; + void StoreMoveOrigin() override; + void MoveFromOrigin(int dx, int dy) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void RefreshSnap() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - std::vector Slot44() override; - int Slot46() override; + std::vector GetReplayData() override; + int GetWindowType() override; UIBitmapButton* AddCloseButton(const char* tooltip, int width); UIBitmapButton* AddBaseButton(); UIBitmapButton* AddBigCloseButton(const char* tooltip, int width); diff --git a/Source/UI/Window/UIHomunInfoWnd.h b/Source/UI/Window/UIHomunInfoWnd.h index 9e91fbaf9..70060fae6 100644 --- a/Source/UI/Window/UIHomunInfoWnd.h +++ b/Source/UI/Window/UIHomunInfoWnd.h @@ -15,8 +15,8 @@ class UINormalMB; class UIHomunInfoWnd : public UIFrameWnd { public: UIHomunInfoWnd(); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index 2fb52e902..c80dc1dad 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -73,7 +73,7 @@ namespace { // OFFSET: 0x0091FFD0 // FUNCTION: fn_12639 -void UIHotKeyWnd::Slot15(int, int) { +void UIHotKeyWnd::OnCreate(int, int) { g_session.m_automaticSkills.DisableAll(); this->AddBaseButton(); this->AddCloseButton("", 0); @@ -158,7 +158,7 @@ void UIHotKeyWnd::Slot15(int, int) { // OFFSET: 0x00932F70 // FUNCTION: fn_12721 -void UIHotKeyWnd::Slot32(int, int) { +void UIHotKeyWnd::OnRBtnDown(int, int) { } // OFFSET: 0x00933B30 @@ -244,9 +244,9 @@ int UIHotKeyWnd::RowFromPoint(int x, int y) { // OFFSET: 0x00930B80 // FUNCTION: fn_12693 -void UIHotKeyWnd::Slot25(int x, int y) { +void UIHotKeyWnd::OnLBtnDown(int x, int y) { if (y < this->unknown_00BC) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } const int previous = this->m_selectedRow; @@ -304,7 +304,7 @@ UIHotKeyWnd::HotkeyEntry UIHotKeyWnd::GetHotkey(int tab, int index, bool resolve // OFFSET: 0x009317E0 // FUNCTION: fn_12708 -void UIHotKeyWnd::Slot28(int x, int y) { +void UIHotKeyWnd::OnMouseHover(int x, int y) { const int index = this->RowFromPoint(x, y); if (index <= -1) { return; @@ -326,7 +326,7 @@ void UIHotKeyWnd::Slot28(int x, int y) { // OFFSET: 0x00931C80 // FUNCTION: fn_12710 -void UISerachStoreInfoWnd::Slot28(int x, int y) { +void UISerachStoreInfoWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (item.itemId.size() == 0) { return; diff --git a/Source/UI/Window/UIHotKeyWnd.h b/Source/UI/Window/UIHotKeyWnd.h index 19b2097b9..2e1b20605 100644 --- a/Source/UI/Window/UIHotKeyWnd.h +++ b/Source/UI/Window/UIHotKeyWnd.h @@ -20,9 +20,9 @@ public: }; UIHotKeyWnd(); - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot32(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnRBtnDown(int x, int y) override; int RowFromPoint(int x, int y); void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; @@ -30,7 +30,7 @@ public: void SaveHotkeys(); void SetHotkey(int tab, int index, HotkeyInfo info); HotkeyEntry GetHotkey(int tab, int index, bool resolve); - void Slot28(int x, int y) override; + void OnMouseHover(int x, int y) override; void ReloadHotkeys(); bool AssignSelectedHotkey(int mode); int CheckHotkeyConflict(); diff --git a/Source/UI/Window/UIJobListWnd.cpp b/Source/UI/Window/UIJobListWnd.cpp index f9b446d64..4c829ba49 100644 --- a/Source/UI/Window/UIJobListWnd.cpp +++ b/Source/UI/Window/UIJobListWnd.cpp @@ -31,7 +31,7 @@ static_assert(sizeof(PartyBookingUpdatePacket) == 14); // OFFSET: 0x00920D60 // FUNCTION: fn_12640 -void UIJobListWnd::Slot15(int width, int height) { +void UIJobListWnd::OnCreate(int width, int height) { char title[9] = {}; std::sprintf(title, "Job List"); this->m_title = new UIStaticText(); @@ -71,7 +71,7 @@ void UIJobListWnd::Paint() { // OFFSET: 0x00940DE0 // FUNCTION: fn_12780 -void UIJobListWnd::Slot11() { +void UIJobListWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.width; this->m_saved->height = this->geometry.height; diff --git a/Source/UI/Window/UIJobListWnd.h b/Source/UI/Window/UIJobListWnd.h index 4d9b9df6c..62191e8df 100644 --- a/Source/UI/Window/UIJobListWnd.h +++ b/Source/UI/Window/UIJobListWnd.h @@ -15,8 +15,8 @@ extern std::map g_partyBookingJobs; class UIJobListWnd : public UIFrameWnd { public: UIJobListWnd(); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() 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 RefreshJobs(); diff --git a/Source/UI/Window/UILocaleTextWnd.cpp b/Source/UI/Window/UILocaleTextWnd.cpp index 2d0e37716..9a82aca91 100644 --- a/Source/UI/Window/UILocaleTextWnd.cpp +++ b/Source/UI/Window/UILocaleTextWnd.cpp @@ -45,7 +45,7 @@ namespace AdventureGuide { // OFFSET: 0x009D1830 // FUNCTION: fn_14008 -void CUISubTab::Slot15(int width, int height) { +void CUISubTab::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(98, 26); this->unknown_00E8->Move(0, 0); @@ -81,7 +81,7 @@ void CUISubTab::Slot15(int width, int height) { // OFFSET: 0x009D1C80 // FUNCTION: fn_14009 -void CUITab::Slot15(int width, int height) { +void CUITab::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(98, 40); this->unknown_00E8->Move(0, 0); @@ -104,7 +104,7 @@ void CUITab::Slot15(int width, int height) { // OFFSET: 0x009D1F00 // FUNCTION: fn_14010 -void CUITabInfo::Slot15(int width, int height) { +void CUITabInfo::OnCreate(int width, int height) { this->unknown_00E8 = new CUIStaticText(); this->unknown_00E8->SetSize(90, 44); this->unknown_00E8->Move(32, 0); diff --git a/Source/UI/Window/UILoginOTPWnd.h b/Source/UI/Window/UILoginOTPWnd.h index 3dc2ea710..318c45c7a 100644 --- a/Source/UI/Window/UILoginOTPWnd.h +++ b/Source/UI/Window/UILoginOTPWnd.h @@ -9,9 +9,9 @@ class UIStaticText; class UILoginOTPWnd : public UIFrameWnd { public: UILoginOTPWnd(); - void Slot15(int width, int height) override; - void Slot18() override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UILoginWnd.h b/Source/UI/Window/UILoginWnd.h index fa6064248..a00ca8e46 100644 --- a/Source/UI/Window/UILoginWnd.h +++ b/Source/UI/Window/UILoginWnd.h @@ -14,12 +14,12 @@ public: UILoginWnd(); ~UILoginWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; - void Slot18() override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; - void Slot27(int x, int y) override; + void OnMouseMove(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void SaveLogin(); void LoadLogin(); diff --git a/Source/UI/Window/UIMakeCharWnd.h b/Source/UI/Window/UIMakeCharWnd.h index 1d5131940..48ac98f55 100644 --- a/Source/UI/Window/UIMakeCharWnd.h +++ b/Source/UI/Window/UIMakeCharWnd.h @@ -13,9 +13,9 @@ class UIMakeCharWnd : public UIFrameWnd { public: UIMakeCharWnd(); - void Slot15(int width, int height) override; - void Slot18() override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void InitHairControls(); diff --git a/Source/UI/Window/UIMerInfoWnd.h b/Source/UI/Window/UIMerInfoWnd.h index b38775039..f6a77f2d9 100644 --- a/Source/UI/Window/UIMerInfoWnd.h +++ b/Source/UI/Window/UIMerInfoWnd.h @@ -11,8 +11,8 @@ class UIMerInfoWnd : public UIFrameWnd { public: UIMerInfoWnd(); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 42bad382f..c4d3b5abb 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -267,40 +267,40 @@ void UIMessageBox::Paint() { // OFFSET: 0x008AC410 // FUNCTION: fn_11729 -bool UIBank_NewWnd::Slot03() { +bool UIBank_NewWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x008AC420 // FUNCTION: fn_11730 -bool UIReplayControlWnd::Slot03() { +bool UIReplayControlWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x008AC430 // FUNCTION: fn_11731 -bool UIReplayRECControlWnd::Slot03() { +bool UIReplayRECControlWnd::NeedsFrameRefresh() { return true; } // OFFSET: 0x008B7A90 // FUNCTION: fn_11756 -void UIMessageBox::Slot18() { +void UIMessageBox::OnDestroy() { } // OFFSET: 0x008B7AA0 // FUNCTION: fn_11757 -void UINoticeWnd::Slot18() { +void UINoticeWnd::OnDestroy() { } // OFFSET: 0x008B7AB0 // FUNCTION: fn_11758 -void UISelectReplayDataWnd::Slot18() { +void UISelectReplayDataWnd::OnDestroy() { } // OFFSET: 0x008B7AC0 // FUNCTION: fn_11759 -void UISelectServerWnd::Slot18() { +void UISelectServerWnd::OnDestroy() { } // OFFSET: 0x008B8610 @@ -633,8 +633,8 @@ void UIMessageBox::Configure( this->modal = modalValue; this->SetSize(width, height); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); this->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); int inset = 0; @@ -733,7 +733,7 @@ void UIMessageBox::Configure( // OFFSET: 0x008BADC0 // FUNCTION: fn_11791 -void UIMessageBox::Slot19() { +void UIMessageBox::OnProcess() { if (this->counting == 0) { return; } @@ -875,7 +875,7 @@ void UIWindowMgr::SetUnknown04DC(const char* text) { // OFFSET: 0x008C35A0 // FUNCTION: fn_11824 -void UIChatRoomWnd::Slot11() { +void UIChatRoomWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -886,7 +886,7 @@ void UIChatRoomWnd::Slot11() { // OFFSET: 0x008C35E0 // FUNCTION: fn_11825 -void UIHomunInfoWnd::Slot11() { +void UIHomunInfoWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -897,7 +897,7 @@ void UIHomunInfoWnd::Slot11() { // OFFSET: 0x008B0CA0 // FUNCTION: fn_11744 -void UIMerInfoWnd::Slot15(int, int) { +void UIMerInfoWnd::OnCreate(int, int) { this->AddCloseButton("", 0); { const std::string name("유저인터페이스\\btn_fired"); @@ -939,7 +939,7 @@ void UIMerInfoWnd::Slot15(int, int) { // OFFSET: 0x008C3630 // FUNCTION: fn_11827 -void UIMerInfoWnd::Slot11() { +void UIMerInfoWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -1004,7 +1004,7 @@ int UIMerInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i // OFFSET: 0x008C3670 // FUNCTION: fn_11828 -void UIPetInfoWnd::Slot11() { +void UIPetInfoWnd::StoreInfo() { if (this->saved) { this->saved->x = this->geometry.x; this->saved->y = this->geometry.y; @@ -1015,7 +1015,7 @@ void UIPetInfoWnd::Slot11() { // OFFSET: 0x008C36B0 // FUNCTION: fn_11829 -void UIReplayRECControlWnd::Slot11() { +void UIReplayRECControlWnd::StoreInfo() { if (this->saved) { this->saved->width = this->geometry.width; this->saved->height = this->geometry.height; @@ -1036,7 +1036,7 @@ void UIReplayRECControlWnd::AnimateLoading() { // OFFSET: 0x008AE8A0 // FUNCTION: fn_11741 -void UILoginOTPWnd::Slot15(int, int) { +void UILoginOTPWnd::OnCreate(int, int) { const char prefixSource[] = {'\x8F', '\xC8', '\x2D', '\x7F', '\xC9', '\xF9', '\xFA', '\xB4', '\x89', '\x83', '\x2D', '\x49', '\xB4', '\x8D', '\x63', '\x79'}; thread_local EncryptedName prefixName(prefixSource); const std::string prefix(prefixName.Text()); @@ -1131,7 +1131,7 @@ void UILoginOTPWnd::Paint() { // OFFSET: 0x008C3620 // FUNCTION: fn_11826 -void UILoginWnd::Slot11() { +void UILoginWnd::StoreInfo() { this->SaveLogin(); } @@ -1413,7 +1413,7 @@ int UINoticeWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in // OFFSET: 0x008BB070 // FUNCTION: fn_11793 -void UINoticeWnd::Slot35(int delta) { +void UINoticeWnd::OnWheel(int delta) { if (delta < 0) { this->SendMsg(this->m_scrollBar, 7, 6, 0, 0, 0); } else { @@ -1534,12 +1534,12 @@ void UITalkboxTrapInputWnd::Paint() { // OFFSET: 0x008BA660 // FUNCTION: fn_11787 -void UILoginWnd::Slot27(int, int) { +void UILoginWnd::OnMouseMove(int, int) { } // OFFSET: 0x008BADB0 // FUNCTION: fn_11790 -void UIMakeCharWnd::Slot19() { +void UIMakeCharWnd::OnProcess() { } // OFFSET: 0x008AC490 @@ -1611,7 +1611,7 @@ void UIMakeCharWnd::InitHairControls() { // OFFSET: 0x008B0B60 // FUNCTION: fn_11743 -void UIMakeCharWnd::Slot15(int, int) { +void UIMakeCharWnd::OnCreate(int, int) { g_modeMgr.gameMode->SendMsg(10014, 0, 0, 0, 0); this->m_nameEdit = new UIBitmapEditCtrl(); this->m_nameEdit->SetBitmapName("유저인터페이스\\login_interface\\name-edit.bmp"); @@ -1629,12 +1629,12 @@ void UIMakeCharWnd::Slot15(int, int) { // FUNCTION: fn_11734 void UIChatRoomWnd::Move(int x, int y) { this->geometry.Move(x, y); - this->Slot36(); + this->RefreshSnap(); } // OFFSET: 0x008AD3C0 // FUNCTION: fn_11738 -void UIChatRoomWnd::Slot15(int, int) { +void UIChatRoomWnd::OnCreate(int, int) { this->m_message0 = 184; this->resizer = new UIResizer(); @@ -1679,7 +1679,7 @@ void UIChatRoomWnd::Slot15(int, int) { // OFFSET: 0x008B1760 // FUNCTION: fn_11746 -void UINoticeWnd::Slot15(int, int) { +void UINoticeWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\"); const char* names[3][3] = {{"btn_ok", "btn_ok_a", "btn_ok_b"}, {"btn_back", "btn_back_a", "btn_back_b"}, {"btn_next", "btn_next_a", "btn_next_b"}}; int ids[3] = {184, 246, 218}; @@ -1840,7 +1840,7 @@ void UINoticeWnd::Slot15(int, int) { // OFFSET: 0x008B42D0 // FUNCTION: fn_11749 -void UIReplayRECControlWnd::Slot15(int, int) { +void UIReplayRECControlWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\replay_interface\\"); const char* names[11] = { "btn_start_", "btn_stop_", "btn_start_", "btn_save_", "btn_setup_", "btn_close_", @@ -1946,7 +1946,7 @@ void UIReplayRECControlWnd::Slot15(int, int) { // OFFSET: 0x008B5A50 // FUNCTION: fn_11750 -void UISelectReplayDataWnd::Slot15(int width, int height) { +void UISelectReplayDataWnd::OnCreate(int width, int height) { this->m_list = new UIReplayListBox(); this->m_list->Configure(6, 127, width - 12, height - 170, 0); this->m_list->backgroundRed = 240; @@ -2005,7 +2005,7 @@ void UISelectReplayDataWnd::Slot15(int width, int height) { // OFFSET: 0x008B7040 // FUNCTION: fn_11752 -void UITalkboxTrapInputWnd::Slot15(int, int) { +void UITalkboxTrapInputWnd::OnCreate(int, int) { this->edit = new UIEditCtrl(); this->edit->SetSize(240, 16); this->edit->Move(22, 50); @@ -2035,17 +2035,17 @@ void UITalkboxTrapInputWnd::Slot15(int, int) { // OFFSET: 0x008B7A60 // FUNCTION: fn_11753 -void UILoginOTPWnd::Slot18() { +void UILoginOTPWnd::OnDestroy() { } // OFFSET: 0x008B7A70 // FUNCTION: fn_11754 -void UILoginWnd::Slot18() { +void UILoginWnd::OnDestroy() { } // OFFSET: 0x008B7A80 // FUNCTION: fn_11755 -void UIMakeCharWnd::Slot18() { +void UIMakeCharWnd::OnDestroy() { } // OFFSET: 0x008B8E90 @@ -2057,7 +2057,7 @@ void UIMessageBoxAutoreturn::Paint() { // OFFSET: 0x008BA670 // FUNCTION: fn_11788 -void UILoginOTPWnd::Slot19() { +void UILoginOTPWnd::OnProcess() { auto* login = static_cast(g_modeMgr.GetLoginMode()); if (login == nullptr) { return; @@ -2072,7 +2072,7 @@ void UILoginOTPWnd::Slot19() { // OFFSET: 0x008BAEF0 // FUNCTION: fn_11792 -void UIMessageBoxAutoreturn::Slot19() { +void UIMessageBoxAutoreturn::OnProcess() { if (this->counting == 0) { return; } @@ -2435,7 +2435,7 @@ int UIReplayRECControlWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x008BA820 // FUNCTION: fn_11789 -void UILoginWnd::Slot19() { +void UILoginWnd::OnProcess() { if (g_windowMgr.GetHoverWindow() == this->idEdit) { this->idEdit->TextColor(RGB(0, 0, 0), 0xFFFFFFFF); if (this->idPlaceholder == true) { @@ -2696,7 +2696,7 @@ UINoticeWnd::UINoticeWnd() : UIFrameWnd(0) { // OFFSET: 0x008AD190 // FUNCTION: fn_11737 -void UIBank_NewWnd::Slot15(int, int) { +void UIBank_NewWnd::OnCreate(int, int) { this->AddCloseButton("Exit", 0); this->AddBitmapButton(462, 209, 77, "bank\\btn_deposit", LookupMessage(2774)); this->AddBitmapButton(463, 209, 102, "bank\\btn_withdraw", LookupMessage(2775)); @@ -2721,7 +2721,7 @@ void UIBank_NewWnd::Slot15(int, int) { // OFFSET: 0x008AD770 // FUNCTION: fn_11739 -void UICntWnd::Slot15(int, int) { +void UICntWnd::OnCreate(int, int) { this->m_edit = new UIEditCtrl(); this->m_edit->SetSize(80, 16); this->m_edit->Move(15, 22); @@ -3198,7 +3198,7 @@ void UIPetInfoWnd::UpdateFriendlyGauge() { // OFFSET: 0x008B1240 // FUNCTION: fn_11745 -void UIMonsterInfoWnd::Slot15(int, int) { +void UIMonsterInfoWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\"); auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); @@ -3462,7 +3462,7 @@ int UILoginOTPWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // OFFSET: 0x008ADC80 // FUNCTION: fn_11740 -void UIHomunInfoWnd::Slot15(int, int) { +void UIHomunInfoWnd::OnCreate(int, int) { this->AddCloseButton("", 0); this->nameEdit = new UIEditCtrl2(); this->nameEdit->SetSize(80, 16); @@ -3729,7 +3729,7 @@ int UIHomunInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std: // OFFSET: 0x008B2820 // FUNCTION: fn_11747 -void UIPetInfoWnd::Slot15(int, int) { +void UIPetInfoWnd::OnCreate(int, int) { this->AddCloseButton("", 0); this->nameEdit = new UIEditCtrl2(); this->nameEdit->SetSize(80, 16); @@ -3954,7 +3954,7 @@ int UIPetInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i // OFFSET: 0x008B6520 // FUNCTION: fn_11751 -void UISelectServerWnd::Slot15(int width, int height) { +void UISelectServerWnd::OnCreate(int width, int height) { this->m_serverList = new UIServerListBox(); this->m_serverList->Configure(12, 22, width - 24, height - 55, 0); this->m_serverList->backgroundRed = 240; @@ -4000,7 +4000,7 @@ void UISelectServerWnd::Slot15(int width, int height) { // OFFSET: 0x008B31F0 // FUNCTION: fn_11748 -void UIReplayControlWnd::Slot15(int, int) { +void UIReplayControlWnd::OnCreate(int, int) { const std::string prefix("유저인터페이스\\replay_interface\\"); const int ids[6] = {403, 404, 405, 406, 401, 402}; const int positions[6][2] = {{101, 89}, {149, 89}, {53, 89}, {53, 111}, {5, 89}, {-100, -100}}; @@ -4160,8 +4160,8 @@ void UIMessageBoxAutoreturn::Configure(const char* text, int timeout) { } this->SetSize(280, 120); - this->Slot15(280, 120); - this->Slot22(280, 120); + this->OnCreate(280, 120); + this->OnSize(280, 120); this->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180); this->viewer = new UITextViewer(); @@ -4378,7 +4378,7 @@ int UIMakeCharWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: // OFFSET: 0x008AF190 // FUNCTION: fn_11742 -void UILoginWnd::Slot15(int, int) { +void UILoginWnd::OnCreate(int, int) { this->unknown_00BC = g_windowMgr.EnsureWindow(325); UIRPImageWnd2* backgroundWindow = static_cast(this->unknown_00BC); const char backgroundSource[] = {'\xA7', '\x04', '\x51', '\x5F', '\x61', '\xF1', '\x26', '\xDE', '\xA1', '\x4F', '\x51', '\x69', '\x1C', '\x85', '\xBF', '\x7F', '\x08', '\xCC', '\xF8', diff --git a/Source/UI/Window/UIMessageBox.h b/Source/UI/Window/UIMessageBox.h index 8d4b1a834..2ffeb8118 100644 --- a/Source/UI/Window/UIMessageBox.h +++ b/Source/UI/Window/UIMessageBox.h @@ -12,8 +12,8 @@ class UIMessageBox : public UIFrameWnd { public: UIMessageBox(); ~UIMessageBox() override; - void Slot18() override; - void Slot19() override; + void OnDestroy() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void Configure(const char* text, int type, bool defaultAccept, int timeout, const char* caption, int width, int height, int modal, const char* icon); diff --git a/Source/UI/Window/UIMessageBoxAutoreturn.h b/Source/UI/Window/UIMessageBoxAutoreturn.h index 2b36ca780..4b98e6ad5 100644 --- a/Source/UI/Window/UIMessageBoxAutoreturn.h +++ b/Source/UI/Window/UIMessageBoxAutoreturn.h @@ -12,7 +12,7 @@ class UIMessageBoxAutoreturn : public UIFrameWnd { public: UIMessageBoxAutoreturn(); - void Slot19() override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void Configure(const char* text, int timeout); diff --git a/Source/UI/Window/UIMileageWnd.cpp b/Source/UI/Window/UIMileageWnd.cpp index f03c7752b..58714d0e9 100644 --- a/Source/UI/Window/UIMileageWnd.cpp +++ b/Source/UI/Window/UIMileageWnd.cpp @@ -67,12 +67,12 @@ void UIMileageWnd::Paint() { // OFFSET: 0x0094EE70 // FUNCTION: fn_12918 -void UIMileageWnd::Slot25(int x, int y) { +void UIMileageWnd::OnLBtnDown(int x, int y) { } // OFFSET: 0x0094EF10 // FUNCTION: fn_12923 -void UIMileageWnd::Slot31(int x, int y) { +void UIMileageWnd::OnLBtnUp(int x, int y) { if (g_session.unknown_0000 == 20) { return; } @@ -84,7 +84,7 @@ void UIMileageWnd::Slot31(int x, int y) { // OFFSET: 0x0094EFC0 // FUNCTION: fn_12926 -void UIMileageWnd::Slot28(int x, int y) { +void UIMileageWnd::OnMouseHover(int x, int y) { if (this->m_tooltip.size() == 0) { return; } @@ -97,12 +97,12 @@ void UIMileageWnd::Slot28(int x, int y) { // OFFSET: 0x0094F040 // FUNCTION: fn_12929 -void UIMileageWnd::Slot27(int x, int y) { +void UIMileageWnd::OnMouseMove(int x, int y) { } // OFFSET: 0x0094F130 // FUNCTION: fn_12932 -void UIMileageWnd::Slot19() { +void UIMileageWnd::OnProcess() { if (!this->geometry.visible || this->m_point >= 300 || this->m_remaining == 0) { return; } @@ -126,7 +126,7 @@ void UIMileageWnd::Slot19() { // OFFSET: 0x0094C230 // FUNCTION: fn_12894 -void UIMileageWnd::Slot15(int width, int height) { +void UIMileageWnd::OnCreate(int width, int height) { const std::string title = FormatOwnedString(LookupMessage(2619), 300); this->m_tooltip = title; } diff --git a/Source/UI/Window/UIMileageWnd.h b/Source/UI/Window/UIMileageWnd.h index 178c08500..68bd4e442 100644 --- a/Source/UI/Window/UIMileageWnd.h +++ b/Source/UI/Window/UIMileageWnd.h @@ -10,12 +10,12 @@ class UIMileageWnd : public UIFrameWnd { public: UIMileageWnd(); void Paint() override; - void Slot19() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot15(int width, int height) override; + void OnProcess() override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; protected: diff --git a/Source/UI/Window/UIMiniBtnWnd.cpp b/Source/UI/Window/UIMiniBtnWnd.cpp index 6202cb289..57240b91c 100644 --- a/Source/UI/Window/UIMiniBtnWnd.cpp +++ b/Source/UI/Window/UIMiniBtnWnd.cpp @@ -25,7 +25,7 @@ void UIMiniBtnWnd::Paint() { // OFFSET: 0x00930CD0 // FUNCTION: fn_12694 -void UIMiniBtnWnd::Slot25(int, int) { +void UIMiniBtnWnd::OnLBtnDown(int, int) { bool visible; UIWindow* window = g_windowMgr.LookupWindow(this->m_windowId); if (window) { diff --git a/Source/UI/Window/UIMiniBtnWnd.h b/Source/UI/Window/UIMiniBtnWnd.h index 3bb21dc16..063c09810 100644 --- a/Source/UI/Window/UIMiniBtnWnd.h +++ b/Source/UI/Window/UIMiniBtnWnd.h @@ -9,7 +9,7 @@ class UIMiniBtnWnd : public UIFrameWnd { public: UIMiniBtnWnd(); void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(int x, int y) override; void Toggle(); /* 00B4 */ std::string m_activeImage; diff --git a/Source/UI/Window/UIMonsterDisplayWnd.h b/Source/UI/Window/UIMonsterDisplayWnd.h index 1e332aa67..4b6116e63 100644 --- a/Source/UI/Window/UIMonsterDisplayWnd.h +++ b/Source/UI/Window/UIMonsterDisplayWnd.h @@ -12,7 +12,7 @@ public: /* 00CC */ std::string unknown_00CC; /* 00E4 */ unsigned char unknown_00E4; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIMonsterInfoWnd.h b/Source/UI/Window/UIMonsterInfoWnd.h index 768fb9c68..0a8537422 100644 --- a/Source/UI/Window/UIMonsterInfoWnd.h +++ b/Source/UI/Window/UIMonsterInfoWnd.h @@ -23,8 +23,8 @@ class UIMonsterInfoWnd : public UIFrameWnd { public: UIMonsterInfoWnd(); - void Slot15(int width, int height) override; - void Slot28(int x, int y) override; + void OnCreate(int width, int height) override; + void OnMouseHover(int x, int y) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void DrawResistance(int x, int y, const char* label, int value, std::uint32_t border, std::uint32_t fill); diff --git a/Source/UI/Window/UINavigationHelpWnd.cpp b/Source/UI/Window/UINavigationHelpWnd.cpp index a11a991d7..0a467e81d 100644 --- a/Source/UI/Window/UINavigationHelpWnd.cpp +++ b/Source/UI/Window/UINavigationHelpWnd.cpp @@ -8,7 +8,7 @@ // OFFSET: 0x00921530 // FUNCTION: fn_12642 -void UINavigationHelpWnd::Slot15(int width, int height) { +void UINavigationHelpWnd::OnCreate(int width, int height) { this->m_viewer = new UITextViewer(); this->m_viewer->Configure(5, 22, width - 10, height - 27, 0); this->m_viewer->backgroundBlue = 0xd2; diff --git a/Source/UI/Window/UINavigationHelpWnd.h b/Source/UI/Window/UINavigationHelpWnd.h index eecec7c36..18c81d94d 100644 --- a/Source/UI/Window/UINavigationHelpWnd.h +++ b/Source/UI/Window/UINavigationHelpWnd.h @@ -8,7 +8,7 @@ class UITextViewer; class UINavigationHelpWnd : public UIFrameWnd { public: UINavigationHelpWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp index eceb5110f..fd80a9ef3 100644 --- a/Source/UI/Window/UINavigationWnd.cpp +++ b/Source/UI/Window/UINavigationWnd.cpp @@ -37,7 +37,7 @@ float g_navigationMarkerScale = 0.453125f; // OFFSET: 0x00921A70 // FUNCTION: fn_12643 -void UINavigationWnd::Slot15(int width, int height) { +void UINavigationWnd::OnCreate(int width, int height) { this->m_routePanel = new UIListBoxNavi(); this->m_routePanel->SetSize(215, 96); this->m_routePanel->backgroundRed = 210; @@ -165,11 +165,11 @@ void UINavigationWnd::Slot15(int width, int height) { // OFFSET: 0x00931390 // FUNCTION: fn_12702 -void UINavigationWnd::Slot31(int x, int y) { +void UINavigationWnd::OnLBtnUp(int x, int y) { if (static_cast(x - 8) <= 126 && static_cast(y - 39) <= 126) { this->SendMsg(this, 6, 429, 0, 0, 0); } - this->UIFrameWnd::Slot31(x, y); + this->UIFrameWnd::OnLBtnUp(x, y); } // OFFSET: 0x0093DAB0 @@ -497,7 +497,7 @@ void UINavigationWnd::ApplyMinimized() { // OFFSET: 0x00940E20 // FUNCTION: fn_12781 -void UINavigationWnd::Slot11() { +void UINavigationWnd::StoreInfo() { if (this->m_saved) { this->m_saved->width = this->geometry.width; this->m_saved->height = this->geometry.height; diff --git a/Source/UI/Window/UINavigationWnd.h b/Source/UI/Window/UINavigationWnd.h index ed10704c8..0e5382796 100644 --- a/Source/UI/Window/UINavigationWnd.h +++ b/Source/UI/Window/UINavigationWnd.h @@ -30,10 +30,10 @@ struct NavigationWndInfo { class UINavigationWnd : public UIFrameWnd { public: - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot31(int x, int y) override; + void OnLBtnUp(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 LayoutTabs(); void ApplyMinimized(); diff --git a/Source/UI/Window/UINewMakeCharWnd.cpp b/Source/UI/Window/UINewMakeCharWnd.cpp index 41ee8b51c..c56666003 100644 --- a/Source/UI/Window/UINewMakeCharWnd.cpp +++ b/Source/UI/Window/UINewMakeCharWnd.cpp @@ -114,41 +114,41 @@ UINewMakeCharWnd::UINewMakeCharWnd() // OFFSET: 0x007DB320 // FUNCTION: fn_09617 -void UIHairBitmap::Slot25(int x, int y) { +void UIHairBitmap::OnLBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot25(x, y); + this->parent->OnLBtnDown(x, y); } } // OFFSET: 0x007DB300 // FUNCTION: fn_09616 -void UIHairBitmap::Slot26(int x, int y) { +void UIHairBitmap::OnLBtnDblClk(int x, int y) { if (this->parent) { - this->parent->Slot26(x, y); + this->parent->OnLBtnDblClk(x, y); } } // OFFSET: 0x007DB380 // FUNCTION: fn_09620 -void UIHairBitmap::Slot27(int x, int y) { +void UIHairBitmap::OnMouseMove(int x, int y) { if (this->parent) { - this->parent->Slot27(x, y); + this->parent->OnMouseMove(x, y); } } // OFFSET: 0x007DB360 // FUNCTION: fn_09619 -void UIHairBitmap::Slot28(int x, int y) { +void UIHairBitmap::OnMouseHover(int x, int y) { if (this->parent) { - this->parent->Slot28(x, y); + this->parent->OnMouseHover(x, y); } } // OFFSET: 0x007DB3A0 // FUNCTION: fn_09621 -void UIHairBitmap::Slot29(int x, int y) { +void UIHairBitmap::OnMouseCheck(int x, int y) { if (this->parent) { - this->parent->Slot29(x, y); + this->parent->OnMouseCheck(x, y); } } @@ -162,9 +162,9 @@ void UIHairBitmap::ResetCursor(int x, int y) { // OFFSET: 0x007DB340 // FUNCTION: fn_09618 -void UIHairBitmap::Slot31(int x, int y) { +void UIHairBitmap::OnLBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot31(x, y); + this->parent->OnLBtnUp(x, y); } } @@ -225,7 +225,7 @@ void UINewMakeCharWnd::Paint() { // OFFSET: 0x007DB3E0 // FUNCTION: fn_09623 -void UINewMakeCharWnd::Slot19() { +void UINewMakeCharWnd::OnProcess() { this->m_raceViews[this->m_race]->Invalidate(); } @@ -298,7 +298,7 @@ int UIHairStyleButton::SendMsg(UIWindow* sender, int message, std::intptr_t argu // OFFSET: 0x007DA290 // FUNCTION: fn_09613 -void UIHairStyleButton::Slot15(int width, int height) { +void UIHairStyleButton::OnCreate(int width, int height) { this->m_preview = new (std::nothrow) UIHairBitmap(); this->m_preview->SetSize(36, 37); this->AddChild(this->m_preview); @@ -341,7 +341,7 @@ void UINewMakeCharWnd::UpdatePreviewResources() { // OFFSET: 0x007DA340 // FUNCTION: fn_09614 -void UINewMakeCharWnd::Slot15(int width, int height) { +void UINewMakeCharWnd::OnCreate(int width, int height) { UIBitmapButton* closeButton = new UIBitmapButton(); closeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_close_normal.bmp", 0, 0); closeButton->SetBitmap("유저인터페이스\\make_character_ver2\\bt_close_over.bmp", 1, 0); diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h index 365753543..33178ff0e 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Window/UINewMakeCharWnd.h @@ -23,19 +23,19 @@ public: using UIBitmapButton::UIBitmapButton; UIHairBitmap(); - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; - void Slot29(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnMouseCheck(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; }; class UIHairStyleButton : public UIBitmapButton { public: UIHairStyleButton(int style, int sex); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: @@ -68,9 +68,9 @@ static_assert(sizeof(MakeCharacterStatus) == 0x50); class UINewMakeCharWnd : public UIFrameWnd { public: UINewMakeCharWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot19() override; + void OnProcess() override; void UpdatePreviewResources(); int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Window/UINewSelectCharWnd.cpp index 4356e6261..7982a202a 100644 --- a/Source/UI/Window/UINewSelectCharWnd.cpp +++ b/Source/UI/Window/UINewSelectCharWnd.cpp @@ -143,7 +143,7 @@ void UINewSelectCharWnd::DisableButtonById(int id) { // OFFSET: 0x007D52B0 // FUNCTION: fn_09590 -void UINewSelectCharWnd::Slot15(int width, int height) { +void UINewSelectCharWnd::OnCreate(int width, int height) { HKEY key; const LSTATUS opened = RegOpenKeyExA(HKEY_LOCAL_MACHINE, g_subKey, 0, KEY_QUERY_VALUE, &key); this->m_page = 0; @@ -553,7 +553,7 @@ void __stdcall Nullsub244(int, int) { // OFFSET: 0x007D7750 // FUNCTION: fn_09593 -void UINewSelectCharWnd::Slot19() { +void UINewSelectCharWnd::OnProcess() { if (g_mouse.buttons[0] == 3) { if (g_windowMgr.unknown_0210 != 0) { g_windowMgr.CloseWindow(0x12); @@ -569,7 +569,7 @@ void UINewSelectCharWnd::Slot19() { } if (this->m_slotButtons2[this->m_pageSlot]) { - this->m_slotButtons2[this->m_pageSlot]->Slot19(); + this->m_slotButtons2[this->m_pageSlot]->OnProcess(); this->m_slotButtons2[this->m_pageSlot]->InvalidateChildren(); } } @@ -948,15 +948,15 @@ int UINewSelectCharWnd::SendMsg(UIWindow* sender, int message, std::intptr_t arg break; } case 0x1B2: - this->m_slotButtons2[0]->Slot25(0, 0); + this->m_slotButtons2[0]->OnLBtnDown(0, 0); this->SendMsg(nullptr, 6, 0x1B0, 0, 0, 0); break; case 0x1B3: - this->m_slotButtons2[1]->Slot25(0, 0); + this->m_slotButtons2[1]->OnLBtnDown(0, 0); this->SendMsg(nullptr, 6, 0x1B0, 0, 0, 0); break; case 0x1B4: - this->m_slotButtons2[2]->Slot25(0, 0); + this->m_slotButtons2[2]->OnLBtnDown(0, 0); this->SendMsg(nullptr, 6, 0x1B0, 0, 0, 0); break; } diff --git a/Source/UI/Window/UINewSelectCharWnd.h b/Source/UI/Window/UINewSelectCharWnd.h index e88fec8f4..4863661e2 100644 --- a/Source/UI/Window/UINewSelectCharWnd.h +++ b/Source/UI/Window/UINewSelectCharWnd.h @@ -46,11 +46,11 @@ public: void EnableButtonById(int id); void SaveCurrentSlot(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; // INLINED - void Slot25(int, int) override {} + void OnLBtnDown(int, int) 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 UpdateDeleteButtons(); diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp index fadf2b646..8fe384dee 100644 --- a/Source/UI/Window/UINewSkillListWnd.cpp +++ b/Source/UI/Window/UINewSkillListWnd.cpp @@ -100,7 +100,7 @@ static int SkillTabOf(int skillId) { // OFFSET: 0x009B3E70 // FUNCTION: fn_13826 -void UINewSkillListWnd::Slot11() { +void UINewSkillListWnd::StoreInfo() { if (this->m_saved) { this->m_saved->x = this->geometry.x; this->m_saved->y = this->geometry.y; @@ -111,10 +111,10 @@ void UINewSkillListWnd::Slot11() { // OFFSET: 0x009B2C60 // FUNCTION: fn_13821 -void UINewSkillListWnd::Slot35(int delta) { +void UINewSkillListWnd::OnWheel(int delta) { UIWindow* window = g_windowMgr.LookupWindow(46); if (window && window->geometry.visible) { - static_cast(window)->m_scrollBar->Slot35(delta); + static_cast(window)->m_scrollBar->OnWheel(delta); return; } @@ -778,7 +778,7 @@ bool UINewSkillListWnd::IsSkillArea(int x, int y) { // OFFSET: 0x009B1050 // FUNCTION: fn_13814 -void UINewSkillListWnd::Slot15(int width, int height) { +void UINewSkillListWnd::OnCreate(int width, int height) { this->m_tabs = new UITabControl(); this->m_tabs->Configure(0, 17, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0); this->m_tabs->Move(0, 6); @@ -949,13 +949,13 @@ void UINewSkillListWnd::Paint() { // OFFSET: 0x009B2590 // FUNCTION: fn_13816 -void UINewSkillListWnd::Slot26(int x, int y) { +void UINewSkillListWnd::OnLBtnDblClk(int x, int y) { if (g_session.GetOption(5) > 0) { return; } if (y < this->m_topMargin) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -977,9 +977,9 @@ void UINewSkillListWnd::Slot26(int x, int y) { // OFFSET: 0x009B26D0 // FUNCTION: fn_13817 -void UINewSkillListWnd::Slot25(int x, int y) { +void UINewSkillListWnd::OnLBtnDown(int x, int y) { if (y < this->m_topMargin) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } @@ -1011,10 +1011,10 @@ void UINewSkillListWnd::Slot25(int x, int y) { // OFFSET: 0x009B2810 // FUNCTION: fn_13818 -void UINewSkillListWnd::Slot31(int x, int y) { +void UINewSkillListWnd::OnLBtnUp(int x, int y) { if (y < this->m_topMargin) { - UIFrameWnd::Slot31(x, y); - this->Slot11(); + UIFrameWnd::OnLBtnUp(x, y); + this->StoreInfo(); return; } @@ -1034,7 +1034,7 @@ void UINewSkillListWnd::Slot31(int x, int y) { // OFFSET: 0x009B28F0 // FUNCTION: fn_13819 -void UINewSkillListWnd::Slot28(int x, int y) { +void UINewSkillListWnd::OnMouseHover(int x, int y) { const int gate = g_session.m_simplifiedSkillList; if (!this->IsSkillArea(x, y) || (gate != 0 && x > 96)) { return; @@ -1064,7 +1064,7 @@ void UINewSkillListWnd::Slot28(int x, int y) { // OFFSET: 0x009B29E0 // FUNCTION: fn_13820 -void UINewSkillListWnd::Slot33(int x, int y) { +void UINewSkillListWnd::OnRBtnUp(int x, int y) { this->m_selectedSkill = this->SkillIndexAt(x, y); if (this->m_selectedSkill == -1) { this->m_showDetail = false; @@ -1354,7 +1354,7 @@ int UINewSkillListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s this->SendMsg(nullptr, 23, 0, 0, 0, 0); return 0; case 202: - this->Slot11(); + this->StoreInfo(); this->m_needsRedraw = 1; gate = gate == 0; if (gate != 0) { diff --git a/Source/UI/Window/UINewSkillListWnd.h b/Source/UI/Window/UINewSkillListWnd.h index f5aeb89e1..bb44cdc9a 100644 --- a/Source/UI/Window/UINewSkillListWnd.h +++ b/Source/UI/Window/UINewSkillListWnd.h @@ -27,15 +27,15 @@ class UINewSkillListWnd : public UIFrameWnd { public: UINewSkillListWnd(); __declspec(noinline) ~UINewSkillListWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; std::string ValueText(int id); diff --git a/Source/UI/Window/UINormalMB.cpp b/Source/UI/Window/UINormalMB.cpp index 17996311a..49ec1fb0a 100644 --- a/Source/UI/Window/UINormalMB.cpp +++ b/Source/UI/Window/UINormalMB.cpp @@ -81,8 +81,8 @@ void UINormalMB::Create(UIWindow* owner, const char* text, int type, bool defaul } this->SetSize(width, height); - this->Slot15(width, height); - this->Slot22(width, height); + this->OnCreate(width, height); + this->OnSize(width, height); this->Move(static_cast((g_renderer->viewport.width - width) * 0.5), static_cast((g_renderer->viewport.height - height) * 0.5)); int inset = 0; diff --git a/Source/UI/Window/UINoteWnd.cpp b/Source/UI/Window/UINoteWnd.cpp index 85c75b86c..9ffe594ee 100644 --- a/Source/UI/Window/UINoteWnd.cpp +++ b/Source/UI/Window/UINoteWnd.cpp @@ -8,7 +8,7 @@ // OFFSET: 0x0094C2D0 // FUNCTION: fn_12895 -void UINoteWnd::Slot15(int width, int height) { +void UINoteWnd::OnCreate(int width, int height) { UIBasicButton* button = new UIBasicButton(); button->Configure(60, LookupMessage(0xBE5)); button->Move(width - 68, height - 26); @@ -37,23 +37,23 @@ void UINoteWnd_Scroll::Paint() { // OFFSET: 0x0094EE80 // FUNCTION: fn_12919 -void UINoteWnd_Scroll::Slot25(int x, int y) { +void UINoteWnd_Scroll::OnLBtnDown(int x, int y) { if (this->parent) { - this->parent->Slot25(x + 23, y + 27); + this->parent->OnLBtnDown(x + 23, y + 27); } } // OFFSET: 0x0094EF80 // FUNCTION: fn_12924 -void UINoteWnd_Scroll::Slot31(int x, int y) { +void UINoteWnd_Scroll::OnLBtnUp(int x, int y) { if (this->parent) { - this->parent->Slot31(x + 23, y + 27); + this->parent->OnLBtnUp(x + 23, y + 27); } } // OFFSET: 0x0094F2C0 // FUNCTION: fn_12935 -void UINoteWnd_Scroll::Slot35(int delta) { +void UINoteWnd_Scroll::OnWheel(int delta) { if (this->wheelScroll == 1) { if (delta < 0) { this->SendMsg(this->scrollBar, 7, 12, 0, 0, 0); diff --git a/Source/UI/Window/UINoteWnd.h b/Source/UI/Window/UINoteWnd.h index a89703bc9..432f22152 100644 --- a/Source/UI/Window/UINoteWnd.h +++ b/Source/UI/Window/UINoteWnd.h @@ -13,9 +13,9 @@ public: this->SetSize(width, height); } void Paint() override; - void Slot25(int x, int y) override; - void Slot31(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnWheel(int delta) override; /* 00B0 */ UIStaticText_LF* m_text; }; @@ -23,7 +23,7 @@ public: class UINoteWnd : public UIFrameWnd { public: UINoteWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UINoticeWnd.h b/Source/UI/Window/UINoticeWnd.h index e914a8bc5..a366b94d7 100644 --- a/Source/UI/Window/UINoticeWnd.h +++ b/Source/UI/Window/UINoticeWnd.h @@ -7,11 +7,11 @@ class UINoticeWnd : public UIFrameWnd { public: UINoticeWnd(); - void Slot15(int width, int height) override; - void Slot18() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; void Paint() override; - void Slot28(int x, int y) override; - void Slot35(int delta) override; + void OnMouseHover(int x, int y) override; + void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void LoadNotice(); diff --git a/Source/UI/Window/UIOpenMailBoxWnd.cpp b/Source/UI/Window/UIOpenMailBoxWnd.cpp index 51be56998..f7e0980cd 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.cpp +++ b/Source/UI/Window/UIOpenMailBoxWnd.cpp @@ -6,12 +6,12 @@ // OFFSET: 0x0094F020 // FUNCTION: fn_12927 -void UIOpenMailBoxWnd::Slot53() { +void UIOpenMailBoxWnd::UpdateMailIcon() { } // OFFSET: 0x0094C410 // FUNCTION: fn_12896 -void UIOpenMailBoxWnd::Slot15(int width, int height) { +void UIOpenMailBoxWnd::OnCreate(int width, int height) { auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\icon_noti_gotmail.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\icon_noti_gotmail.bmp", 1, 0); diff --git a/Source/UI/Window/UIOpenMailBoxWnd.h b/Source/UI/Window/UIOpenMailBoxWnd.h index 22dd3e1c8..07ba93ed3 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.h +++ b/Source/UI/Window/UIOpenMailBoxWnd.h @@ -6,10 +6,10 @@ class UIOpenMailBoxWnd : public UIFrameWnd { public: UIOpenMailBoxWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - virtual void Slot53(); + virtual void UpdateMailIcon(); }; #endif diff --git a/Source/UI/Window/UIOpenRoulletteWnd.cpp b/Source/UI/Window/UIOpenRoulletteWnd.cpp index e05f20fd2..b7fb06cc6 100644 --- a/Source/UI/Window/UIOpenRoulletteWnd.cpp +++ b/Source/UI/Window/UIOpenRoulletteWnd.cpp @@ -17,12 +17,12 @@ struct RouletteOpenPacket { // OFFSET: 0x0094F1C0 // FUNCTION: fn_12933 -void UIOpenRoulletteWnd::Slot19() { +void UIOpenRoulletteWnd::OnProcess() { } // OFFSET: 0x0094C4E0 // FUNCTION: fn_12897 -void UIOpenRoulletteWnd::Slot15(int width, int height) { +void UIOpenRoulletteWnd::OnCreate(int width, int height) { auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\roullette\\RoulletteIcon.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\roullette\\RoulletteIcon.bmp", 1, 0); diff --git a/Source/UI/Window/UIOpenRoulletteWnd.h b/Source/UI/Window/UIOpenRoulletteWnd.h index 448f52049..a0bb6861e 100644 --- a/Source/UI/Window/UIOpenRoulletteWnd.h +++ b/Source/UI/Window/UIOpenRoulletteWnd.h @@ -6,8 +6,8 @@ class UIOpenRoulletteWnd : public UIFrameWnd { public: UIOpenRoulletteWnd(); - void Slot19() override; - void Slot15(int width, int height) override; + void OnProcess() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; }; diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.cpp b/Source/UI/Window/UIPartyBookingHelpWnd.cpp index 6816e417d..c57984af4 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.cpp +++ b/Source/UI/Window/UIPartyBookingHelpWnd.cpp @@ -13,7 +13,7 @@ // OFFSET: 0x00924810 // FUNCTION: fn_12645 -void UIPartyBookingHelpWnd::Slot15(int width, int height) { +void UIPartyBookingHelpWnd::OnCreate(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.h b/Source/UI/Window/UIPartyBookingHelpWnd.h index a769e9cca..24b31af08 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.h +++ b/Source/UI/Window/UIPartyBookingHelpWnd.h @@ -8,7 +8,7 @@ class UITextViewer; class UIPartyBookingHelpWnd : public UIFrameWnd { public: UIPartyBookingHelpWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIPetEvolutionWnd.cpp b/Source/UI/Window/UIPetEvolutionWnd.cpp index f096a8789..72d8870eb 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.cpp +++ b/Source/UI/Window/UIPetEvolutionWnd.cpp @@ -34,7 +34,7 @@ UIPetEvolutionWnd::~UIPetEvolutionWnd() { // OFFSET: 0x009AB170 // FUNCTION: fn_13763 -void UIPetEvolutionWnd::Slot15(int width, int height) { +void UIPetEvolutionWnd::OnCreate(int width, int height) { this->AddCloseButton("", 0); UIBitmapButton* okButton = new UIBitmapButton(); diff --git a/Source/UI/Window/UIPetEvolutionWnd.h b/Source/UI/Window/UIPetEvolutionWnd.h index 81d47c61b..7240d31c6 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.h +++ b/Source/UI/Window/UIPetEvolutionWnd.h @@ -12,7 +12,7 @@ class UIPetEvolutionWnd : public UIFrameWnd { public: UIPetEvolutionWnd(); ~UIPetEvolutionWnd() override; - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() 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 RebuildButtons(); diff --git a/Source/UI/Window/UIPetInfoWnd.h b/Source/UI/Window/UIPetInfoWnd.h index 3c1403bb5..d3ad8803e 100644 --- a/Source/UI/Window/UIPetInfoWnd.h +++ b/Source/UI/Window/UIPetInfoWnd.h @@ -18,8 +18,8 @@ public: UIPetInfoWnd(); ~UIPetInfoWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void UpdateFriendlyGauge(); diff --git a/Source/UI/Window/UIRebirthWnd.cpp b/Source/UI/Window/UIRebirthWnd.cpp index 58db2ed10..2a7d62b59 100644 --- a/Source/UI/Window/UIRebirthWnd.cpp +++ b/Source/UI/Window/UIRebirthWnd.cpp @@ -10,7 +10,7 @@ // OFFSET: 0x00924A60 // FUNCTION: fn_12647 -void UIRebirthWnd::Slot15(int width, int height) { +void UIRebirthWnd::OnCreate(int width, int height) { const std::string path = "유저인터페이스\\"; const char* const names[5][5] = { {"esc_05a", "esc_05b", "esc_05c"}, diff --git a/Source/UI/Window/UIRebirthWnd.h b/Source/UI/Window/UIRebirthWnd.h index 2a7506ac4..8a42b3584 100644 --- a/Source/UI/Window/UIRebirthWnd.h +++ b/Source/UI/Window/UIRebirthWnd.h @@ -6,7 +6,7 @@ class UIRebirthWnd : public UIFrameWnd { public: UIRebirthWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; diff --git a/Source/UI/Window/UIReplayControlWnd.h b/Source/UI/Window/UIReplayControlWnd.h index 643bc7be6..f2d4ca374 100644 --- a/Source/UI/Window/UIReplayControlWnd.h +++ b/Source/UI/Window/UIReplayControlWnd.h @@ -11,8 +11,8 @@ class UIReplayControlWnd : public UIFrameWnd { public: UIReplayControlWnd(); - bool Slot03() override; - void Slot15(int width, int height) override; + bool NeedsFrameRefresh() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIReplayRECControlWnd.h b/Source/UI/Window/UIReplayRECControlWnd.h index c632082b2..7ce960eb5 100644 --- a/Source/UI/Window/UIReplayRECControlWnd.h +++ b/Source/UI/Window/UIReplayRECControlWnd.h @@ -18,9 +18,9 @@ public: UIReplayRECControlWnd(int mode); ~UIReplayRECControlWnd() override; - bool Slot03() override; - void Slot11() override; - void Slot15(int width, int height) override; + bool NeedsFrameRefresh() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void ApplyMode(); diff --git a/Source/UI/Window/UIResizer.cpp b/Source/UI/Window/UIResizer.cpp index 1bd0f25c5..0672f331e 100644 --- a/Source/UI/Window/UIResizer.cpp +++ b/Source/UI/Window/UIResizer.cpp @@ -39,7 +39,7 @@ void UIResizer::Paint() { // OFFSET: 0x0085ECE0 // FUNCTION: fn_10845 -void UIResizer::Slot25(int x, int y) { +void UIResizer::OnLBtnDown(int x, int y) { g_windowMgr.SetCapture(this); this->startX = x; this->startY = y; @@ -53,12 +53,12 @@ void UIResizer::Slot25(int x, int y) { // OFFSET: 0x0085F470 // FUNCTION: fn_10862 -void UIResizer::Slot28(int, int) { +void UIResizer::OnMouseHover(int, int) { } // OFFSET: 0x0085F6D0 // FUNCTION: fn_10869 -void UIResizer::Slot27(int x, int y) { +void UIResizer::OnMouseMove(int x, int y) { if (g_windowMgr.Capture() != this) { return; } @@ -122,13 +122,13 @@ void UIResizer::ResetCursor(int x, int y) { // OFFSET: 0x0085EFD0 // FUNCTION: fn_10853 -void UIResizer::Slot31(int, int) { +void UIResizer::OnLBtnUp(int, int) { if (g_windowMgr.Capture() != this) { return; } if (this->parent) { - this->parent->Slot36(); + this->parent->RefreshSnap(); } g_windowMgr.ReleaseCapture(); diff --git a/Source/UI/Window/UIResizer.h b/Source/UI/Window/UIResizer.h index ac770f750..0e6c3c45b 100644 --- a/Source/UI/Window/UIResizer.h +++ b/Source/UI/Window/UIResizer.h @@ -10,11 +10,11 @@ class UIResizer : public UIWindow { public: UIResizer(); void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot28(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnMouseHover(int x, int y) override; void ResetCursor(int x, int y) override; - void Slot31(int x, int y) override; + void OnLBtnUp(int x, int y) override; void SetDirection(int value); void SetBitmapName(const char* name); void SetColors(std::uint32_t line, std::uint32_t background); diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Window/UIRoMapWnd.cpp index 7cdfe8243..188f43258 100644 --- a/Source/UI/Window/UIRoMapWnd.cpp +++ b/Source/UI/Window/UIRoMapWnd.cpp @@ -37,7 +37,7 @@ CWorldViewMgr g_worldViewMgr; // OFFSET: 0x00931080 // FUNCTION: fn_12697 -void UIRoMapWnd::Slot25(int, int) { +void UIRoMapWnd::OnLBtnDown(int, int) { } __declspec(noinline) void SetRoMapMarker(std::string name, const WorldViewArea& area, RoMapMarker& marker); @@ -99,7 +99,7 @@ void UIRoMapWnd::UpdateNavigationButtons() { // OFFSET: 0x009335B0 // FUNCTION: fn_12725 -void UIRoMapWnd::Slot33(int, int) { +void UIRoMapWnd::OnRBtnUp(int, int) { if (g_windowMgr.unknown_0214 != 0) { g_windowMgr.CloseWindow(26); } @@ -503,7 +503,7 @@ bool UIRoMapWnd::LocateRecord(WorldViewRecord& record) { // OFFSET: 0x00932920 // FUNCTION: fn_12713 -void UIRoMapWnd::Slot27(int x, int y) { +void UIRoMapWnd::OnMouseMove(int x, int y) { if (this == g_windowMgr.Capture()) { return; } @@ -985,7 +985,7 @@ void UIRoMapWnd::DrawWorld() { // OFFSET: 0x00925530 // FUNCTION: fn_12648 -void UIRoMapWnd::Slot15(int, int) { +void UIRoMapWnd::OnCreate(int, int) { this->m_worldCombo = new UIComboBoxDefWnd(); this->m_worldCombo->dropdownHeight = 67; this->m_worldCombo->SetSize(110, this->m_comboHeight); diff --git a/Source/UI/Window/UIRoMapWnd.h b/Source/UI/Window/UIRoMapWnd.h index b02cfcae8..2ecde680d 100644 --- a/Source/UI/Window/UIRoMapWnd.h +++ b/Source/UI/Window/UIRoMapWnd.h @@ -68,11 +68,11 @@ public: UIRoMapWnd(); ~UIRoMapWnd() override; void Paint() override; - void Slot15(int width, int height) override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; - void Slot31(int x, int y) override; - void Slot33(int x, int y) override; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; + void OnLBtnUp(int x, int y) override; + void OnRBtnUp(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 ClearRecords(); void ResetKafraBounds(); diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp index 1cfc9ca85..fbe770dcc 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Window/UIRodexContentsWnd.cpp @@ -102,7 +102,7 @@ void UIRodexContentsWnd::DisableZenyButton() { // OFFSET: 0x008020B0 // FUNCTION: fn_10020 -void UIRodexContentsWnd::Slot15(int, int) { +void UIRodexContentsWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); @@ -203,15 +203,15 @@ void UIRodexContentsWnd::Paint() { // OFFSET: 0x008026E0 // FUNCTION: fn_10022 -void UIRodexContentsWnd::Slot25(int x, int y) { +void UIRodexContentsWnd::OnLBtnDown(int x, int y) { if (y < 17) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); } } // OFFSET: 0x00802700 // FUNCTION: fn_10023 -void UIRodexContentsWnd::Slot28(int x, int y) { +void UIRodexContentsWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->GetItemAtPoint(x, y); if (std::atoi(item.itemId.c_str()) != 0) { int tooltipX = this->m_itemIndex * 34 + 30; @@ -229,7 +229,7 @@ void UIRodexContentsWnd::Slot28(int x, int y) { // OFFSET: 0x00802910 // FUNCTION: fn_10024 -void UIRodexContentsWnd::Slot32(int x, int y) { +void UIRodexContentsWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->GetItemAtPoint(x, y); if (std::atoi(item.itemId.c_str()) != 0) { g_windowMgr.EnsureWindow(12)->SendMsg(nullptr, 24, reinterpret_cast(&item), 0, 0, 0); diff --git a/Source/UI/Window/UIRodexContentsWnd.h b/Source/UI/Window/UIRodexContentsWnd.h index dde9e3e2a..2f63cb241 100644 --- a/Source/UI/Window/UIRodexContentsWnd.h +++ b/Source/UI/Window/UIRodexContentsWnd.h @@ -17,10 +17,10 @@ public: UIRodexContentsWnd(); 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; + void OnCreate(int width, int height) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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); diff --git a/Source/UI/Window/UIRoulletteWnd.cpp b/Source/UI/Window/UIRoulletteWnd.cpp index 915123067..68c175b22 100644 --- a/Source/UI/Window/UIRoulletteWnd.cpp +++ b/Source/UI/Window/UIRoulletteWnd.cpp @@ -103,7 +103,7 @@ ITEM_INFO UIRoulletteWnd::ItemAt(int x, int y) { // OFFSET: 0x0080BD10 // FUNCTION: fn_10086 -void UIRoulletteWnd::Slot15(int, int) { +void UIRoulletteWnd::OnCreate(int, int) { this->AddCloseButton("", 0); auto* startButton = new UIBitmapButton(); @@ -230,12 +230,12 @@ void UIRoulletteWnd::Paint() { // OFFSET: 0x0080C490 // FUNCTION: fn_10088 -void UIRoulletteWnd::Slot25(int, int) { +void UIRoulletteWnd::OnLBtnDown(int, int) { } // OFFSET: 0x0080C4A0 // FUNCTION: fn_10089 -void UIRoulletteWnd::Slot28(int x, int y) { +void UIRoulletteWnd::OnMouseHover(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); int tooltipX = (this->m_column + this->m_row) * 36 + 155; int tooltipY = 330 - this->m_row * 40; @@ -266,7 +266,7 @@ void UIRoulletteWnd::Slot28(int x, int y) { // OFFSET: 0x0080C730 // FUNCTION: fn_10090 -void UIRoulletteWnd::Slot19() { +void UIRoulletteWnd::OnProcess() { if (g_effectDetailLevel != 2) { if (this->m_startButton->geometry.unknown_0030 == 1 && this->m_enabled == 1) { if (g_rouletteMgr->m_spinning == 0) { @@ -337,7 +337,7 @@ void UIRoulletteWnd::Slot19() { // OFFSET: 0x0080CA70 // FUNCTION: fn_10091 -void UIRoulletteWnd::Slot32(int x, int y) { +void UIRoulletteWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (static_cast(y - 143) < 31 && static_cast(x - 186) < 31 && g_rouletteMgr->m_resultShown == 1) { diff --git a/Source/UI/Window/UIRoulletteWnd.h b/Source/UI/Window/UIRoulletteWnd.h index 0c366e426..a6ec9f848 100644 --- a/Source/UI/Window/UIRoulletteWnd.h +++ b/Source/UI/Window/UIRoulletteWnd.h @@ -16,12 +16,12 @@ class UIRoulletteWnd : public UIFrameWnd { public: UIRoulletteWnd(); ~UIRoulletteWnd() override; - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; - void Slot25(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; int CoinType() const; __declspec(noinline) ITEM_INFO ItemAt(int x, int y); diff --git a/Source/UI/Window/UISecondCostumeWnd.cpp b/Source/UI/Window/UISecondCostumeWnd.cpp index 2b94d2dae..74ce32b7a 100644 --- a/Source/UI/Window/UISecondCostumeWnd.cpp +++ b/Source/UI/Window/UISecondCostumeWnd.cpp @@ -157,7 +157,7 @@ void UISecondCostumeWnd::SelectSavedEntries() { // OFFSET: 0x0094C5B0 // FUNCTION: fn_12898 -void UISecondCostumeWnd::Slot15(int width, int height) { +void UISecondCostumeWnd::OnCreate(int width, int height) { this->LoadLists(); this->AddCloseButton("Close", 0); @@ -282,7 +282,7 @@ void UISecondCostumeWnd::RefreshList(int tab) { // OFFSET: 0x0094A410 // FUNCTION: fn_12888 -bool UISecondCostumeWnd::Slot03() { +bool UISecondCostumeWnd::NeedsFrameRefresh() { return true; } diff --git a/Source/UI/Window/UISecondCostumeWnd.h b/Source/UI/Window/UISecondCostumeWnd.h index 2fc4a9e01..4299b6945 100644 --- a/Source/UI/Window/UISecondCostumeWnd.h +++ b/Source/UI/Window/UISecondCostumeWnd.h @@ -19,8 +19,8 @@ struct SecondCostumeEntry { class UISecondCostumeWnd : public UIFrameWnd { public: UISecondCostumeWnd(); - bool Slot03() override; - void Slot15(int width, int height) override; + bool NeedsFrameRefresh() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; __declspec(noinline) void RefreshList(int tab); diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp index 307281530..bb21b2644 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Window/UISeekPartyListWnd.cpp @@ -40,7 +40,7 @@ std::map g_friendRows; // OFFSET: 0x00925D70 // FUNCTION: fn_12649 -void UISeekPartyListWnd::Slot15(int width, int height) { +void UISeekPartyListWnd::OnCreate(int width, int height) { std::string label; { @@ -454,7 +454,7 @@ bool UISeekPartyListWnd::MatchesFilter(PARTY_BOOKING_AD_INFO info) { // OFFSET: 0x00933630 // FUNCTION: fn_12727 -void UISeekPartyListWnd::Slot35(int delta) { +void UISeekPartyListWnd::OnWheel(int delta) { if (this->m_scrollable != 0) { int step = this->m_visibleRows - 1; if (step > 3) { @@ -498,7 +498,7 @@ int UISeekPartyListWnd::HitTestRow(int x, int y) { // OFFSET: 0x00930720 // FUNCTION: fn_12687 -void UISeekPartyListWnd::Slot26(int x, int y) { +void UISeekPartyListWnd::OnLBtnDblClk(int x, int y) { if (y < 0x78) { return; } @@ -515,9 +515,9 @@ void UISeekPartyListWnd::Slot26(int x, int y) { // OFFSET: 0x00931090 // FUNCTION: fn_12698 -void UISeekPartyListWnd::Slot25(int x, int y) { +void UISeekPartyListWnd::OnLBtnDown(int x, int y) { if (y < 0x78) { - UIFrameWnd::Slot25(x, y); + UIFrameWnd::OnLBtnDown(x, y); return; } diff --git a/Source/UI/Window/UISeekPartyListWnd.h b/Source/UI/Window/UISeekPartyListWnd.h index a90a090d6..0e272b7a5 100644 --- a/Source/UI/Window/UISeekPartyListWnd.h +++ b/Source/UI/Window/UISeekPartyListWnd.h @@ -28,12 +28,12 @@ struct SeekPartyMapEntry { class UISeekPartyListWnd : public UIFrameWnd { public: UISeekPartyListWnd(); - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot26(int x, int y) override; - void Slot35(int delta) override; + void OnLBtnDown(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnWheel(int delta) 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 NotifyNewAd(); void UpdateScrollBar(); diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Window/UISeekPartyMBWnd.cpp index f7bd66ac7..621e14c2c 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.cpp +++ b/Source/UI/Window/UISeekPartyMBWnd.cpp @@ -263,7 +263,7 @@ UISeekPartyMBWnd::~UISeekPartyMBWnd() = default; // OFFSET: 0x009273B0 // FUNCTION: fn_12650 -void UISeekPartyMBWnd::Slot15(int width, int height) { +void UISeekPartyMBWnd::OnCreate(int width, int height) { char title[64]; std::memset(title, 0, sizeof(title)); std::sprintf(title, LookupMessage(0x698)); diff --git a/Source/UI/Window/UISeekPartyMBWnd.h b/Source/UI/Window/UISeekPartyMBWnd.h index eafc624f3..1fb7daf4d 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.h +++ b/Source/UI/Window/UISeekPartyMBWnd.h @@ -26,8 +26,8 @@ class UISeekPartyMBWnd : public UIFrameWnd { public: UISeekPartyMBWnd(); ~UISeekPartyMBWnd() override; - void Slot11() override; - void Slot15(int width, int height) override; + void StoreInfo() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void CreateJobChecks(); diff --git a/Source/UI/Window/UISeekPartyWnd.cpp b/Source/UI/Window/UISeekPartyWnd.cpp index 41dc3979d..c61a007d3 100644 --- a/Source/UI/Window/UISeekPartyWnd.cpp +++ b/Source/UI/Window/UISeekPartyWnd.cpp @@ -33,7 +33,7 @@ UISeekPartyWnd::UISeekPartyWnd() : UIFrameWnd(0) { // OFFSET: 0x009281A0 // FUNCTION: fn_12651 -void UISeekPartyWnd::Slot15(int, int) { +void UISeekPartyWnd::OnCreate(int, int) { char text[0x80] = {}; const int minimum = g_session.m_partyBookingLevelLimit; int maximum = g_partyBookingLevelMax; diff --git a/Source/UI/Window/UISeekPartyWnd.h b/Source/UI/Window/UISeekPartyWnd.h index 6f6db2327..c69a8f851 100644 --- a/Source/UI/Window/UISeekPartyWnd.h +++ b/Source/UI/Window/UISeekPartyWnd.h @@ -14,9 +14,9 @@ extern int g_partyBookingLevelMax; class UISeekPartyWnd : public UIFrameWnd { public: UISeekPartyWnd(); - void Slot11() override; - void Slot15(int width, int height) override; - void Slot19() override; + void StoreInfo() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() 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 SetJobs(const std::int16_t* jobs); diff --git a/Source/UI/Window/UISelCharForUServerWnd.cpp b/Source/UI/Window/UISelCharForUServerWnd.cpp index 84daf6cb2..06aa8fdbb 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.cpp +++ b/Source/UI/Window/UISelCharForUServerWnd.cpp @@ -53,7 +53,7 @@ UISelCharForUServerWnd::UISelCharForUServerWnd() // OFFSET: 0x00928A60 // FUNCTION: fn_12652 -void UISelCharForUServerWnd::Slot15(int, int) { +void UISelCharForUServerWnd::OnCreate(int, int) { { std::string path = "유저인터페이스\\"; this->unknown_19E4 = new UIBitmapButton(); @@ -185,9 +185,9 @@ int UISelCharForUServerWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x00932B40 // FUNCTION: fn_12714 -void UISelCharForUServerWnd::Slot27(int x, int y) { +void UISelCharForUServerWnd::OnMouseMove(int x, int y) { this->UpdateCharInfoBalloon(x, y, static_cast(-1)); - UIFrameWnd::Slot27(x, y); + UIFrameWnd::OnMouseMove(x, y); } // OFFSET: 0x0093F1F0 diff --git a/Source/UI/Window/UISelCharForUServerWnd.h b/Source/UI/Window/UISelCharForUServerWnd.h index 636623e11..52f0d8f2f 100644 --- a/Source/UI/Window/UISelCharForUServerWnd.h +++ b/Source/UI/Window/UISelCharForUServerWnd.h @@ -15,9 +15,9 @@ class UICharInfoBalloonText; class UISelCharForUServerWnd : public UIFrameWnd { public: UISelCharForUServerWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) 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 Slot27(int x, int y) override; + void OnMouseMove(int x, int y) override; void Paint() override; void UpdateCharInfoBalloon(int x, int y, std::uint32_t color); diff --git a/Source/UI/Window/UISelectReplayDataWnd.h b/Source/UI/Window/UISelectReplayDataWnd.h index 9f28d540e..4435c659e 100644 --- a/Source/UI/Window/UISelectReplayDataWnd.h +++ b/Source/UI/Window/UISelectReplayDataWnd.h @@ -11,8 +11,8 @@ class UISelectReplayDataWnd : public UIFrameWnd { public: UISelectReplayDataWnd(); - void Slot15(int width, int height) override; - void Slot18() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; bool UpdateInfo(); diff --git a/Source/UI/Window/UISelectServerWnd.h b/Source/UI/Window/UISelectServerWnd.h index 254c7dfbd..45f772a99 100644 --- a/Source/UI/Window/UISelectServerWnd.h +++ b/Source/UI/Window/UISelectServerWnd.h @@ -10,8 +10,8 @@ class UISelectServerWnd : public UIFrameWnd { public: UISelectServerWnd(); - void Slot15(int width, int height) override; - void Slot18() override; + void OnCreate(int width, int height) override; + void OnDestroy() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Window/UISerachStoreInfoWnd.cpp index 3b998d7a1..9fcda7dee 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.cpp +++ b/Source/UI/Window/UISerachStoreInfoWnd.cpp @@ -82,7 +82,7 @@ ITEM_INFO UISerachStoreInfoWnd::ItemAt(int x, int y) { // OFFSET: 0x009296E0 // FUNCTION: fn_12653 -void UISerachStoreInfoWnd::Slot15(int width, int height) { +void UISerachStoreInfoWnd::OnCreate(int width, int height) { UIRadioBtn** radio = this->m_radios; for (int x = 10; x < 90; x += 40) { *radio = new UIRadioBtn(); @@ -188,7 +188,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) { // OFFSET: 0x009331F0 // FUNCTION: fn_12723 -void UISerachStoreInfoWnd::Slot32(int x, int y) { +void UISerachStoreInfoWnd::OnRBtnDown(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (item.itemId.size() != 0 && ((x > 160 && x < 330) || static_cast(x - 6) <= 43)) { g_modeMgr.GetGameMode(); @@ -406,7 +406,7 @@ struct SearchStoreClickPacket { // OFFSET: 0x00930780 // FUNCTION: fn_12688 -void UISerachStoreInfoWnd::Slot26(int x, int y) { +void UISerachStoreInfoWnd::OnLBtnDblClk(int x, int y) { ITEM_INFO item = this->ItemAt(x, y); if (item.itemId.size() == 0 || static_cast(x - 0x33) > 0x6C) { return; diff --git a/Source/UI/Window/UISerachStoreInfoWnd.h b/Source/UI/Window/UISerachStoreInfoWnd.h index de3d55c36..180862009 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.h +++ b/Source/UI/Window/UISerachStoreInfoWnd.h @@ -13,11 +13,11 @@ class UITextButton; class UISerachStoreInfoWnd : public UIFrameWnd { public: UISerachStoreInfoWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot26(int x, int y) override; - void Slot28(int x, int y) override; - void Slot32(int x, int y) override; + void OnLBtnDblClk(int x, int y) override; + void OnMouseHover(int x, int y) override; + void OnRBtnDown(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; __declspec(noinline) ITEM_INFO ItemAt(int x, int y); diff --git a/Source/UI/Window/UIShowWarpWnd.cpp b/Source/UI/Window/UIShowWarpWnd.cpp index ac498788e..decf93a80 100644 --- a/Source/UI/Window/UIShowWarpWnd.cpp +++ b/Source/UI/Window/UIShowWarpWnd.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0094CA20 // FUNCTION: fn_12899 -void UIShowWarpWnd::Slot15(int width, int height) { +void UIShowWarpWnd::OnCreate(int width, int height) { auto* list = new UIListBox(); this->m_list = list; width -= 0x18; diff --git a/Source/UI/Window/UIShowWarpWnd.h b/Source/UI/Window/UIShowWarpWnd.h index e46d2e611..3aa2f6189 100644 --- a/Source/UI/Window/UIShowWarpWnd.h +++ b/Source/UI/Window/UIShowWarpWnd.h @@ -8,7 +8,7 @@ class UIListBox; class UIShowWarpWnd : public UIFrameWnd { public: UIShowWarpWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UITab.cpp b/Source/UI/Window/UITab.cpp index 1b3fb4851..b27b95848 100644 --- a/Source/UI/Window/UITab.cpp +++ b/Source/UI/Window/UITab.cpp @@ -28,7 +28,7 @@ void UITab::Paint() { // OFFSET: 0x0085EE70 // FUNCTION: fn_10851 -void UITab::Slot25(int, int y) { +void UITab::OnLBtnDown(int, int y) { if (!this->parent) { return; } diff --git a/Source/UI/Window/UITab.h b/Source/UI/Window/UITab.h index 772f70325..7274bb291 100644 --- a/Source/UI/Window/UITab.h +++ b/Source/UI/Window/UITab.h @@ -7,7 +7,7 @@ class UITab : public UIWindow { public: UITab(); void Paint() override; - void Slot25(int x, int y) override; + void OnLBtnDown(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; /* 007C */ int tabCount; diff --git a/Source/UI/Window/UITalkboxTrapInputWnd.h b/Source/UI/Window/UITalkboxTrapInputWnd.h index 794818676..51fc13a20 100644 --- a/Source/UI/Window/UITalkboxTrapInputWnd.h +++ b/Source/UI/Window/UITalkboxTrapInputWnd.h @@ -21,7 +21,7 @@ class UITalkboxTrapInputWnd : public UIFrameWnd { public: UITalkboxTrapInputWnd(); - void Slot15(int width, int height) override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/Window/UITransMenuWnd.cpp b/Source/UI/Window/UITransMenuWnd.cpp index 91cca6817..68ceb78e8 100644 --- a/Source/UI/Window/UITransMenuWnd.cpp +++ b/Source/UI/Window/UITransMenuWnd.cpp @@ -26,7 +26,7 @@ void UITransMenuWnd::Paint() { // OFFSET: 0x0094EEC0 // FUNCTION: fn_12921 -void UITransMenuWnd::Slot25(int x, int y) { +void UITransMenuWnd::OnLBtnDown(int x, int y) { if (this->m_selected == -1) { return; } @@ -39,7 +39,7 @@ void UITransMenuWnd::Slot25(int x, int y) { // OFFSET: 0x0094F050 // FUNCTION: fn_12930 -void UITransMenuWnd::Slot27(int x, int y) { +void UITransMenuWnd::OnMouseMove(int x, int y) { const int margin = this->m_margin; const int previous = this->m_selected; int selected = -1; @@ -67,7 +67,7 @@ void UITransMenuWnd::Resize(int width, int height) { // OFFSET: 0x0094CF00 // FUNCTION: fn_12900 -void UITransMenuWnd::Slot15(int width, int height) { +void UITransMenuWnd::OnCreate(int width, int height) { this->unknown_00C0 = this->geometry.x; this->unknown_00C4 = this->geometry.y; this->m_width = this->geometry.width; @@ -79,7 +79,7 @@ void UITransMenuWnd::Slot15(int width, int height) { // OFFSET: 0x00949B70 // FUNCTION: fn_12884 -bool UITransMenuWnd::Slot07(void* output) { +bool UITransMenuWnd::GetTransBoxInfo(void* output) { std::memcpy(output, &this->unknown_00C0, 28); return true; } diff --git a/Source/UI/Window/UITransMenuWnd.h b/Source/UI/Window/UITransMenuWnd.h index baf285a31..7addb9608 100644 --- a/Source/UI/Window/UITransMenuWnd.h +++ b/Source/UI/Window/UITransMenuWnd.h @@ -16,11 +16,11 @@ public: UITransMenuWnd(); void Resize(int width, int height) override; void Move(int x, int y) override; - bool Slot07(void* output) override; - void Slot15(int width, int height) override; + bool GetTransBoxInfo(void* output) override; + void OnCreate(int width, int height) override; void Paint() override; - void Slot25(int x, int y) override; - void Slot27(int x, int y) override; + void OnLBtnDown(int x, int y) override; + void OnMouseMove(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; void ClearItems(); diff --git a/Source/UI/Window/UIVideoWnd.cpp b/Source/UI/Window/UIVideoWnd.cpp index ab579f39e..4b5cdea86 100644 --- a/Source/UI/Window/UIVideoWnd.cpp +++ b/Source/UI/Window/UIVideoWnd.cpp @@ -40,13 +40,13 @@ UIVideoSkipButton::UIVideoSkipButton() : UIButton() { // OFFSET: 0x00AB4380 // FUNCTION: fn_17440 -bool UIVideoWnd::Slot02() { +bool UIVideoWnd::IsFrameWnd() { return true; } // OFFSET: 0x00AB4390 // FUNCTION: fn_17441 -void UIVideoWnd::Slot15(int width, int height) { +void UIVideoWnd::OnCreate(int width, int height) { UIVideoSkipButton* button = new UIVideoSkipButton(); button->SetSize(127, 43); button->Move(width - button->geometry.width - 33, height - button->geometry.height - 110); @@ -85,7 +85,7 @@ void UIVideoWnd::Paint() { // OFFSET: 0x00AB4680 // FUNCTION: fn_17444 -void UIVideoWnd::Slot19() { +void UIVideoWnd::OnProcess() { if (this->m_movie->Update() == true && this->m_movie->CopyTo(this->m_texture) == true) { this->Invalidate(); } diff --git a/Source/UI/Window/UIVideoWnd.h b/Source/UI/Window/UIVideoWnd.h index b0205f807..df19da5c8 100644 --- a/Source/UI/Window/UIVideoWnd.h +++ b/Source/UI/Window/UIVideoWnd.h @@ -20,9 +20,9 @@ class UIVideoWnd : public UIWindow { public: UIVideoWnd(); ~UIVideoWnd() override; - bool Slot02() override; - void Slot15(int width, int height) override; - void Slot19() override; + bool IsFrameWnd() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIViewCameraInfoWnd.cpp b/Source/UI/Window/UIViewCameraInfoWnd.cpp index a9ee83158..f770d9e3a 100644 --- a/Source/UI/Window/UIViewCameraInfoWnd.cpp +++ b/Source/UI/Window/UIViewCameraInfoWnd.cpp @@ -16,13 +16,13 @@ UIViewCameraInfoWnd::UIViewCameraInfoWnd() : UIFrameWnd(0) { // OFFSET: 0x00A78C20 // FUNCTION: fn_16894 -bool UIViewCameraInfoWnd::Slot08() { +bool UIViewCameraInfoWnd::IsTransmitMouseInput() { return true; } // OFFSET: 0x00A78C30 // FUNCTION: fn_16895 -void UIViewCameraInfoWnd::Slot15(int, int) { +void UIViewCameraInfoWnd::OnCreate(int, int) { } // OFFSET: 0x00A78C40 diff --git a/Source/UI/Window/UIViewCameraInfoWnd.h b/Source/UI/Window/UIViewCameraInfoWnd.h index ac5f0ea50..d77276071 100644 --- a/Source/UI/Window/UIViewCameraInfoWnd.h +++ b/Source/UI/Window/UIViewCameraInfoWnd.h @@ -8,8 +8,8 @@ class UIViewCameraInfoWnd : public UIFrameWnd { public: UIViewCameraInfoWnd(); - bool Slot08() override; - void Slot15(int width, int height) override; + bool IsTransmitMouseInput() override; + void OnCreate(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; }; diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 9e9277df5..46200a287 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -163,7 +163,7 @@ UIWindow::UIWindow(unsigned char cached) // OFFSET: 0x00A79E90 // FUNCTION: fn_16917 UIWindow::~UIWindow() { - this->Slot18(); + this->OnDestroy(); delete this->geometry.surface; this->geometry.surface = nullptr; this->DeleteChildren(); @@ -199,13 +199,13 @@ __declspec(noinline) void UIWindow::Resize(int width, int height) { // OFFSET: 0x005C4650 // FUNCTION: fn_03571 -bool UIWindow::Slot02() { +bool UIWindow::IsFrameWnd() { return false; } // OFFSET: 0x005C4670 // FUNCTION: fn_03573 -bool UIWindow::Slot03() { +bool UIWindow::NeedsFrameRefresh() { return false; } @@ -217,25 +217,25 @@ void UIWindow::Move(int x, int y) { // OFFSET: 0x005C3220 // FUNCTION: fn_03553 -bool UIWindow::Slot05() { +bool UIWindow::IsEditable() { return false; } // OFFSET: 0x005C4510 // FUNCTION: fn_03564 -UIWindow* UIWindow::Slot06() { +UIWindow* UIWindow::GetEditWindow() { return this; } // OFFSET: 0x005C45C0 // FUNCTION: fn_03567 -bool UIWindow::Slot07(void*) { +bool UIWindow::GetTransBoxInfo(void*) { return false; } // OFFSET: 0x005C4660 // FUNCTION: fn_03572 -bool UIWindow::Slot08() { +bool UIWindow::IsTransmitMouseInput() { return false; } @@ -247,23 +247,23 @@ bool UIWindow::CanHitTest() { // OFFSET: 0x00A7BB00 // FUNCTION: fn_16933 -void UIWindow::Slot10(int, int, std::intptr_t) { +void UIWindow::DragAndDrop(int, int, std::intptr_t) { g_modeMgr.gameMode->SendMsg(18, 0, 0, 0, 0); } // OFFSET: 0x005CA0F0 // FUNCTION: fn_03640 -void UIWindow::Slot11() { +void UIWindow::StoreInfo() { } // OFFSET: 0x005C7B40 // FUNCTION: fn_03623 -void UIWindow::Slot12() { +void UIWindow::StoreMoveOrigin() { } // OFFSET: 0x005C4680 // FUNCTION: fn_03574 -void UIWindow::Slot13(int, int) { +void UIWindow::MoveFromOrigin(int, int) { } // OFFSET: 0x005C9630 @@ -274,12 +274,12 @@ void UIWindow::Show(int visible) { // OFFSET: 0x005C6070 // FUNCTION: fn_03584 -void UIWindow::Slot15(int, int) { +void UIWindow::OnCreate(int, int) { } // OFFSET: 0x005C6F10 // FUNCTION: fn_03592 -void UIWindow::Slot16() { +void UIWindow::OnInit() { } // OFFSET: 0x005C7340 @@ -290,12 +290,12 @@ void UIWindow::Grow(int width, int height) { // OFFSET: 0x005C6080 // FUNCTION: fn_03585 -void UIWindow::Slot18() { +void UIWindow::OnDestroy() { } // OFFSET: 0x005C72D0 // FUNCTION: fn_03606 -void UIWindow::Slot19() { +void UIWindow::OnProcess() { } // OFFSET: 0x006006C0 @@ -305,47 +305,47 @@ void UIWindow::Paint() { // OFFSET: 0x005C7320 // FUNCTION: fn_03611 -void UIWindow::Slot21() { +void UIWindow::OnRun() { } // OFFSET: 0x005C7330 // FUNCTION: fn_03612 -void UIWindow::Slot22(int, int) { +void UIWindow::OnSize(int, int) { } // OFFSET: 0x005C4C70 // FUNCTION: fn_03578 -void UIWindow::Slot23() { +void UIWindow::OnBeginEdit() { } // OFFSET: 0x005C6F00 // FUNCTION: fn_03591 -void UIWindow::Slot24(int) { +void UIWindow::OnFinishEdit(int) { } // OFFSET: 0x005FDA50 // FUNCTION: fn_04116 -void UIWindow::Slot25(int, int) { +void UIWindow::OnLBtnDown(int, int) { } // OFFSET: 0x005C6F30 // FUNCTION: fn_03594 -void UIWindow::Slot26(int, int) { +void UIWindow::OnLBtnDblClk(int, int) { } // OFFSET: 0x005C7280 // FUNCTION: fn_03602 -void UIWindow::Slot27(int, int) { +void UIWindow::OnMouseMove(int, int) { } // OFFSET: 0x005C7260 // FUNCTION: fn_03600 -void UIWindow::Slot28(int, int) { +void UIWindow::OnMouseHover(int, int) { } // OFFSET: 0x005C7290 // FUNCTION: fn_03603 -void UIWindow::Slot29(int, int) { +void UIWindow::OnMouseCheck(int, int) { } // OFFSET: 0x00A81D60 @@ -356,32 +356,32 @@ void UIWindow::ResetCursor(int, int) { // OFFSET: 0x005C7240 // FUNCTION: fn_03598 -void UIWindow::Slot31(int, int) { +void UIWindow::OnLBtnUp(int, int) { } // OFFSET: 0x005C7300 // FUNCTION: fn_03609 -void UIWindow::Slot32(int, int) { +void UIWindow::OnRBtnDown(int, int) { } // OFFSET: 0x005C7310 // FUNCTION: fn_03610 -void UIWindow::Slot33(int, int) { +void UIWindow::OnRBtnUp(int, int) { } // OFFSET: 0x005C72E0 // FUNCTION: fn_03607 -void UIWindow::Slot34(int, int) { +void UIWindow::OnRBtnDblClk(int, int) { } // OFFSET: 0x005C73A0 // FUNCTION: fn_03615 -void UIWindow::Slot35(int) { +void UIWindow::OnWheel(int) { } // OFFSET: 0x005C7AB0 // FUNCTION: fn_03620 -void UIWindow::Slot36() { +void UIWindow::RefreshSnap() { } // OFFSET: 0x00A83660 @@ -416,7 +416,7 @@ void UIWindow::Invalidate() { // FUNCTION: fn_16984 void UIWindow::InvalidateChildren() { this->m_dirty = 1; - this->Slot39(); + this->OnInvalidate(); for (auto it = this->m_children.begin(); it != this->m_children.end(); ++it) { UIWindow* child = *it; @@ -428,7 +428,7 @@ void UIWindow::InvalidateChildren() { // OFFSET: 0x005C4630 // FUNCTION: fn_03569 -void UIWindow::Slot39() { +void UIWindow::OnInvalidate() { } // OFFSET: 0x00A7D6F0 @@ -512,18 +512,18 @@ bool UIWindow::Update(int redraw) { // OFFSET: 0x005C45B0 // FUNCTION: fn_03566 -bool UIWindow::Slot42(void*) { +bool UIWindow::GetCustomTransBoxInfo(void*) { return false; } // OFFSET: 0x005C33D0 // FUNCTION: fn_03556 -void UIWindow::Slot43() { +void UIWindow::DrawTransBox() { } // OFFSET: 0x005C4480 // FUNCTION: fn_03560 -std::vector UIWindow::Slot44() { +std::vector UIWindow::GetReplayData() { return std::vector(); } @@ -535,18 +535,18 @@ void UIWindow::SetId(int value) { // OFFSET: 0x005C4500 // FUNCTION: fn_03563 -int UIWindow::Slot46() { +int UIWindow::GetWindowType() { return 0; } // OFFSET: 0x005C7250 // FUNCTION: fn_03599 -void UIWindow::Slot47() { +void UIWindow::OnMouseEnter() { } // OFFSET: 0x005C7270 // FUNCTION: fn_03601 -void UIWindow::Slot48() { +void UIWindow::OnMouseLeave() { } // OFFSET: 0x00A7FFB0 @@ -620,7 +620,7 @@ void UIWindow::VisitChildren() { // OFFSET: 0x005C7AC0 // FUNCTION: fn_03621 -void UIWindow::Slot52(int) { +void UIWindow::ApplySkin(int) { } // OFFSET: 0x00A7A080 @@ -709,9 +709,9 @@ UIWindow* UIWindow::Root() { // FUNCTION: fn_16960 UIWindow* UIWindow::NextFocusable(UIWindow* child) { for (auto it = this->m_children.begin(); it != this->m_children.end(); ++it) { - if (*it == child && (*it)->Slot05()) { + if (*it == child && (*it)->IsEditable()) { for (++it; it != this->m_children.end(); ++it) { - if ((*it)->Slot05()) { + if ((*it)->IsEditable()) { return *it; } } @@ -728,10 +728,10 @@ UIWindow* UIWindow::NextFocusable(UIWindow* child) { UIWindow* UIWindow::PreviousFocusable(UIWindow* child) { for (auto it = this->m_children.end(); it != this->m_children.begin(); --it) { UIWindow* window = *std::prev(it); - if (window == child && window->Slot05()) { + if (window == child && window->IsEditable()) { for (--it; it != this->m_children.begin(); --it) { UIWindow* previous = *std::prev(it); - if (previous->Slot05()) { + if (previous->IsEditable()) { return previous; } } @@ -831,9 +831,9 @@ __declspec(noinline) void UIWindow::SetSize(int width, int height) { this->geometry.width = width; this->geometry.height = height; this->Invalidate(); - this->Slot15(width, height); - this->Slot22(width, height); - this->Slot16(); + this->OnCreate(width, height); + this->OnSize(width, height); + this->OnInit(); } // INLINED @@ -1754,7 +1754,7 @@ int UIWindow::RestoreEditTexts(const unsigned char* data) { std::memset(text, 0, sizeof(text)); for (UIWindow* child : this->m_children) { - if (child->Slot46() != 2) { + if (child->GetWindowType() != 2) { continue; } @@ -1881,12 +1881,12 @@ void UIListBox_NaviSearch::Clear() { // OFFSET: 0x005C6F20 // FUNCTION: fn_03593 -void UIListBox_NaviSearch::Slot26(int, int) { +void UIListBox_NaviSearch::OnLBtnDblClk(int, int) { } // OFFSET: 0x005C6F40 // FUNCTION: fn_03595 -void UIListBox_NaviSearch::Slot25(int x, int y) { +void UIListBox_NaviSearch::OnLBtnDown(int x, int y) { this->selected = this->LineAt(x, y); if (this->selected != -1) { this->parent->SendMsg(this, 6, this->geometry.id, this->selected, 0, 0); @@ -1897,7 +1897,7 @@ void UIListBox_NaviSearch::Slot25(int x, int y) { // OFFSET: 0x005C7360 // FUNCTION: fn_03614 -void UIListBox_NaviSearch::Slot35(int value) { +void UIListBox_NaviSearch::OnWheel(int value) { if (this->verticalOverflow != 0) { if (value < 0) { this->SendMsg(this->verticalBar, 7, 6, 0, 0, 0); @@ -2008,7 +2008,7 @@ void UINavigationV4Wnd::LayoutWithDetails() { // OFFSET: 0x005CA060 // FUNCTION: fn_03639 -void UINavigationV4Wnd::Slot11() { +void UINavigationV4Wnd::StoreInfo() { NavigationWindowInfo* info = this->info; if (!info) { return; @@ -2041,7 +2041,7 @@ void UINavigationV4Wnd::Slot11() { // OFFSET: 0x005C7140 // FUNCTION: fn_03597 -void UINavigationroadiconWnd::Slot31(int x, int y) { +void UINavigationroadiconWnd::OnLBtnUp(int x, int y) { int slot = 0; if (y >= 25 && y <= 55) { if (x >= 11 && x <= 41) { @@ -2077,7 +2077,7 @@ void UINavigationroadiconWnd::Slot31(int x, int y) { } this->Invalidate(); - UIFrameWnd::Slot31(x, y); + UIFrameWnd::OnLBtnUp(x, y); } // OFFSET: 0x005C6CC0 @@ -2109,7 +2109,7 @@ void UIPrivateAirplaneWnd::Paint() { // OFFSET: 0x005C72A0 // FUNCTION: fn_03604 -void UINavigationV4Wnd::Slot19() { +void UINavigationV4Wnd::OnProcess() { if (g_navigationManager.unknown_125C == 2) { this->Invalidate(); } @@ -2117,7 +2117,7 @@ void UINavigationV4Wnd::Slot19() { // OFFSET: 0x005C72C0 // FUNCTION: fn_03605 -void UIPrivateAirplaneWnd::Slot19() { +void UIPrivateAirplaneWnd::OnProcess() { } #pragma pack(push, 1) @@ -2146,7 +2146,7 @@ int UIWindow::RecordEditTexts() { int count = 0; for (UIWindow* child : this->m_children) { - if (child->Slot46() == 2) { + if (child->GetWindowType() == 2) { ++count; } } @@ -2158,7 +2158,7 @@ int UIWindow::RecordEditTexts() { } for (UIWindow* child : this->m_children) { - if (child->Slot46() != 2) { + if (child->GetWindowType() != 2) { continue; } @@ -2181,7 +2181,7 @@ int UIWindow::RecordEditTexts() { // OFFSET: 0x005C4C80 // FUNCTION: fn_03579 -void UIListBox_NaviSearch::Slot15(int width, int height) { +void UIListBox_NaviSearch::OnCreate(int width, int height) { this->verticalBar = new UIScrollBar_Navi(); this->verticalBar->Configure(width - 7, 0, 1, height); this->AddChild(this->verticalBar); @@ -2243,7 +2243,7 @@ void UIListBox_NaviSearch::Paint() { // OFFSET: 0x005C4EA0 // FUNCTION: fn_03581 -void UINavigationV4Wnd::Slot15(int, int) { +void UINavigationV4Wnd::OnCreate(int, int) { UIBitmapButton* closeButton = new UIBitmapButton(); this->unknown_00B8 = closeButton; closeButton->SetBitmap("유저인터페이스\\navigation_interface3\\btn_close_normal.bmp", 0, 0); @@ -2427,7 +2427,7 @@ void UINavigationV4Wnd::Slot15(int, int) { } // OFFSET: 0x005C5D40 // FUNCTION: fn_03582 -void UINavigationroadiconWnd::Slot15(int, int) { +void UINavigationroadiconWnd::OnCreate(int, int) { this->AddCloseButton(LookupMessage(3045), 0); this->icon = new UIStaticBitmap(); @@ -2905,7 +2905,7 @@ int UINavigationroadiconWnd::SendMsg(UIWindow*, int message, std::intptr_t a, st // OFFSET: 0x005C4D70 // FUNCTION: fn_03580 -void UINavigationRuideWnd::Slot15(int width, int) { +void UINavigationRuideWnd::OnCreate(int width, int) { this->AddCloseButton(LookupMessage(3045), 0); this->routeList = new UIListBox_NaviSearch(); this->routeList->SetSize(width - 4, 293); @@ -3297,8 +3297,8 @@ void UIWindow::DrawActionSprite( // OFFSET: 0x005C6F90 // FUNCTION: fn_03596 -void UINavigationV4Wnd::Slot31(int x, int y) { - UIFrameWnd::Slot31(x, y); +void UINavigationV4Wnd::OnLBtnUp(int x, int y) { + UIFrameWnd::OnLBtnUp(x, y); if (!g_navigationManager.unknown_1254) { const int mapY = y - 46; @@ -3539,7 +3539,7 @@ void UINavigationV4Wnd::SetRoadIcon(int slot) { // OFFSET: 0x005C5E50 // FUNCTION: fn_03583 -void UIPrivateAirplaneWnd::Slot15(int, int) { +void UIPrivateAirplaneWnd::OnCreate(int, int) { this->AddBaseButton(); this->AddCloseButton("", 0); diff --git a/Source/UI/Window/UIWindow.h b/Source/UI/Window/UIWindow.h index 7aec42add..caae0cce1 100644 --- a/Source/UI/Window/UIWindow.h +++ b/Source/UI/Window/UIWindow.h @@ -42,57 +42,57 @@ public: explicit UIWindow(unsigned char cached); ~UIWindow() override; virtual void Resize(int width, int height); - virtual bool Slot02(); - virtual bool Slot03(); + virtual bool IsFrameWnd(); + virtual bool NeedsFrameRefresh(); virtual void Move(int x, int y); - virtual bool Slot05(); - virtual UIWindow* Slot06(); - virtual bool Slot07(void* output); - virtual bool Slot08(); + virtual bool IsEditable(); + virtual UIWindow* GetEditWindow(); + virtual bool GetTransBoxInfo(void* output); + virtual bool IsTransmitMouseInput(); virtual bool CanHitTest(); - virtual void Slot10(int argument1, int argument2, std::intptr_t argument3); - virtual void Slot11(); - virtual void Slot12(); - virtual void Slot13(int argument1, int argument2); + virtual void DragAndDrop(int argument1, int argument2, std::intptr_t argument3); + virtual void StoreInfo(); + virtual void StoreMoveOrigin(); + virtual void MoveFromOrigin(int argument1, int argument2); virtual void Show(int visible); - virtual void Slot15(int width, int height); - virtual void Slot16(); + virtual void OnCreate(int width, int height); + virtual void OnInit(); virtual void Grow(int width, int height); - virtual void Slot18(); - virtual void Slot19(); + virtual void OnDestroy(); + virtual void OnProcess(); virtual void Paint(); - virtual void Slot21(); - virtual void Slot22(int width, int height); - virtual void Slot23(); - virtual void Slot24(int argument); - virtual void Slot25(int argument1, int argument2); - virtual void Slot26(int argument1, int argument2); - virtual void Slot27(int argument1, int argument2); - virtual void Slot28(int argument1, int argument2); - virtual void Slot29(int argument1, int argument2); + virtual void OnRun(); + virtual void OnSize(int width, int height); + virtual void OnBeginEdit(); + virtual void OnFinishEdit(int argument); + virtual void OnLBtnDown(int argument1, int argument2); + virtual void OnLBtnDblClk(int argument1, int argument2); + virtual void OnMouseMove(int argument1, int argument2); + virtual void OnMouseHover(int argument1, int argument2); + virtual void OnMouseCheck(int argument1, int argument2); virtual void ResetCursor(int argument1, int argument2); - virtual void Slot31(int argument1, int argument2); - virtual void Slot32(int argument1, int argument2); - virtual void Slot33(int argument1, int argument2); - virtual void Slot34(int argument1, int argument2); - virtual void Slot35(int argument); - virtual void Slot36(); + virtual void OnLBtnUp(int argument1, int argument2); + virtual void OnRBtnDown(int argument1, int argument2); + virtual void OnRBtnUp(int argument1, int argument2); + virtual void OnRBtnDblClk(int argument1, int argument2); + virtual void OnWheel(int argument); + virtual void RefreshSnap(); virtual int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4); virtual void Invalidate(); - virtual void Slot39(); + virtual void OnInvalidate(); virtual std::uint32_t Color(); virtual bool Update(int redraw); - virtual bool Slot42(void* output); - virtual void Slot43(); - virtual std::vector Slot44(); + virtual bool GetCustomTransBoxInfo(void* output); + virtual void DrawTransBox(); + virtual std::vector GetReplayData(); virtual void SetId(int value); - virtual int Slot46(); - virtual void Slot47(); - virtual void Slot48(); + virtual int GetWindowType(); + virtual void OnMouseEnter(); + virtual void OnMouseLeave(); virtual RenderPrimitive* DrawPrimitive(); virtual UIWindow* HitTest(int x, int y); virtual void VisitChildren(); - virtual void Slot52(int argument); + virtual void ApplySkin(int argument); void AddChild(UIWindow* child); void AddChildFront(UIWindow* child); diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index 384592e56..63ad7f0db 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -341,12 +341,12 @@ void UIWindowMgr::DrawWindows() { window->Update(0); g_renderDiagnosticLine = 3815; g_renderDiagnosticFile = g_windowManagerDiagnosticFile; - if (window->Slot07(&rectangle) == true) { + if (window->GetTransBoxInfo(&rectangle) == true) { DrawAlphaRectangle(rectangle.x, rectangle.y, rectangle.width, rectangle.height, rectangle.color); g_renderDiagnosticLine = 3823; g_renderDiagnosticFile = g_windowManagerDiagnosticFile; - } else if (window->Slot42(&rectangle) == true) { - window->Slot43(); + } else if (window->GetCustomTransBoxInfo(&rectangle) == true) { + window->DrawTransBox(); g_renderDiagnosticLine = 3829; g_renderDiagnosticFile = g_windowManagerDiagnosticFile; } @@ -948,7 +948,7 @@ void UIWindowMgr::Shutdown() { if (this->persistentWindows.find(window) != this->persistentWindows.end()) { this->persistentWindows.erase(window); } - window->Slot11(); + window->StoreInfo(); delete window; window = nullptr; } @@ -1035,7 +1035,7 @@ void UIWindowMgr::ClearMapWindows() { } this->persistentWindows.erase(window); - window->Slot11(); + window->StoreInfo(); delete window; entry = this->rendered.erase(entry); } @@ -1959,7 +1959,7 @@ __declspec(noinline) void UIWindowMgr::BroadcastMessage21() { } for (auto it = this->rendered.begin(); it != this->rendered.end(); ++it) { - if ((*it)->Slot02()) { + if ((*it)->IsFrameWnd()) { (*it)->SendMsg(nullptr, 21, 0, 0, 0, 0); } } @@ -2136,7 +2136,7 @@ std::vector UIWindowMgr::SaveReplayWindows() { for (UIWindow* window : this->rendered) { const unsigned id = static_cast(window->geometry.id); if (id <= 10040 && this->policy[id].actions[7]) { - std::vector state = window->Slot44(); + std::vector state = window->GetReplayData(); std::vector chunk = MakeReplayChunk(window->geometry.id + 20100, state); data.insert(data.end(), chunk.begin(), chunk.end()); } @@ -2246,7 +2246,7 @@ bool UIWindowMgr::ProcessEnterKey() { window = this->window_01C8; } else { for (auto it = this->rendered.begin(); it != this->rendered.end(); ++it) { - if (!(*it)->Slot02()) { + if (!(*it)->IsFrameWnd()) { continue; } if (g_replayAnimationScaling == 0) { @@ -3174,7 +3174,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 69: if (this->window_02C8) { - this->window_02C8->Slot11(); + this->window_02C8->StoreInfo(); } closed = this->CloseWindow(34); g_windowMgr.DismissTransient(); @@ -3257,7 +3257,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 212: if (this->unknown_0430) { - this->unknown_0430->Slot11(); + this->unknown_0430->StoreInfo(); this->Schedule(this->unknown_0430); this->unknown_0430 = nullptr; closed = true; @@ -3301,7 +3301,7 @@ bool UIWindowMgr::CloseWindow(int id) { } case 61: if (this->window_0324) { - this->window_0324->Slot11(); + this->window_0324->StoreInfo(); this->Schedule(this->window_0324); this->window_0324 = nullptr; closed = true; @@ -3309,7 +3309,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 62: if (this->unknown_0328) { - this->unknown_0328->Slot11(); + this->unknown_0328->StoreInfo(); this->Schedule(this->unknown_0328); this->unknown_0328 = nullptr; closed = true; @@ -3317,7 +3317,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 63: if (this->window_032C) { - this->window_032C->Slot11(); + this->window_032C->StoreInfo(); this->Schedule(this->window_032C); this->window_032C = nullptr; closed = true; @@ -3325,7 +3325,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 64: if (this->unknown_0330) { - this->unknown_0330->Slot11(); + this->unknown_0330->StoreInfo(); this->Schedule(this->unknown_0330); this->unknown_0330 = nullptr; closed = true; @@ -3333,7 +3333,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 65: if (this->unknown_0334) { - this->unknown_0334->Slot11(); + this->unknown_0334->StoreInfo(); this->Schedule(this->unknown_0334); this->unknown_0334 = nullptr; closed = true; @@ -3341,7 +3341,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 66: if (this->unknown_0338) { - this->unknown_0338->Slot11(); + this->unknown_0338->StoreInfo(); this->Schedule(this->unknown_0338); this->unknown_0338 = nullptr; closed = true; @@ -3349,7 +3349,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 60: if (this->window_0320) { - this->window_0320->Slot11(); + this->window_0320->StoreInfo(); this->Schedule(this->window_0320); this->window_0320 = nullptr; closed = true; @@ -3698,7 +3698,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 130: if (this->unknown_03E4) { - reinterpret_cast(this->unknown_03E4)->Slot11(); + reinterpret_cast(this->unknown_03E4)->StoreInfo(); this->Schedule(reinterpret_cast(this->unknown_03E4)); this->unknown_03E4 = 0; closed = true; @@ -3706,7 +3706,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 131: if (this->unknown_03E8) { - reinterpret_cast(this->unknown_03E8)->Slot11(); + reinterpret_cast(this->unknown_03E8)->StoreInfo(); this->Schedule(reinterpret_cast(this->unknown_03E8)); this->unknown_03E8 = 0; closed = true; @@ -3909,7 +3909,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 237: if (this->window_0444) { - this->window_0444->Slot11(); + this->window_0444->StoreInfo(); this->Schedule(this->window_0444); this->window_0444 = nullptr; closed = true; @@ -4089,7 +4089,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 324: if (this->window_4F274) { - this->window_4F274->Slot11(); + this->window_4F274->StoreInfo(); this->Schedule(this->window_4F274); this->window_4F274 = nullptr; closed = true; @@ -4097,7 +4097,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 323: if (this->window_4F270) { - this->window_4F270->Slot11(); + this->window_4F270->StoreInfo(); this->Schedule(this->window_4F270); this->window_4F270 = nullptr; closed = true; @@ -4112,7 +4112,7 @@ bool UIWindowMgr::CloseWindow(int id) { break; case 345: if (this->window_4F27C) { - this->window_4F27C->Slot11(); + this->window_4F27C->StoreInfo(); this->Schedule(this->window_4F27C); this->window_4F27C = nullptr; closed = true; diff --git a/Source/UI/Window/UIWordDisplayWnd.cpp b/Source/UI/Window/UIWordDisplayWnd.cpp index 3d8e6f559..45f435d7e 100644 --- a/Source/UI/Window/UIWordDisplayWnd.cpp +++ b/Source/UI/Window/UIWordDisplayWnd.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0085B000 // FUNCTION: fn_10791 -void UIWordDisplayWnd::Slot15(int, int) { +void UIWordDisplayWnd::OnCreate(int, int) { } // OFFSET: 0x0085E370 @@ -22,7 +22,7 @@ void UIWordDisplayWnd::Paint() { // OFFSET: 0x0085FD30 // FUNCTION: fn_10885 -void UIWordDisplayWnd::Slot19() { +void UIWordDisplayWnd::OnProcess() { CRenderObject* actor = g_session.FindGameActor(this->aid); if (this->aid == g_session.m_aid) { actor = static_cast(g_modeMgr.GetGameMode())->scene->player; diff --git a/Source/UI/Window/UIWordDisplayWnd.h b/Source/UI/Window/UIWordDisplayWnd.h index 0a5298429..55141e98b 100644 --- a/Source/UI/Window/UIWordDisplayWnd.h +++ b/Source/UI/Window/UIWordDisplayWnd.h @@ -9,8 +9,8 @@ class UIWordDisplayWnd : public UIFrameWnd { public: UIWordDisplayWnd(); - void Slot15(int width, int height) override; - void Slot19() override; + void OnCreate(int width, int height) override; + void OnProcess() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Window/UIZeroChatWnd.cpp b/Source/UI/Window/UIZeroChatWnd.cpp index 727f8ac10..4e1190651 100644 --- a/Source/UI/Window/UIZeroChatWnd.cpp +++ b/Source/UI/Window/UIZeroChatWnd.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0094B410 // FUNCTION: fn_12891 -void UIBalloonOpenBtn::Slot15(int width, int height) { +void UIBalloonOpenBtn::OnCreate(int width, int height) { this->m_button = new UIBitmapButton(); this->m_button->SetBitmap("유저인터페이스\\basic_interface\\combo_btn_a.bmp", 0, 0); this->m_button->SetBitmap("유저인터페이스\\basic_interface\\combo_btn_b.bmp", 1, 0); @@ -24,7 +24,7 @@ void UIBalloonOpenBtn::Slot15(int width, int height) { // OFFSET: 0x0094B500 // FUNCTION: fn_12892 -void UIDebuffRemoveWnd::Slot15(int width, int height) { +void UIDebuffRemoveWnd::OnCreate(int width, int height) { this->m_button = new UIBasicButton(); this->m_button->Configure(0x96, LookupMessage(0x10E6)); this->m_button->Move(0xF, 0x16); @@ -34,7 +34,7 @@ void UIDebuffRemoveWnd::Slot15(int width, int height) { // OFFSET: 0x0094B5C0 // FUNCTION: fn_12893 -void UIGuild_Storage_Log::Slot15(int width, int height) { +void UIGuild_Storage_Log::OnCreate(int width, int height) { const int ids[3] = {246, 218, 184}; const char* const bitmaps[3][3] = { {"stickon", "stickon_a", "stickon_b"}, diff --git a/Source/UI/Window/WindowDialogs.cpp b/Source/UI/Window/WindowDialogs.cpp index 01711fab4..dd86fdcb1 100644 --- a/Source/UI/Window/WindowDialogs.cpp +++ b/Source/UI/Window/WindowDialogs.cpp @@ -124,18 +124,18 @@ void UIWindowMgr::RestoreInput() { for (std::list::iterator childIt = window->m_children.begin(); childIt != window->m_children.end(); ++childIt) { UIWindow* child = *childIt; - if (!child->Slot05() || child->geometry.x <= 0 || child->geometry.y <= 0) { + if (!child->IsEditable() || child->geometry.x <= 0 || child->geometry.y <= 0) { continue; } if (this->hoverWindow) { - this->hoverWindow->Slot24(child->Slot06() == this->hoverWindow); + this->hoverWindow->OnFinishEdit(child->GetEditWindow() == this->hoverWindow); } - this->hoverWindow = child->Slot06(); + this->hoverWindow = child->GetEditWindow(); if (this->hoverWindow) { - this->hoverWindow->Slot23(); + this->hoverWindow->OnBeginEdit(); } return; @@ -178,7 +178,7 @@ int UIWindowMgr::Confirm( this->inputWindow = nullptr; if (this->hoverWindow) { - this->hoverWindow->Slot24(0); + this->hoverWindow->OnFinishEdit(0); } this->hoverWindow = nullptr; @@ -266,7 +266,7 @@ void UIWindowMgr::AddMessageBox( this->inputWindow = nullptr; if (this->hoverWindow) { - this->hoverWindow->Slot24(0); + this->hoverWindow->OnFinishEdit(0); } this->hoverWindow = nullptr; @@ -286,7 +286,7 @@ int UIWindowMgr::RunModal(UIWindow* window) { this->inputWindow = nullptr; if (this->hoverWindow) { - this->hoverWindow->Slot24(0); + this->hoverWindow->OnFinishEdit(0); } this->hoverWindow = nullptr; diff --git a/Source/UI/Window/WindowFrameUpdate.cpp b/Source/UI/Window/WindowFrameUpdate.cpp index 042f614c5..205a59614 100644 --- a/Source/UI/Window/WindowFrameUpdate.cpp +++ b/Source/UI/Window/WindowFrameUpdate.cpp @@ -6,7 +6,7 @@ // FUNCTION: fn_17215 void UIWindowMgr::UpdateFrameWindows() { for (auto window = this->rendered.begin(); window != this->rendered.end(); ++window) { - (*window)->Slot19(); + (*window)->OnProcess(); } for (auto browser = this->browsers.begin(); browser != this->browsers.end();) { @@ -22,6 +22,6 @@ void UIWindowMgr::UpdateFrameWindows() { } for (auto window = this->overlays.begin(); window != this->overlays.end(); ++window) { - window->second->Slot19(); + window->second->OnProcess(); } } diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp index 4cc0e745f..959bde7b1 100644 --- a/Source/UI/Window/WindowMgrState.cpp +++ b/Source/UI/Window/WindowMgrState.cpp @@ -48,7 +48,7 @@ const char* g_shortcutItemKeySuffix = "\\ShortcutItem"; // FUNCTION: fn_17156 void UIWindowMgr::NotifyHoverWindow() { if (this->hoverWindow) { - this->hoverWindow->Slot24(0); + this->hoverWindow->OnFinishEdit(0); } } @@ -575,7 +575,7 @@ void UIWindowMgr::ConfirmActiveDialog() { } for (auto entry = this->rendered.begin(); entry != this->rendered.end(); ++entry) { - if ((*entry)->Slot02()) { + if ((*entry)->IsFrameWnd()) { (*entry)->SendMsg(nullptr, 18, 0, 0, 0, 0); } } @@ -1095,7 +1095,7 @@ bool UIWindowMgr::DropAt(int x, int y, ModeDragState* drag) { window->RecordDrop(localX, localY, *drag, -1); drag->unknown_038C = reinterpret_cast(window); if (this->window_01EC != window->Root()) { - window->Slot10(localX, localY, reinterpret_cast(drag)); + window->DragAndDrop(localX, localY, reinterpret_cast(drag)); } return true; @@ -1110,13 +1110,13 @@ void UIWindowMgr::FocusWindow01C8Edit() { UIWindow* edit = *reinterpret_cast(reinterpret_cast(this->window_01C8) + 0xBC); if (this->hoverWindow) { - this->hoverWindow->Slot24(!edit ? false : edit->Slot06() == this->hoverWindow); + this->hoverWindow->OnFinishEdit(!edit ? false : edit->GetEditWindow() == this->hoverWindow); } if (edit) { - this->hoverWindow = edit->Slot06(); + this->hoverWindow = edit->GetEditWindow(); if (this->hoverWindow) { - this->hoverWindow->Slot23(); + this->hoverWindow->OnBeginEdit(); } } else { this->hoverWindow = nullptr; diff --git a/Source/UI/Window/WindowMouseHit.cpp b/Source/UI/Window/WindowMouseHit.cpp index c3e177853..e052b6126 100644 --- a/Source/UI/Window/WindowMouseHit.cpp +++ b/Source/UI/Window/WindowMouseHit.cpp @@ -117,10 +117,10 @@ __declspec(noinline) UIWindow* UIWindowMgr::HitTestWindows(int x, int y) { this->previousHitUid = this->currentHitUid; this->currentHitUid = hit->Uid(); if (this->previousHitUid != this->currentHitUid) { - hit->Slot47(); + hit->OnMouseEnter(); if (UIWindow* old = this->FindRenderedUid(this->previousHitUid)) { - old->Slot48(); + old->OnMouseLeave(); } } @@ -139,7 +139,7 @@ __declspec(noinline) UIWindow* UIWindowMgr::HitTestWindows(int x, int y) { this->currentHitUid = 0; if (this->previousHitUid != 0) { if (UIWindow* old = this->FindRenderedUid(this->previousHitUid)) { - old->Slot48(); + old->OnMouseLeave(); } } @@ -225,31 +225,31 @@ int UIWindowMgr::ProcessMouse() { if (g_mouse.buttons[0] == 1) { UIWindow* root = this->inputWindow->Root(); - if (root && root->Slot02()) { + if (root && root->IsFrameWnd()) { PromoteWindow(this, root); } - this->inputWindow->Slot25(localX, localY); + this->inputWindow->OnLBtnDown(localX, localY); } if (g_mouse.buttons[0] == 4 && (g_replayAnimationScaling == 0 || g_modeMgr.state == 0)) { - this->inputWindow->Slot25(localX, localY); - this->inputWindow->Slot26(localX, localY); + this->inputWindow->OnLBtnDown(localX, localY); + this->inputWindow->OnLBtnDblClk(localX, localY); } this->inputWindow->ResetCursor(localX, localY); if (this->unknown_046C == x && this->unknown_0470 == y) { - this->inputWindow->Slot28(localX, localY); + this->inputWindow->OnMouseHover(localX, localY); } else { - this->inputWindow->Slot27(localX, localY); + this->inputWindow->OnMouseMove(localX, localY); } if (g_mouse.wheel != 0) { - this->inputWindow->Slot35(g_mouse.wheel); + this->inputWindow->OnWheel(g_mouse.wheel); } if (g_mouse.buttons[0] == 3) { - this->inputWindow->Slot31(localX, localY); + this->inputWindow->OnLBtnUp(localX, localY); } } else { UIWindow* window = this->HitTestWindows(x, y); @@ -266,7 +266,7 @@ int UIWindowMgr::ProcessMouse() { } if (window) { - handled = window->Slot08() ? 2 : 1; + handled = window->IsTransmitMouseInput() ? 2 : 1; int left; int top; WindowScreenPosition(window, left, top); @@ -274,16 +274,16 @@ int UIWindowMgr::ProcessMouse() { const int localY = y - top; if (g_mouse.buttons[0] == 4 && (g_replayAnimationScaling == 0 || g_modeMgr.state == 0)) { - window->Slot26(localX, localY); + window->OnLBtnDblClk(localX, localY); } if (g_mouse.buttons[1] == 4) { - window->Slot34(localX, localY); + window->OnRBtnDblClk(localX, localY); } if (g_mouse.buttons[0] == 1) { UIWindow* root = window->Root(); - if (root && root->Slot02()) { + if (root && root->IsFrameWnd()) { PromoteWindow(this, root); } @@ -292,35 +292,35 @@ int UIWindowMgr::ProcessMouse() { this->CloseDropDown(); } - window->Slot25(localX, localY); + window->OnLBtnDown(localX, localY); } if (g_mouse.buttons[1] == 1) { UIWindow* root = window->Root(); - if (root && root->Slot02()) { + if (root && root->IsFrameWnd()) { PromoteWindow(this, root); } - window->Slot32(localX, localY); + window->OnRBtnDown(localX, localY); } window->ResetCursor(localX, localY); if (this->unknown_046C == x && this->unknown_0470 == y) { - window->Slot28(localX, localY); + window->OnMouseHover(localX, localY); } else { - window->Slot27(localX, localY); + window->OnMouseMove(localX, localY); } if (g_mouse.wheel != 0) { - window->Slot35(g_mouse.wheel); + window->OnWheel(g_mouse.wheel); } if (g_mouse.buttons[1] == 3) { - window->Slot33(localX, localY); + window->OnRBtnUp(localX, localY); } if (g_mouse.buttons[0] == 3) { - window->Slot31(localX, localY); + window->OnLBtnUp(localX, localY); } } @@ -368,7 +368,7 @@ int UIWindowMgr::ProcessMouse() { int left = 0; int top = 0; this->window_01B8->ToScreen(left, top); - this->window_01B8->Slot27(x - left, y - top); + this->window_01B8->OnMouseMove(x - left, y - top); this->window_01B8->ResetCursor(x - left, y - top); } @@ -399,7 +399,7 @@ int UIWindowMgr::ProcessMouse() { } for (auto entry = this->rendered.rbegin(); entry != this->rendered.rend(); ++entry) { - (*entry)->Slot29(x, y); + (*entry)->OnMouseCheck(x, y); } return handled; diff --git a/Source/UI/Window/WindowOrdering.cpp b/Source/UI/Window/WindowOrdering.cpp index 12f219a4b..ead6db505 100644 --- a/Source/UI/Window/WindowOrdering.cpp +++ b/Source/UI/Window/WindowOrdering.cpp @@ -145,7 +145,7 @@ void UIWindowMgr::InvalidateFrames() { this->unknown_04FC = 1; for (auto it = this->rendered.begin(); it != this->rendered.end(); ++it) { - if ((*it)->Slot03()) { + if ((*it)->NeedsFrameRefresh()) { (*it)->InvalidateChildren(); } } diff --git a/Source/UI/Window/WindowRetirement.cpp b/Source/UI/Window/WindowRetirement.cpp index 13982ed6b..43cdfa092 100644 --- a/Source/UI/Window/WindowRetirement.cpp +++ b/Source/UI/Window/WindowRetirement.cpp @@ -50,7 +50,7 @@ void UIWindowMgr::Destroy(UIWindow* window) { } g_snapMgr.Remove(*rendered); - (*rendered)->Slot11(); + (*rendered)->StoreInfo(); delete *rendered; this->rendered.erase(rendered); @@ -62,7 +62,7 @@ void UIWindowMgr::Destroy(UIWindow* window) { continue; } - entry->second->Slot11(); + entry->second->StoreInfo(); delete entry->second; this->overlays.erase(entry); @@ -100,7 +100,7 @@ void UIWindowMgr::SubmitActiveDialog() { } for (auto entry = this->rendered.begin(); entry != this->rendered.end(); ++entry) { - if ((*entry)->Slot02()) { + if ((*entry)->IsFrameWnd()) { (*entry)->SendMsg(nullptr, 19, 0, 0, 0, 0); } } diff --git a/Source/UI/WindowOverlay.cpp b/Source/UI/WindowOverlay.cpp index ff2dd57b5..135e77550 100644 --- a/Source/UI/WindowOverlay.cpp +++ b/Source/UI/WindowOverlay.cpp @@ -21,7 +21,7 @@ // OFFSET: 0x008D0D80 // FUNCTION: fn_12090 -void UISkillDescribeWnd::Slot43() { +void UISkillDescribeWnd::DrawTransBox() { int x = 0; int y = 0; this->ToScreen(x, y); @@ -29,7 +29,7 @@ void UISkillDescribeWnd::Slot43() { // OFFSET: 0x008D0DB0 // FUNCTION: fn_12091 -void UIWhisperWnd::Slot43() { +void UIWhisperWnd::DrawTransBox() { int x = 0; int y = 0; this->ToScreen(x, y);