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
parent
d7d87febd6
commit
dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
|
|
@ -140,13 +140,13 @@ bool CSession::IsNavigationAllowed() const {
|
|||
// OFFSET: 0x00DFA810
|
||||
// FUNCTION: fn_23579
|
||||
bool IsNavigationActive() {
|
||||
if (g_windowMgr.unknown_0250 != 0) {
|
||||
if (g_windowMgr.itemShopWnd != 0) {
|
||||
return false;
|
||||
}
|
||||
if (g_windowMgr.HasNavigationBlocker() == true) {
|
||||
return false;
|
||||
}
|
||||
if (g_windowMgr.unknown_01E4 != 0) {
|
||||
if (g_windowMgr.nCashWnd != 0) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
@ -1098,7 +1098,7 @@ std::string CSession::GetWeaponName(int weapon) {
|
|||
// FUNCTION: fn_23482
|
||||
const char* CSession::GetWeaponClassName(int item) {
|
||||
const char* name = nullptr;
|
||||
if (g_session.m_hotkeyScript->Call("ReqWeaponNameByClassNum", "d>s", FindItemDescription(item).unknown_0040, &name)) {
|
||||
if (g_session.m_hotkeyScript->Call("ReqWeaponNameByClassNum", "d>s", FindItemDescription(item).viewId, &name)) {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
|
@ -1200,7 +1200,7 @@ std::string GetJobTitleString(int job) {
|
|||
// OFFSET: 0x00E19530
|
||||
// FUNCTION: fn_23841
|
||||
int __stdcall GetWeaponViewValue(int weapon) {
|
||||
const int value = FindItemDescription(weapon).unknown_0040;
|
||||
const int value = FindItemDescription(weapon).viewId;
|
||||
|
||||
if (weapon > 2100 && weapon < 2200 || static_cast<unsigned>(weapon - 28901) <= 0x61 || static_cast<unsigned>(weapon - 460000) <= 0x270F) {
|
||||
return -1;
|
||||
|
|
@ -1292,14 +1292,14 @@ bool ResetHotkeySlots() {
|
|||
// OFFSET: 0x00E25E60
|
||||
// FUNCTION: fn_23909
|
||||
std::pair<int, int>* CSession::InsertPair(int key, int value) {
|
||||
for (std::vector<std::pair<int, int>>::iterator it = this->unknown_0778.begin(); it != this->unknown_0778.end(); ++it) {
|
||||
for (std::vector<std::pair<int, int>>::iterator it = this->keyValues.begin(); it != this->keyValues.end(); ++it) {
|
||||
if (key == it->first) {
|
||||
it->second = value;
|
||||
return &*it;
|
||||
}
|
||||
}
|
||||
|
||||
return &this->unknown_0778.emplace_back(std::make_pair(key, value));
|
||||
return &this->keyValues.emplace_back(std::make_pair(key, value));
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E0A1F0
|
||||
|
|
@ -1322,7 +1322,7 @@ int CSession::GetPairValue() const {
|
|||
// FUNCTION: fn_23793
|
||||
int CSession::GetPetTargetAid() const {
|
||||
int target = 0;
|
||||
std::uint32_t aid = *reinterpret_cast<const std::uint32_t*>(&this->unknown_5570[8]);
|
||||
std::uint32_t aid = *reinterpret_cast<const std::uint32_t*>(&this->spAndHomunculusStats[8]);
|
||||
CGameMode* mode;
|
||||
CRenderObject* actor;
|
||||
if (aid != 0 && (mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode())) != nullptr &&
|
||||
|
|
@ -1330,7 +1330,7 @@ int CSession::GetPetTargetAid() const {
|
|||
target = static_cast<CGameActor*>(actor)->hitTargetAid;
|
||||
}
|
||||
|
||||
aid = *reinterpret_cast<const std::uint32_t*>(&this->unknown_5620[8]);
|
||||
aid = *reinterpret_cast<const std::uint32_t*>(&this->companionTargetState[8]);
|
||||
if (aid != 0 && (mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode())) != nullptr &&
|
||||
(actor = mode->scene->GetGameActorByAID(aid)) != nullptr) {
|
||||
target = static_cast<CGameActor*>(actor)->hitTargetAid;
|
||||
|
|
@ -1348,7 +1348,7 @@ int CSession::GetPetTargetAid() const {
|
|||
// OFFSET: 0x00E1D950
|
||||
// FUNCTION: fn_23854
|
||||
int CSession::WorldUnknown0050() const {
|
||||
return static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->unknown_0050;
|
||||
return static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->isBattleFieldMode;
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1D970
|
||||
|
|
@ -1416,49 +1416,49 @@ int CSession::IsTrickDeadActive() const {
|
|||
// OFFSET: 0x00E1DAA0
|
||||
// FUNCTION: fn_23860
|
||||
int CSession::GetMapProperty08() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 8);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 8);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DAB0
|
||||
// FUNCTION: fn_23861
|
||||
int CSession::GetMapProperty07() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 7);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 7);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DAC0
|
||||
// FUNCTION: fn_23862
|
||||
int CSession::GetMapProperty13() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 0x13);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 0x13);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DAD0
|
||||
// FUNCTION: fn_23863
|
||||
int CSession::GetMapProperty11() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 0x11);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 0x11);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DAE0
|
||||
// FUNCTION: fn_23864
|
||||
int CSession::GetMapProperty10() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 0x10);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 0x10);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DAF0
|
||||
// FUNCTION: fn_23865
|
||||
int CSession::GetMapProperty12() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 0x12);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 0x12);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DB00
|
||||
// FUNCTION: fn_23866
|
||||
int CSession::GetMapProperty09() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 9);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 9);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DB10
|
||||
// FUNCTION: fn_23867
|
||||
int CSession::GetMapProperty0F() const {
|
||||
return g_mapPropertyMgr->GetValue(this->unknown_0000, 0xF);
|
||||
return g_mapPropertyMgr->GetValue(this->mapPropertyId, 0xF);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DB20
|
||||
|
|
@ -1482,7 +1482,7 @@ bool CSession::IsMiscItemType(int type) const {
|
|||
// OFFSET: 0x00E1DBA0
|
||||
// FUNCTION: fn_23870
|
||||
bool CSession::HasUnknown6178Records() const {
|
||||
return this->unknown_6178.size() != 0;
|
||||
return this->trackedAchievements.size() != 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1DBD0
|
||||
|
|
@ -1593,11 +1593,11 @@ int CSession::SetHotkeyEntry(char enabled, int id, int value, int slot) {
|
|||
for (int index = 0; index < 2; ++index) {
|
||||
NormalItemSlot& entry = this->SkillHotkey(index);
|
||||
|
||||
if (id == static_cast<int>(entry.itemId) && value == entry.unknown_0005 && enabled == static_cast<char>(entry.unknown_0000) ||
|
||||
if (id == static_cast<int>(entry.itemId) && value == entry.value && enabled == static_cast<char>(entry.enabled) ||
|
||||
!CSkillInfo::UsesLevel(*g_session.m_hotkeyScript, static_cast<int>(entry.itemId)) && id == static_cast<int>(entry.itemId)) {
|
||||
entry.unknown_0000 = 0;
|
||||
entry.enabled = 0;
|
||||
entry.itemId = 0;
|
||||
entry.unknown_0005 = 0;
|
||||
entry.value = 0;
|
||||
g_modeMgr.GetGameMode()->SendMsg(MM_SHORTCUT_KEY_CHANGE, index + 36, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -1608,9 +1608,9 @@ int CSession::SetHotkeyEntry(char enabled, int id, int value, int slot) {
|
|||
}
|
||||
|
||||
NormalItemSlot& target = this->SkillHotkey(slot);
|
||||
target.unknown_0000 = static_cast<unsigned char>(enabled);
|
||||
target.enabled = static_cast<unsigned char>(enabled);
|
||||
target.itemId = static_cast<std::uint32_t>(id);
|
||||
target.unknown_0005 = static_cast<std::int16_t>(value);
|
||||
target.value = static_cast<std::int16_t>(value);
|
||||
|
||||
return g_modeMgr.GetGameMode()->SendMsg(MM_SHORTCUT_KEY_CHANGE, slot + 36, 0, 0, 0);
|
||||
}
|
||||
|
|
@ -1619,8 +1619,8 @@ int CSession::SetHotkeyEntry(char enabled, int id, int value, int slot) {
|
|||
// FUNCTION: fn_23912
|
||||
int CSession::SetFlag(char value) {
|
||||
const int result = value & 1;
|
||||
this->unknown_0E98 = result;
|
||||
this->unknown_5558 = result;
|
||||
this->cachedSex = result;
|
||||
this->currentSex = result;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -1804,7 +1804,7 @@ public:
|
|||
|
||||
/* 0038 */ bool m_active;
|
||||
/* 003C */ int m_type;
|
||||
/* 0040 */ int unknown_0040;
|
||||
/* 0040 */ int equippedItemIndex;
|
||||
/* 0044 */ std::vector<CEquipmentAttachable> m_attachables;
|
||||
/* 0050 */ std::list<CEquipmentProperties*> m_children;
|
||||
};
|
||||
|
|
@ -1815,7 +1815,7 @@ public:
|
|||
/* 0004 */ unsigned char unknown_0004[0x9];
|
||||
/* 000D */ bool m_dirty;
|
||||
/* 000E */ unsigned char unknown_000E[0x12];
|
||||
/* 0020 */ UIWindow* unknown_0020;
|
||||
/* 0020 */ UIWindow* observerWindow;
|
||||
/* 0024 */ std::unordered_map<int, CEquipmentWearable*> properties1;
|
||||
|
||||
CEquipmentPropertiesMgr();
|
||||
|
|
@ -1837,8 +1837,8 @@ void CEquipmentPropertiesMgr::RemoveWearable(const int& location) {
|
|||
delete wearable;
|
||||
this->properties1.erase(key);
|
||||
}
|
||||
if (this->unknown_0020 != nullptr) {
|
||||
this->unknown_0020->SendMsg(nullptr, UM_REFRESH, 0, 0, 0, 0);
|
||||
if (this->observerWindow != nullptr) {
|
||||
this->observerWindow->SendMsg(nullptr, UM_REFRESH, 0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1852,27 +1852,27 @@ bool CSession::UnequipItem2B50(int location) {
|
|||
const EquipSlots slots = g_session.GetEquipSlots(location);
|
||||
if (slots.values[2] < 10) {
|
||||
if (slots.values[2] != -1) {
|
||||
ITEM_INFO& item = this->unknown_2B50[slots.values[2]];
|
||||
ITEM_INFO& item = this->costumeItems[slots.values[2]];
|
||||
const char* message = LookupMessage(MSI_ITEM_IS_REMOVED);
|
||||
const std::string name = item.DisplayName(0);
|
||||
const std::string text = FormatOwnedString("%s%s", name.c_str(), message);
|
||||
g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast<std::intptr_t>(text.c_str()), 0xFF, 7, 0, 0);
|
||||
item.unknown_0000[3] = 0;
|
||||
item.identity[3] = 0;
|
||||
this->AddItem1710(item, 1);
|
||||
item.Reset();
|
||||
}
|
||||
if (slots.values[1] != -1 && slots.values[1] < 10) {
|
||||
this->unknown_2B50[slots.values[1]].Reset();
|
||||
this->costumeItems[slots.values[1]].Reset();
|
||||
}
|
||||
if (slots.values[0] != -1 && slots.values[0] < 10) {
|
||||
this->unknown_2B50[slots.values[0]].Reset();
|
||||
this->costumeItems[slots.values[0]].Reset();
|
||||
}
|
||||
}
|
||||
RequestBasicInfoRefresh();
|
||||
}
|
||||
|
||||
this->InvalidateWindowFrames();
|
||||
if (UIWindow* window = reinterpret_cast<UIWindow*>(g_windowMgr.unknown_022C)) {
|
||||
if (UIWindow* window = reinterpret_cast<UIWindow*>(g_windowMgr.itemParamChangeDisplayWnd)) {
|
||||
window->SendMsg(nullptr, UM_REFRESH, 0, 0, 0, 0);
|
||||
}
|
||||
if (g_equipmentPropertiesMgr == nullptr) {
|
||||
|
|
@ -1967,49 +1967,49 @@ bool CSession::PlaySkillGroundEffect(int skillId, vector3d position) {
|
|||
// FUNCTION: fn_24162
|
||||
int CSession::GetMaxBaseLevel(int job) const {
|
||||
if (g_session.IsTreeGroupThree(job) == true) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x74]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x74]);
|
||||
}
|
||||
if (g_session.IsTreeGroupTwo(job)) {
|
||||
return g_session.m_maxLevel;
|
||||
}
|
||||
if (g_session.IsSuperNovice2Job(job)) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0]);
|
||||
}
|
||||
if (g_session.IsExpandedJob(job)) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[4]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[4]);
|
||||
}
|
||||
return g_session.IsDoramJob(job) == true ? *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x28])
|
||||
: *reinterpret_cast<const int*>(g_session.unknown_7EE8);
|
||||
return g_session.IsDoramJob(job) == true ? *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x28])
|
||||
: *reinterpret_cast<const int*>(g_session.maxBaseLevel);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E2FA80
|
||||
// FUNCTION: fn_24163
|
||||
int CSession::GetMaxJobLevel(int job) const {
|
||||
if (g_session.IsSuperNoviceJob(job)) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x10]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x10]);
|
||||
}
|
||||
if ((job >= JT_KNIGHT_H && job < JT_NOVICE_B) || job == JT_GUNSLINGER || job == JT_NINJA || job == JT_GUNSLINGER_B || job == JT_NINJA_B ||
|
||||
job == JT_DRUID || job == JT_DRUID_B) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x18]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x18]);
|
||||
}
|
||||
if (job == JT_NOVICE || job == JT_NOVICE_B || job == JT_NOVICE_H) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x0C]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x0C]);
|
||||
}
|
||||
if (g_session.IsTreeGroupThree(job) == true) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x78]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x78]);
|
||||
}
|
||||
if (g_session.IsTreeGroupTwo(job)) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x1C]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x1C]);
|
||||
}
|
||||
if (!g_session.IsExpandedJob(job)) {
|
||||
if (g_session.IsDoramJob(job) == true) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x2C]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x2C]);
|
||||
}
|
||||
if (!g_session.IsSuperNovice2Job(job)) {
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x14]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x14]);
|
||||
}
|
||||
}
|
||||
return *reinterpret_cast<const int*>(&g_session.unknown_7EF0[0x24]);
|
||||
return *reinterpret_cast<const int*>(&g_session.jobLevelLimits[0x24]);
|
||||
}
|
||||
|
||||
// OFFSET: 0x00E1E690
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue