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:
parent
d7d87febd6
commit
dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
|
|
@ -67,8 +67,8 @@ struct GameSettingsOption {
|
|||
/* 0040 */ std::string description;
|
||||
/* 0058 */ unsigned char defaultValue;
|
||||
/* 0059 */ unsigned char unknown_0059[3];
|
||||
/* 005C */ int unknown_005c = 4698;
|
||||
/* 0060 */ int unknown_0060 = 4698;
|
||||
/* 005C */ int enabledMessage = 4698;
|
||||
/* 0060 */ int disabledMessage = 4698;
|
||||
};
|
||||
|
||||
class CGameSettingsMgr : public Singleton<CGameSettingsMgr>, public CLuaInstance {
|
||||
|
|
@ -453,10 +453,10 @@ void GameSettings::SetOption(int id, unsigned char value, bool notify) {
|
|||
if (entry != this->actions.end()) {
|
||||
const std::function<void(int, unsigned char, bool, int, int)> action = entry->second;
|
||||
if (action) {
|
||||
action(id, value, notify, (*option)->unknown_005c, (*option)->unknown_0060);
|
||||
action(id, value, notify, (*option)->enabledMessage, (*option)->disabledMessage);
|
||||
}
|
||||
} else {
|
||||
ApplyServiceOption(id, value, notify, (*option)->unknown_005c, (*option)->unknown_0060);
|
||||
ApplyServiceOption(id, value, notify, (*option)->enabledMessage, (*option)->disabledMessage);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -622,8 +622,8 @@ bool GameSettings::ReadOptionTable() {
|
|||
lua_gettable(state, -2);
|
||||
const int disabledMessage = FindMessageId(lua_tostring(state, -1));
|
||||
lua_pop(state, 1);
|
||||
option.unknown_005c = enabledMessage;
|
||||
option.unknown_0060 = disabledMessage;
|
||||
option.enabledMessage = enabledMessage;
|
||||
option.disabledMessage = disabledMessage;
|
||||
}
|
||||
lua_pop(state, 1);
|
||||
|
||||
|
|
@ -908,8 +908,8 @@ void ApplyServiceOptionItemWnd(int id, unsigned char value, bool notify, int ena
|
|||
}
|
||||
}
|
||||
|
||||
if (g_windowMgr.unknown_01D4 != nullptr) {
|
||||
static_cast<UIItemWnd*>(g_windowMgr.unknown_01D4)->RefreshOptionBox();
|
||||
if (g_windowMgr.itemWnd != nullptr) {
|
||||
static_cast<UIItemWnd*>(g_windowMgr.itemWnd)->RefreshOptionBox();
|
||||
}
|
||||
}
|
||||
#pragma inline_depth()
|
||||
|
|
@ -938,8 +938,8 @@ void ToggleSitStand() {
|
|||
player->render.angle = static_cast<float>(std::ceil(player->render.angle));
|
||||
mode->SendMsg(MM_CHANGE_DIRECTION, (static_cast<int>(player->render.angle) + 180) / 45 % 8, motion, 0, 0);
|
||||
|
||||
if (player->render.unknown_0070 == 6) {
|
||||
std::list<unsigned long>& times = mode->unknown_05D4;
|
||||
if (player->render.state == 6) {
|
||||
std::list<unsigned long>& times = mode->periodicTicks;
|
||||
times.pop_front();
|
||||
times.push_back(timeGetTime());
|
||||
const unsigned long elapsed = times.back() - times.front();
|
||||
|
|
@ -1053,7 +1053,7 @@ void ApplyServiceOptionSessionFlag(int id, unsigned char value, bool notify, int
|
|||
}
|
||||
}
|
||||
|
||||
*reinterpret_cast<int*>(g_session.unknown_5454) = value;
|
||||
*reinterpret_cast<int*>(g_session.interactionFlags) = value;
|
||||
}
|
||||
#pragma inline_depth()
|
||||
|
||||
|
|
@ -1172,7 +1172,7 @@ void ApplyServiceOptionNotifyWindow(int id, unsigned char value, bool notify, in
|
|||
}
|
||||
}
|
||||
|
||||
if (UIWindow* window = reinterpret_cast<UIWindow*>(g_windowMgr.unknown_01C0)) {
|
||||
if (UIWindow* window = reinterpret_cast<UIWindow*>(g_windowMgr.minimapZoomWnd)) {
|
||||
window->SendMsg(nullptr, UM_COMMAND, 0x1F6, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -1207,8 +1207,8 @@ void ApplyServiceOptionHideWindow(int id, unsigned char value, bool notify, int
|
|||
}
|
||||
|
||||
CGameMode* mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode());
|
||||
if (mode && mode->unknown_05D0 && !g_serviceOptions.Get(id)) {
|
||||
mode->unknown_05D0->Show(0);
|
||||
if (mode && mode->statusIconTooltip && !g_serviceOptions.Get(id)) {
|
||||
mode->statusIconTooltip->Show(0);
|
||||
}
|
||||
}
|
||||
#pragma inline_depth()
|
||||
|
|
@ -1266,19 +1266,19 @@ void ApplyServiceOptionWeatherFlag(int id, unsigned char value, bool notify, int
|
|||
}
|
||||
}
|
||||
|
||||
g_weatherEffect.unknown_0001 = value ^ 1;
|
||||
g_weatherEffect.enabled = value ^ 1;
|
||||
}
|
||||
#pragma inline_depth()
|
||||
|
||||
// OFFSET: 0x006C5AD0
|
||||
// FUNCTION: fn_06364
|
||||
void ApplyServiceOptionWindow27() {
|
||||
if (g_windowMgr.unknown_0304 != 0) {
|
||||
if (g_windowMgr.merchantItemMyShopWnd != 0) {
|
||||
g_windowMgr.Confirm(LookupMessage(MSI_CANT_OPEN_STORE_WHILE_CHAT), 0, true, false, 0, "Message", 0x118, 0x78, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
if (g_windowMgr.unknown_02FC != 0) {
|
||||
if (g_windowMgr.merchantShopMakeWnd != 0) {
|
||||
CMode* mode = g_modeMgr.GetGameMode();
|
||||
if (mode) {
|
||||
mode->SendMsg(MM_REQ_OPENSTORE, 0, 0, 0, 0);
|
||||
|
|
@ -1341,8 +1341,8 @@ void ApplyItemWndServiceOption(int id, unsigned char value, bool notify, int ena
|
|||
}
|
||||
}
|
||||
|
||||
if (g_windowMgr.unknown_01D4) {
|
||||
static_cast<UIItemWnd*>(g_windowMgr.unknown_01D4)->RefreshOptionBox();
|
||||
if (g_windowMgr.itemWnd) {
|
||||
static_cast<UIItemWnd*>(g_windowMgr.itemWnd)->RefreshOptionBox();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1543,7 +1543,7 @@ void CSession::LoadOptionInfo() {
|
|||
}
|
||||
|
||||
g_skinInfo.m_name = this->GetOptionString("SkinName", "<Basic Skin>");
|
||||
this->unknown_1708 = g_serviceOptions.Get(0x2E);
|
||||
this->monsterInfoEnabled = g_serviceOptions.Get(0x2E);
|
||||
g_showBattleFieldIcon = this->GetOptionInteger("ShowBattleFieldIcon", 1) != 0;
|
||||
Singleton<CGameSettingsMgr>::GetInstance()->ApplyScriptOption(ConfineCursor, "MouseExclusive");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue