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
|
|
@ -75,9 +75,9 @@ int BasicInfoWndInfo::IsValid() {
|
|||
}
|
||||
|
||||
if (this->height == 55 || this->height == 71) {
|
||||
this->unknown_0012 = 0;
|
||||
this->expanded = 0;
|
||||
} else if (this->height == 134 || this->height == 149) {
|
||||
this->unknown_0012 = 1;
|
||||
this->expanded = 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@ int EquipWndInfo::IsValid() const {
|
|||
if (this->height != 167 && this->height != 17 && this->height != 187 && this->height != 187 + extraHeight) {
|
||||
return 0;
|
||||
}
|
||||
if (this->unknown_0010 != 167 && this->unknown_0010 != 187) {
|
||||
if (this->contentHeight != 167 && this->contentHeight != 187) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -168,8 +168,8 @@ int GuildHelperWndInfo::IsValid() const {
|
|||
// FUNCTION: fn_13632
|
||||
int GuildWndInfo::IsValid() const {
|
||||
return this->width == g_defaultPlacementWidth && this->height == g_defaultPlacementHeight && this->x >= 0 &&
|
||||
this->x <= g_renderer->viewport.width - this->width && this->y >= 0 && this->y <= g_renderer->viewport.height - this->height && this->unknown_0010 >= 0 &&
|
||||
this->unknown_0010 <= 6;
|
||||
this->x <= g_renderer->viewport.width - this->width && this->y >= 0 && this->y <= g_renderer->viewport.height - this->height && this->tab >= 0 &&
|
||||
this->tab <= 6;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A5590
|
||||
|
|
@ -250,8 +250,8 @@ int ItemStoreFindSlotInfo::IsValid() const {
|
|||
// FUNCTION: fn_13644
|
||||
int ItemWndInfo::IsValid() const {
|
||||
return this->x >= 0 && this->x <= g_renderer->viewport.width - this->width && this->y >= 0 && this->y <= g_renderer->viewport.height - this->height &&
|
||||
this->unknown_0014 >= 0 && this->unknown_0014 <= 3 && this->unknown_0018 >= 0 && this->unknown_0018 <= 3 &&
|
||||
this->unknown_001C >= 0 && this->unknown_001C <= 3 && this->unknown_0020 >= 0 && this->unknown_0020 <= 4;
|
||||
this->selectedTab >= 0 && this->selectedTab <= 3 && this->usableRows >= 0 && this->usableRows <= 3 &&
|
||||
this->equipmentRows >= 0 && this->equipmentRows <= 3 && this->etcRows >= 0 && this->etcRows <= 4;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A5940
|
||||
|
|
@ -264,8 +264,8 @@ int EntryQueueWndInfo::IsValid() const {
|
|||
// OFFSET: 0x009A5980
|
||||
// FUNCTION: fn_13646
|
||||
int MiniMapWndInfo::IsValid() const {
|
||||
return this->unknown_0010 > 0 && this->unknown_0014 > 0 && this->width >= 0 && this->width <= g_renderer->viewport.width - this->unknown_0010 &&
|
||||
this->height >= 0 && this->height <= g_renderer->viewport.height - this->unknown_0014;
|
||||
return this->expandedWidth > 0 && this->expandedHeight > 0 && this->width >= 0 && this->width <= g_renderer->viewport.width - this->expandedWidth &&
|
||||
this->height >= 0 && this->height <= g_renderer->viewport.height - this->expandedHeight;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A59C0
|
||||
|
|
@ -326,8 +326,8 @@ int MerchantShopMakeWndInfo::IsValid() const {
|
|||
// OFFSET: 0x009A5BF0
|
||||
// FUNCTION: fn_13654
|
||||
int MessengerGroupWndInfo::IsValid() const {
|
||||
return this->unknown_0018 <= 2 && this->width >= 243 && this->height >= 166 && this->x >= 0 && this->x <= g_renderer->viewport.width - this->width &&
|
||||
this->y >= 0 && this->y <= g_renderer->viewport.height - this->height && (this->unknown_0014 == 0 || this->unknown_0014 == 1);
|
||||
return this->iconIndex <= 2 && this->width >= 243 && this->height >= 166 && this->x >= 0 && this->x <= g_renderer->viewport.width - this->width &&
|
||||
this->y >= 0 && this->y <= g_renderer->viewport.height - this->height && (this->mode == 0 || this->mode == 1);
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A5C50
|
||||
|
|
@ -487,15 +487,15 @@ void BasicInfoWndInfo::Reset() {
|
|||
this->width = 220;
|
||||
this->height = 134;
|
||||
if (g_session.IsTreeGroupThree(g_session.GetDisplayJob()) == true) {
|
||||
if (this->unknown_0012 == 1) {
|
||||
if (this->expanded == 1) {
|
||||
this->height = 149;
|
||||
} else {
|
||||
this->height = 71;
|
||||
}
|
||||
this->unknown_0010 = 0;
|
||||
this->mode = 0;
|
||||
} else {
|
||||
this->height = this->unknown_0012 == 1 ? 134 : 55;
|
||||
this->unknown_0010 = 0;
|
||||
this->height = this->expanded == 1 ? 134 : 55;
|
||||
this->mode = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -569,8 +569,8 @@ void EquipWndInfo::Reset() {
|
|||
this->y = 300;
|
||||
this->width = 280;
|
||||
this->height = 167;
|
||||
this->unknown_0010 = 167;
|
||||
this->unknown_0014 = 0;
|
||||
this->contentHeight = 167;
|
||||
this->resetState = 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6540
|
||||
|
|
@ -607,7 +607,7 @@ void GuildWndInfo::Reset() {
|
|||
this->y = 34;
|
||||
this->width = g_defaultPlacementWidth;
|
||||
this->height = g_defaultPlacementHeight;
|
||||
this->unknown_0010 = 0;
|
||||
this->tab = 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A65D0
|
||||
|
|
@ -698,7 +698,7 @@ void ItemStoreFindListInfo::Reset() {
|
|||
this->y = 200;
|
||||
this->width = 280;
|
||||
this->height = 458;
|
||||
this->unknown_0010 = 0;
|
||||
this->openTabs = 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6780
|
||||
|
|
@ -719,12 +719,12 @@ void ItemWndInfo::Reset() {
|
|||
this->y = 120;
|
||||
this->width = 280;
|
||||
this->height = 120;
|
||||
this->unknown_0010 = 120;
|
||||
this->unknown_0014 = 0;
|
||||
this->unknown_0018 = 3;
|
||||
this->unknown_001C = 3;
|
||||
this->unknown_0020 = 4;
|
||||
this->unknown_0024 = 0;
|
||||
this->expandedHeight = 120;
|
||||
this->selectedTab = 0;
|
||||
this->usableRows = 3;
|
||||
this->equipmentRows = 3;
|
||||
this->etcRows = 4;
|
||||
this->resetState = 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6850
|
||||
|
|
@ -745,11 +745,11 @@ void MiniMapWndInfo::Reset() {
|
|||
this->width = x;
|
||||
this->x = x;
|
||||
this->y = 190;
|
||||
this->unknown_0010 = 516;
|
||||
this->unknown_0014 = 559;
|
||||
this->unknown_0020 = 1;
|
||||
this->unknown_0018 = 1;
|
||||
this->unknown_001C = 1;
|
||||
this->expandedWidth = 516;
|
||||
this->expandedHeight = 559;
|
||||
this->showMembers = 1;
|
||||
this->showQuests = 1;
|
||||
this->showTowns = 1;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A68C0
|
||||
|
|
@ -820,11 +820,11 @@ void MerchantShopMakeWndInfo::Reset() {
|
|||
void MessengerGroupWndInfo::Reset() {
|
||||
this->width = 273;
|
||||
this->height = 326;
|
||||
this->unknown_0018 = 0;
|
||||
this->iconIndex = 0;
|
||||
this->x = 300;
|
||||
this->y = 200;
|
||||
this->unknown_0010 = 0;
|
||||
this->unknown_0014 = 1;
|
||||
this->resetState = 0;
|
||||
this->mode = 1;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A69F0
|
||||
|
|
@ -843,8 +843,8 @@ void UnusedWndInfoB::Reset() {
|
|||
this->y = 300;
|
||||
this->width = 250;
|
||||
this->height = 60;
|
||||
this->unknown_0010 = 60;
|
||||
this->unknown_0014 = 0;
|
||||
this->defaultHeight = 60;
|
||||
this->resetState = 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6AA0
|
||||
|
|
@ -904,7 +904,7 @@ void PetInfoWndInfo::Reset() {
|
|||
// OFFSET: 0x009A6B60
|
||||
// FUNCTION: fn_13721
|
||||
void QuestDisplayInfo::Reset() {
|
||||
this->unknown_0000 = 1;
|
||||
this->visible = 1;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6BB0
|
||||
|
|
@ -941,7 +941,7 @@ void UnusedWndInfoC::Reset() {
|
|||
this->y = 300;
|
||||
this->width = 140;
|
||||
this->height = 30;
|
||||
this->unknown_0010 = 0;
|
||||
this->resetState = 0;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6C80
|
||||
|
|
@ -968,10 +968,10 @@ void StatusWndInfo::Reset() {
|
|||
this->x = 185;
|
||||
this->y = 300;
|
||||
this->width = 280;
|
||||
this->unknown_0014 = 0;
|
||||
this->resetState = 0;
|
||||
this->height = 141;
|
||||
this->unknown_0010 = 141;
|
||||
this->unknown_0018 = 1;
|
||||
this->expandedHeight = 141;
|
||||
this->extended = 1;
|
||||
}
|
||||
|
||||
// OFFSET: 0x009A6D00
|
||||
|
|
@ -1080,7 +1080,7 @@ void UIWindowMgr::ResetUIRectInfo() {
|
|||
for (int index = 0; index < 8; ++index) {
|
||||
storeSlots[index].Reset(index);
|
||||
}
|
||||
this->unknown_0058 = 8;
|
||||
this->itemStoreWindowCount = 8;
|
||||
|
||||
reinterpret_cast<ItemStoreFindWndInfo*>(base + 0x6AC)->Reset();
|
||||
reinterpret_cast<SeekPartyListWndInfo*>(base + 0x6BC)->Reset();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue