Maintenance: Resubmission of 14942 (gate: three existing in-class helpers whose lines changed lacked an annotation; marked // INLINED

Batch #14943 by ragnarok-clanker: no function's compiled code changes; checked with 741 compiled unit(s), including every includer of Source/ActorPickNode.h, Source/Client/Browser/BrowserClientSite.h, Source/Client/Browser/BrowserPopupDispatch.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Mode/CMode.h, Source/Client/Mode/ModeDragState.h, Source/Client/Replay.h, Source/Client/Session.h, Source/Client/Stove/StoveMgr.h, Source/Contents/AchievementMgr.h, Source/Contents/ActorNameCard.h, Source/Contents/Actors/CharacterRender.h, Source/Contents/Actors/EffectActors.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GrannyGameActor.h, Source/Contents/Actors/GroundScope.h, Source/Contents/Actors/Item.h, Source/Contents/Actors/Npc.h, Source/Contents/Actors/Pc.h, Source/Contents/Actors/RenderObjectState.h, Source/Contents/Actors/Skill.h, Source/Contents/AdventureGuideMgr.h, Source/Contents/Camera/Camera.h, Source/Contents/Camera/CameraState.h, Source/Contents/CashEmotionMgr.h, Source/Contents/Configuration/GameSettingsMgr.h, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AMachineEffect.h, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CaneOfEvilEyeEffect.h, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/CloudKillEffect.h, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectMaker.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/FuumaShouakuEffect.h, Source/Contents/Effects/GravityControlEffect.h, Source/Contents/Effects/HealSpEffect.h, Source/Contents/Effects/Level99Effect.h, Source/Contents/Effects/MapChainEffect.h, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/NyanggrassEffect.h, Source/Contents/Effects/Particle.h, Source/Contents/Effects/PowderingEffect.h, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RectUpEffect.h, Source/Contents/Effects/ShadowExceedEffect.h, Source/Contents/Effects/SkillEffects.h, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/StormCannonEffect.h, Source/Contents/Effects/ThrowEffects.h, Source/Contents/EntryQueueMgr.h, Source/Contents/EquipmentResourceMgr.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/Ground/GroundGeometry.h, Source/Contents/GuildInfo.h, Source/Contents/Items/ItemDescription.h, Source/Contents/Items/ItemInfo.h, Source/Contents/MapSkyMgr.h, Source/Contents/Messenger/MessengerWindows.h, Source/Contents/Models/ModelNode.h, Source/Contents/NavigationManager.h, Source/Contents/Party/AdventurerAgencyMgr.h, Source/Contents/RDamageVar.h, Source/Contents/RenewQuestMgr.h, Source/Contents/ReputeMgr.h, Source/Contents/RodexMailStore.h, Source/Contents/RouletteMgr.h, Source/Contents/Schedule/Schedule.h, Source/Contents/SignBoard/SignBoard.h, Source/Contents/Skills/ClientSkills.h, Source/Contents/Skills/PlayerSkillBundle.h, Source/Contents/Skills/SkillInfo.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/TipBoxTitles.h, Source/Contents/UserData/AccountLinkedUserDataMgr.h, Source/Contents/UserData/NormalItemSlots.h, Source/Contents/World/World.h, Source/Contents/WorldView/WorldViewData.h, Source/Render/Primitives/LightmappedPrimitive.h, Source/Render/Primitives/RenderPrimitive.h, Source/Render/Renderer.h, Source/Render/Textures/SpritePixels.h, Source/Render/Textures/Texture.h, Source/Resource/EZeffectResource.h, Source/Resource/Models/AnimatedModelResource.h, Source/Resource/Models/GrannyModelResource.h, Source/Resource/Sprites/ActionResource.h, Source/Resource/World/GroundResource.h, Source/Resource/World/WorldResource.h, Source/Resource/XmlNode.h, Source/UI/AdventureGuide/UIAdventureGuide.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UISlotBmpButton.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITextureButton.h, Source/UI/CashEmotion/UICashEmotionListWnd.h, Source/UI/CashEmotion/UICashEmotionPack.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomMakeWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UISubChatMiniWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Edit/UIItemTagCtrl.h, Source/UI/Enchant/EnchantUI.h, Source/UI/Exchange/UIExchangeUI.h, Source/UI/FrameSkin.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Gauges/UIPcGage.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Item/UIParaItemShopWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIExchangeWnd.h, Source/UI/Items/UIGameItem.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemIdentifyWnd.h, Source/UI/Items/UIItemParamChangeDisplayWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Layout/WindowGeometry.h, Source/UI/Lists/UIChatHisBox.h, Source/UI/Lists/UIComboBoxV2Wnd.h, Source/UI/Lists/UIImgMenu.h, Source/UI/Lists/UIListBoxID.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UITagListBox.h, Source/UI/Lists/UITreeView.h, Source/UI/Menu/UIMenuIconWnd.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/ProbabilityTable/UIProbabilityTable.h, Source/UI/Quest/UIQuestDisplay.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/Rodex/UIRodexInboxWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UIMerchantShopMakeWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Skill/UISkillDescribeWnd.h, Source/UI/Skill/UISkillListWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/CreateLineInfo.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIBalloonText.h, Source/UI/Text/UINameBalloonText.h, Source/UI/Text/UIStaticTextControl.h, Source/UI/Text/UIString.h, Source/UI/Text/UITextViewerControl.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroReport.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.h, Source/UI/Window/FuncDrawWNDChar.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRegisterMgr.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWindowMgr.inl, Source/Utility/Lexicon/LexiconSerializer.h.
This commit is contained in:
ragnarok-clanker 2026-11-08 16:44:36 +00:00
commit dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions

View file

@ -173,8 +173,8 @@ void CWorld::OnProcess() {
}
for (const std::uint32_t aid : this->pendingActorIds) {
auto skillEntry = this->unknown_0020.begin();
for (; skillEntry != this->unknown_0020.end(); ++skillEntry) {
auto skillEntry = this->skills.begin();
for (; skillEntry != this->skills.end(); ++skillEntry) {
CSkill* skill = static_cast<CSkill*>(*skillEntry);
if (skill->skillAid != aid) {
continue;
@ -204,7 +204,7 @@ void CWorld::OnProcess() {
break;
}
}
this->unknown_0020.erase(skillEntry);
this->skills.erase(skillEntry);
}
break;
}
@ -255,8 +255,8 @@ void CWorld::Clear() {
this->player = nullptr;
this->actors.clear();
this->unknown_0018.clear();
this->unknown_0020.clear();
this->items.clear();
this->skills.clear();
g_effectMgr->Clear();
this->pendingActorIds.clear();
this->actorCells.clear();
@ -338,7 +338,7 @@ CCorpse* CGameMode::SpawnCorpse(float x, float y, float z, const char* action, c
// OFFSET: 0x00AC8350
// FUNCTION: fn_17669
CItem* CWorld::GetItemByAID(std::uint32_t aid) const {
for (CRenderObject* object : this->unknown_0018) {
for (CRenderObject* object : this->items) {
CItem* item = static_cast<CItem*>(object);
if (item->itemAid == aid) {
@ -354,7 +354,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<CGameActor*>(object);
return !actor->unknown_0314 && gid == actor->GetPkState();
return !actor->objectType && gid == actor->GetPkState();
});
if (it != this->actors.end()) {
@ -367,7 +367,7 @@ CRenderObject* CWorld::GetActorByGID(int gid) const {
// OFFSET: 0x00AC8440
// FUNCTION: fn_17671
CRenderObject* CWorld::GetSkillByAID(std::uint32_t aid) const {
for (CRenderObject* object : this->unknown_0020) {
for (CRenderObject* object : this->skills) {
CSkill* skill = static_cast<CSkill*>(object);
if (skill->skillAid == aid) {
@ -411,7 +411,7 @@ bool CGameMode::LaunchTargetEffect(int effectId, CGameActor* source, CGameActor*
}
if (argument != -1) {
effect->unknown_0030 = argument;
effect->effectArgument = argument;
}
if (effectId == 539) {
@ -447,7 +447,7 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
return;
}
if (actor->unknown_02F8 == 1 && (this->scene->unknown_0048 == 1 || this->scene->unknown_004C == 1)) {
if (actor->hasHp == 1 && (this->scene->isPKZone == 1 || this->scene->isSiegeMode == 1)) {
card.name = "??????";
} else {
const std::string name = this->nameCard.Name(actor->render.accountId);
@ -460,10 +460,10 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
if (actor->GetEffectiveJob(-1) == 20269) {
monsterType = 0;
} else {
monsterType = actor->unknown_0304;
monsterType = actor->hpGaugeFlags;
}
balloon->SetName(card, actor->IsPlayerClass(actor->GetEffectiveJob(-1)) == 0, monsterType);
} else if (actor->unknown_0314 == 7 || actor->unknown_0314 == 8) {
} else if (actor->objectType == 7 || actor->objectType == 8) {
CActorNameCard masked = card;
char name[24] = {};
strncpy_s(name, sizeof(name), masked.name.c_str(), masked.name.size());
@ -482,13 +482,13 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
}
const unsigned char showEmblem = g_serviceOptions.Get(0x40);
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);
if (((g_session.IsNpcJob(actor->GetEffectiveJob(-1)) || g_session.IsMonsterActor(actor)) && card.groupIconId) ||
(g_session.IsAllyActor(actor->render.accountId, actor->GetEffectiveJob(-1)) && card.groupIconId)) {
this->nameBalloon->SetIcon(FormatOwnedString("유저인터페이스\\group\\group_%d.bmp", card.groupIconId).c_str(), 0);
} else if (actor->GetGdid() && showEmblem) {
const unsigned char framedEmblem = g_serviceOptions.Get(0xF3);
std::string emblem = g_guildMgr->GetEmblemFilename(actor->GetGdid());
this->nameBalloon->SetIcon(emblem.c_str(), static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->unknown_004C == 1 && framedEmblem ? 1 : 0);
this->nameBalloon->SetIcon(emblem.c_str(), static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->isSiegeMode == 1 && framedEmblem ? 1 : 0);
} else if (reinterpret_cast<CGameActor*>(this->scene->player) == actor) {
char path[256];
std::memset(path, 0, sizeof(path));
@ -496,18 +496,18 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
StringFormat(path, sizeof(path), static_cast<std::size_t>(-1), "유저인터페이스\\clan_system\\clan_emblem%02d.bmp", g_clanInfo->m_clanId);
}
this->nameBalloon->SetIcon(path, 0);
} else if (actor->unknown_0305) {
} else if (actor->hasSp) {
char path[256];
std::memset(path, 0, sizeof(path));
std::sprintf(path, "유저인터페이스\\clan_system\\clan_emblem%02d.bmp", actor->unknown_0308);
std::sprintf(path, "유저인터페이스\\clan_system\\clan_emblem%02d.bmp", actor->spGaugeValue);
this->nameBalloon->SetIcon(path, 0);
} else {
this->nameBalloon->SetIcon("", 0);
}
UINameBalloonText* balloon = this->nameBalloon;
*reinterpret_cast<int*>(this->unknown_02E4) = balloon->geometry.width;
*reinterpret_cast<int*>(&this->unknown_02E4[4]) = balloon->geometry.height;
*reinterpret_cast<int*>(this->nameBalloonSize) = balloon->geometry.width;
*reinterpret_cast<int*>(&this->nameBalloonSize[4]) = balloon->geometry.height;
if (balloon) {
const int aid = actor->render.accountId;
if (g_serviceType == 12) {
@ -533,8 +533,8 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
balloon->m_outlineColor = 0;
}
if (!actor->IsPlayerClass(actor->GetEffectiveJob(-1)) && static_cast<short>(actor->unknown_0210) > 0 && g_session.IsMonsterActor(actor)) {
const short difference = static_cast<short>(g_session.m_level - actor->unknown_0210);
if (!actor->IsPlayerClass(actor->GetEffectiveJob(-1)) && static_cast<short>(actor->characterLevel) > 0 && g_session.IsMonsterActor(actor)) {
const short difference = static_cast<short>(g_session.m_level - actor->characterLevel);
if (difference < -10) {
balloon->m_textColor = 0xFF;
balloon->m_outlineColor = 0;
@ -544,7 +544,7 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
}
}
if (g_session.m_aid == actor->unknown_02EC) {
if (g_session.m_aid == actor->emblemVersion) {
balloon->m_textColor = 0xC8C8C8;
balloon->m_outlineColor = 0;
}
@ -556,7 +556,7 @@ void CGameMode::UpdateNameBalloon(CGameActor* actor) {
// OFFSET: 0x00CD8820
// FUNCTION: fn_21302
void CGameMode::ShowGuildEmblem(CGameActor* actor, int guildId, int unused) {
if (!actor || !guildId || actor->unknown_0188 != 0) {
if (!actor || !guildId || actor->sceneNameWindow != 0) {
return;
}
@ -573,7 +573,7 @@ void CGameMode::ShowGuildEmblem(CGameActor* actor, int guildId, int unused) {
UIEmblemWnd* window = new UIEmblemWnd;
window->SendMsg(nullptr, UM_SETINFO, actor->render.accountId, guildId, 0, 0);
g_windowMgr.AddRenderedFront(window);
actor->unknown_0188 = reinterpret_cast<int>(window);
actor->sceneNameWindow = reinterpret_cast<int>(window);
this->AddUnknown0604(window);
}
@ -598,8 +598,8 @@ CMsgEffect* CGameMode::SpawnCashEmotion(int aid, int packId, int emotionId, std:
}
effect->SendMsg(nullptr, AM_SETMASTERGID, 0, duration, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
effect->SendMsg(nullptr, AM_SETPOS, 0, aid, aid >> 31, reinterpret_cast<int>(&names), reinterpret_cast<int>(&names) >> 31, data->unknown_0020,
data->unknown_0020 >> 31, 0, 0, 0, 0, 0, 0);
effect->SendMsg(nullptr, AM_SETPOS, 0, aid, aid >> 31, reinterpret_cast<int>(&names), reinterpret_cast<int>(&names) >> 31, data->actionIndex,
data->actionIndex >> 31, 0, 0, 0, 0, 0, 0);
}
}
@ -659,12 +659,12 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
}
if (actor != nullptr && g_session.IsHomunAid(actor->render.accountId)) {
if (g_windowMgr.unknown_0210 != nullptr) {
if (g_windowMgr.menuWnd != nullptr) {
g_windowMgr.CloseWindow(WID_MENUWND);
}
this->actorMenuIds.erase(this->actorMenuIds.begin(), this->actorMenuIds.end());
menu = g_windowMgr.EnsureWindow(WID_MENUWND);
this->unknown_02E0 = pick->accountId;
this->menuTargetAid = pick->accountId;
this->actorMenuIds.push_back(0x25);
sprintf(text, LookupMessage(MSI_HOMUN_SHOWINFO));
@ -676,12 +676,12 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
sprintf(text, LookupMessage(MSI_HOMUN_WAITING));
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(text), 0, 0, 0);
} else if (actor != nullptr && g_session.IsMercenaryAid(pick->accountId)) {
if (g_windowMgr.unknown_0210 != nullptr) {
if (g_windowMgr.menuWnd != nullptr) {
g_windowMgr.CloseWindow(WID_MENUWND);
}
this->actorMenuIds.erase(this->actorMenuIds.begin(), this->actorMenuIds.end());
menu = g_windowMgr.EnsureWindow(WID_MENUWND);
this->unknown_02E0 = pick->accountId;
this->menuTargetAid = pick->accountId;
this->actorMenuIds.push_back(0x28);
sprintf(text, LookupMessage(MSI_HOMUN_SHOWINFO));
@ -689,13 +689,13 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
this->actorMenuIds.push_back(0x29);
sprintf(text, LookupMessage(MSI_HOMUN_WAITING));
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(text), 0, 0, 0);
} else if (actor != nullptr && pick->accountId == g_session.unknown_1010 && actor->unknown_0314 == 7) {
if (g_windowMgr.unknown_0210 != nullptr) {
} else if (actor != nullptr && pick->accountId == g_session.petGid && actor->objectType == 7) {
if (g_windowMgr.menuWnd != nullptr) {
g_windowMgr.CloseWindow(WID_MENUWND);
}
this->actorMenuIds.erase(this->actorMenuIds.begin(), this->actorMenuIds.end());
menu = g_windowMgr.EnsureWindow(WID_MENUWND);
this->unknown_02E0 = pick->accountId;
this->menuTargetAid = pick->accountId;
this->actorMenuIds.push_back(0x21);
sprintf(text, LookupMessage(MSI_PET_SHOWINFO));
@ -728,7 +728,7 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
if (this->ActorName(pick->accountId).empty() && !isAdmin) {
return;
}
if (this->unknown_00E4 != g_mouse.x || this->unknown_00E8 != g_mouse.y || !IsPlayerJob(pick->job)) {
if (this->rBtnClickX != g_mouse.x || this->rBtnClickY != g_mouse.y || !IsPlayerJob(pick->job)) {
return;
}
@ -737,34 +737,34 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
return;
}
if (target->unknown_03E0Low == 1) {
if (target->storedActorEntry == 1) {
if (isAdmin != true) {
return;
}
if (g_windowMgr.unknown_0210 != nullptr) {
if (g_windowMgr.menuWnd != nullptr) {
g_windowMgr.CloseWindow(WID_MENUWND);
}
this->actorMenuIds.erase(this->actorMenuIds.begin(), this->actorMenuIds.end());
menu = g_windowMgr.EnsureWindow(WID_MENUWND);
this->unknown_02E0 = pick->accountId;
this->menuTargetAid = pick->accountId;
this->actorMenuIds.push_back(0x41);
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(LookupMessage(MSI_INVALID_MAPPROPERTY_REQUEST_USER)), 0, 0, 0);
} else {
std::string name;
if (target->unknown_02F8 == 1 && (this->scene->unknown_0048 == 1 || this->scene->unknown_004C == 1)) {
if (target->hasHp == 1 && (this->scene->isPKZone == 1 || this->scene->isSiegeMode == 1)) {
name = "??????";
} else {
name = this->ActorName(pick->accountId);
}
if (g_windowMgr.unknown_0210 != nullptr) {
if (g_windowMgr.menuWnd != nullptr) {
g_windowMgr.CloseWindow(WID_MENUWND);
}
this->actorMenuIds.erase(this->actorMenuIds.begin(), this->actorMenuIds.end());
menu = g_windowMgr.EnsureWindow(WID_MENUWND);
this->unknown_02E0 = pick->accountId;
this->menuTargetAid = pick->accountId;
char line[128];
std::memset(line, 0, sizeof(line));
@ -787,7 +787,7 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
}
const bool canInviteParty =
g_session.unknown_5464 != 0 && g_session.PartyByName(name.c_str()).valid == 0;
g_session.partyLeader != 0 && g_session.PartyByName(name.c_str()).valid == 0;
if (canInviteParty) {
this->actorMenuIds.push_back(5);
sprintf(line, LookupMessage(MSI_REQ_JOIN_PARTY2), name.c_str());
@ -803,12 +803,12 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
if (g_guildInfo.m_guildId != 0) {
CGameActor* member = static_cast<CGameActor*>(this->scene->GetGameActorByAID(pick->accountId));
const std::uint32_t guildId = member != nullptr ? member->GetGdid() : 0;
if (g_guildInfo.unknown_00AC != 0 && guildId == 0) {
if (g_guildInfo.canInvite != 0 && guildId == 0) {
this->actorMenuIds.push_back(0x16);
sprintf(line, LookupMessage(MSI_REQ_JOIN_GUILD), name.c_str());
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(line), 0, 0, 0);
}
if (g_guildInfo.unknown_00B4 != 0 && guildId != g_guildInfo.m_guildId) {
if (g_guildInfo.isMaster != 0 && guildId != g_guildInfo.m_guildId) {
menu->SendMsg(nullptr, UM_ADDBOUNDARY, 0, 0, 0, 0);
this->actorMenuIds.push_back(0x19);
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(LookupMessage(MSI_REQ_ALLY_GUILD)), 0, 0, 0);
@ -845,16 +845,16 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(LookupMessage(MSI_GIVE_PLUS_MANNER_POINT)), 0, 0, 0);
this->actorMenuIds.push_back(0x18);
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(LookupMessage(MSI_GIVE_MINUS_MANNER_POINT)), 0, 0, 0);
sprintf(line, LookupMessage(MSI_PROHIBIT_LOG), g_session.CountProhibitionLog(this->unknown_02E0));
sprintf(line, LookupMessage(MSI_PROHIBIT_LOG), g_session.CountProhibitionLog(this->menuTargetAid));
this->actorMenuIds.push_back(0x23);
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(line), 0, 0, 0);
}
sprintf(line, "%s : %d (GID) : %s", g_session.m_serverName.c_str(), this->unknown_02E0, name.c_str());
sprintf(line, "%s : %d (GID) : %s", g_session.m_serverName.c_str(), this->menuTargetAid, name.c_str());
this->actorMenuIds.push_back(0x22);
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(line), 0, 0, 0);
}
this->unknown_02EC = name;
this->menuTargetName = name;
menu->SendMsg(nullptr, UM_ADDBOUNDARY, 0, 0, 0, 0);
this->actorMenuIds.push_back(0x3F);
menu->SendMsg(nullptr, UM_ADDITEM, reinterpret_cast<std::intptr_t>(LookupMessage(MSI_MACRO_USER_REPORT_COOLTIME)), 0xFF, 0, 0);
@ -879,7 +879,7 @@ void CGameMode::OpenActorMenu(const ActorPickInfo* pick, int handled) {
// OFFSET: 0x00ACA540
// FUNCTION: fn_17693
bool CWorld::RemoveGroundItem(std::uint32_t aid) {
for (auto item = this->unknown_0018.begin(); item != this->unknown_0018.end(); ++item) {
for (auto item = this->items.begin(); item != this->items.end(); ++item) {
if (static_cast<CItem*>(*item)->itemAid == aid) {
CRenderObject* object = *item;
@ -891,7 +891,7 @@ bool CWorld::RemoveGroundItem(std::uint32_t aid) {
}
}
this->unknown_0018.erase(item);
this->items.erase(item);
return true;
}
}
@ -902,7 +902,7 @@ bool CWorld::RemoveGroundItem(std::uint32_t aid) {
// OFFSET: 0x00ACA8A0
// FUNCTION: fn_17697
bool CWorld::RemoveSkill(std::uint32_t aid) {
for (auto entry = this->unknown_0020.begin(); entry != this->unknown_0020.end(); ++entry) {
for (auto entry = this->skills.begin(); entry != this->skills.end(); ++entry) {
if (static_cast<CSkill*>(*entry)->skillAid == aid) {
CSkill* skill = static_cast<CSkill*>(*entry);
@ -924,7 +924,7 @@ bool CWorld::RemoveSkill(std::uint32_t aid) {
}
this->RemoveObject(skill);
this->unknown_0020.erase(entry);
this->skills.erase(entry);
return true;
}
}
@ -939,8 +939,8 @@ CMsgEffect* CGameMode::SpawnDamageMsgEffect(const vector3d* position, std::uint3
std::string sprite;
std::string action;
} names;
names.sprite = static_cast<const std::string&>(FormatOwnedString("%s.spr", g_session.unknown_80EC.c_str()));
names.action = static_cast<const std::string&>(FormatOwnedString("%s.act", g_session.unknown_80EC.c_str()));
names.sprite = static_cast<const std::string&>(FormatOwnedString("%s.spr", g_session.damageSpriteName.c_str()));
names.action = static_cast<const std::string&>(FormatOwnedString("%s.act", g_session.damageSpriteName.c_str()));
CMsgEffect* effect = new CMsgEffect;
if (effect) {
@ -949,7 +949,7 @@ CMsgEffect* CGameMode::SpawnDamageMsgEffect(const vector3d* position, std::uint3
effect->SendMsg(nullptr, AM_SETPOS, 0, reinterpret_cast<int>(position), reinterpret_cast<int>(position) >> 31, reinterpret_cast<int>(&names),
reinterpret_cast<int>(&names) >> 31, 0, 0, 0, 0, 0, 0, 0, 0);
effect->render.color = color;
effect->render.unknown_00B4 = 0;
effect->render.useGroundLighting = 0;
}
return effect;