From fdbebbba25e8d871acbbee49c455f7898be4e5fa Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Sun, 8 Nov 2026 18:16:10 +0000 Subject: [PATCH] Maintenance: Second pass on unknown_XXXX members: 140 more renamed (61 files), named from the original binary (accesses at this+offse Batch #14947 by ragnarok-clanker: no function's compiled code changes; checked with 596 compiled unit(s), including every includer of Source/Client/Input/Language.h, Source/Client/Input/LanguageTC.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Mode/EquipWindowLook.h, Source/Client/Session.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GraffiSkill.h, Source/Contents/Actors/GrannyGameActor.h, Source/Contents/Actors/Pc.h, Source/Contents/Camera/Camera.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/Ground/GroundGeometry.h, Source/Contents/Ground/GroundSpatial.h, Source/Contents/Items/ItemInfo.h, Source/Render/SpriteQuad.h, Source/Resource/EZeffectResource.h, Source/Resource/Models/AnimatedModelResource.h, Source/Resource/Models/GrannyModelResource.h, Source/Resource/Models/ModelMesh.h, Source/Resource/World/WorldResource.h, Source/UI/Dialogs/UIChooseWnd.h, Source/UI/Items/UISpellListWnd.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/MiniPartyGrid.h, Source/UI/Quest/UIOngoingQuestInfo.h, Source/UI/Text/UIAchWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UITalkboxTrapInputWnd.h, Source/UI/Window/UIWindowMgr.h. --- Source/ActorPickNode.cpp | 12 ++--- Source/Archive/GPak.cpp | 4 +- Source/Client/Input/Language.cpp | 6 +-- Source/Client/Input/Language.h | 10 ++-- Source/Client/Input/LanguageTC.h | 2 +- Source/Client/Mode/CGameMode.h | 4 +- Source/Client/Mode/CLoginMode.h | 20 ++++---- Source/Client/Mode/EquipWindowLook.h | 2 +- Source/Client/Mode/GameMode.cpp | 14 +++--- Source/Client/Mode/GameModeNotices.cpp | 20 ++++---- Source/Client/Mode/GameModePackets.cpp | 10 ++-- Source/Client/Mode/LoginMode.cpp | 8 ++-- Source/Client/Session.h | 30 ++++++------ Source/Contents/Actors/GameActor.h | 8 ++-- Source/Contents/Actors/GameObject.cpp | 2 +- Source/Contents/Actors/GraffiSkill.h | 2 +- Source/Contents/Actors/GrannyGameActor.h | 6 +-- Source/Contents/Actors/Pc.h | 2 +- Source/Contents/Actors/Player.cpp | 2 +- Source/Contents/Actors/RenderObject.cpp | 4 +- Source/Contents/Actors/Skill.cpp | 6 +-- Source/Contents/Camera/Camera.h | 8 ++-- Source/Contents/ClientItemLists.cpp | 2 +- Source/Contents/Effects/EffectEmitter.h | 2 +- .../Contents/Effects/EffectPrimitiveState.h | 2 +- Source/Contents/FlyingShipRouteInfo.h | 12 ++--- Source/Contents/Ground/GroundGeometry.h | 2 +- Source/Contents/Ground/GroundSpatial.h | 4 +- Source/Contents/Items/ItemInfo.h | 6 +-- Source/Contents/Jobs/JobInheritance.cpp | 2 +- Source/Contents/Messenger/ClientMessenger.cpp | 4 +- Source/Contents/Sound/SoundMaker.cpp | 2 +- Source/Contents/World/WorldProximity.cpp | 4 +- Source/Render/SpriteQuad.h | 6 +-- Source/Resource/EZeffectResource.h | 2 +- .../Resource/Models/AnimatedModelResource.cpp | 4 +- .../Resource/Models/AnimatedModelResource.h | 8 ++-- Source/Resource/Models/GrannyModelResource.h | 10 ++-- Source/Resource/Models/ModelMesh.h | 2 +- Source/Resource/World/WorldResource.cpp | 2 +- Source/Resource/World/WorldResource.h | 2 +- Source/UI/Acceptance/UIChooseSellBuyWnd.cpp | 28 +++++------ Source/UI/Buttons/UITextButton.cpp | 2 +- Source/UI/Dialogs/UIChooseWnd.cpp | 2 +- Source/UI/Dialogs/UIChooseWnd.h | 4 +- Source/UI/Item/UIEquipmentPropertiesWnd.cpp | 2 +- Source/UI/Items/UISpellListWnd.h | 2 +- Source/UI/Lists/UIListBoxTemplate.h | 12 ++--- Source/UI/MiniPartyGrid.h | 2 +- Source/UI/Quest/UIOngoingQuestInfo.cpp | 2 +- Source/UI/Quest/UIOngoingQuestInfo.h | 4 +- .../UISelectPackageItemBox.cpp | 4 +- Source/UI/Text/UIAchWnd.h | 2 +- Source/UI/Window/UIControl.cpp | 48 +++++++++---------- Source/UI/Window/UIMonsterInfoWnd.h | 2 +- Source/UI/Window/UINavigationWnd.h | 8 ++-- Source/UI/Window/UINewMakeCharWnd.h | 4 +- Source/UI/Window/UINewSelectCharWnd.cpp | 8 ++-- Source/UI/Window/UITalkboxTrapInputWnd.h | 8 ++-- Source/UI/Window/UIWindowMgr.cpp | 2 +- Source/UI/Window/UIWindowMgr.h | 26 +++++----- 61 files changed, 216 insertions(+), 216 deletions(-) diff --git a/Source/ActorPickNode.cpp b/Source/ActorPickNode.cpp index cd2dcfd03..a7b6c9359 100644 --- a/Source/ActorPickNode.cpp +++ b/Source/ActorPickNode.cpp @@ -185,12 +185,12 @@ CView::CView() { this->camera.desiredTarget[0] = 0.0f; this->camera.desiredTarget[1] = 0.0f; this->camera.desiredTarget[2] = 0.0f; - this->unknown_0050[0] = 0.0f; - this->unknown_0050[1] = 0.0f; - this->unknown_0050[2] = 0.0f; - this->unknown_0068[0] = 0.0f; - this->unknown_0068[1] = 0.0f; - this->unknown_0068[2] = 0.0f; + this->backupCurrentTarget[0] = 0.0f; + this->backupCurrentTarget[1] = 0.0f; + this->backupCurrentTarget[2] = 0.0f; + this->backupDesiredTarget[0] = 0.0f; + this->backupDesiredTarget[1] = 0.0f; + this->backupDesiredTarget[2] = 0.0f; this->frame.eye[0] = 0.0f; this->frame.eye[1] = 0.0f; this->frame.eye[2] = 0.0f; diff --git a/Source/Archive/GPak.cpp b/Source/Archive/GPak.cpp index e92547471..25c3fea7e 100644 --- a/Source/Archive/GPak.cpp +++ b/Source/Archive/GPak.cpp @@ -699,8 +699,8 @@ struct HashTable_655340 { HashNode_655340* head; unsigned int size; HashBucket_655340* buckets; - unsigned int unknown_10; - unsigned int unknown_14; + unsigned int bucketsEnd; + unsigned int bucketsCapacityEnd; unsigned int mask; unsigned int bucket_count; diff --git a/Source/Client/Input/Language.cpp b/Source/Client/Input/Language.cpp index 52f51ad8f..f9bb8d5f7 100644 --- a/Source/Client/Input/Language.cpp +++ b/Source/Client/Input/Language.cpp @@ -439,10 +439,10 @@ UIRoundBoxTooltipWnd::UIRoundBoxTooltipWnd() : UIFrameWnd(0), viewer(nullptr) { // OFFSET: 0x00ACC7F0 // FUNCTION: fn_17750 CLanguageBase::CLanguageBase() - : unknown_0004(), candidateList(nullptr), candidateCount(0), pageSize(0), selection(0), + : fakeInput(), candidateList(nullptr), candidateCount(0), pageSize(0), selection(0), candidateStorage(), text(), cursor(0), anchor(0), composition(), candidate(), - language(static_cast(reinterpret_cast(GetKeyboardLayout(0)))), unknown_0094(0), - unknown_0098(0), servicePrefix() { + language(static_cast(reinterpret_cast(GetKeyboardLayout(0)))), underlineStart(0), + underlineEnd(0), servicePrefix() { this->codePage = g_inlineCharset ? LanguageCodePage(this->language) : g_textCodePage; switch (static_cast(GetUserDefaultLangID() & 0x3FF)) { diff --git a/Source/Client/Input/Language.h b/Source/Client/Input/Language.h index d26078cd1..54d561103 100644 --- a/Source/Client/Input/Language.h +++ b/Source/Client/Input/Language.h @@ -23,14 +23,14 @@ struct CLanguageBase { virtual void EndComposition(); virtual void ResetCandidate(); - /* 0004 */ std::deque unknown_0004; + /* 0004 */ std::deque fakeInput; /* 0018 */ CANDIDATELIST* candidateList; /* 001C */ int candidateCount; /* 0020 */ int pageSize; /* 0024 */ int selection; /* 0028 */ std::vector candidateStorage; /* 0034 */ std::string text; - /* 004C */ int unknown_004C; + /* 004C */ int inputCursor; /* 0050 */ int cursor; /* 0054 */ int anchor; /* 0058 */ std::string composition; @@ -40,8 +40,8 @@ struct CLanguageBase { /* 008D */ unsigned char unknown_008D; /* 008E */ std::uint16_t language; /* 0090 */ unsigned codePage; - /* 0094 */ int unknown_0094; - /* 0098 */ int unknown_0098; + /* 0094 */ int underlineStart; + /* 0098 */ int underlineEnd; /* 009C */ std::string servicePrefix; /* 00B4 */ std::uint16_t alternateLanguage; /* 00B6 */ unsigned char unknown_00B6[2]; @@ -93,7 +93,7 @@ struct CLanguageTH : CLanguageBase { }; #if defined(_WIN32) && !defined(_WIN64) -static_assert(offsetof(CLanguageBase, unknown_0004) == 0x0004); +static_assert(offsetof(CLanguageBase, fakeInput) == 0x0004); static_assert(offsetof(CLanguageBase, candidateList) == 0x0018); static_assert(offsetof(CLanguageBase, candidateStorage) == 0x0028); static_assert(offsetof(CLanguageBase, text) == 0x0034); diff --git a/Source/Client/Input/LanguageTC.h b/Source/Client/Input/LanguageTC.h index f3d58bd47..dce446459 100644 --- a/Source/Client/Input/LanguageTC.h +++ b/Source/Client/Input/LanguageTC.h @@ -17,7 +17,7 @@ struct TraditionalKeyMapping { struct CLanguageTC : CLanguageBase { /* 00B8 */ std::list keys; /* 00C0 */ std::array mappings; - /* 04C0 */ unsigned char unknown_04C0; + /* 04C0 */ unsigned char keyStrokeEnabled; /* 04C1 */ std::uint8_t unknown04C1; /* 04C2 */ unsigned char unknown_04C2[2]; diff --git a/Source/Client/Mode/CGameMode.h b/Source/Client/Mode/CGameMode.h index e74881c26..51290b3a7 100644 --- a/Source/Client/Mode/CGameMode.h +++ b/Source/Client/Mode/CGameMode.h @@ -70,7 +70,7 @@ struct SkillListEntry { /* 0008 */ std::int16_t spCost; /* 000A */ std::int16_t range; /* 000C */ unsigned char upgradable; - /* 000D */ std::int16_t unknown_000D; + /* 000D */ std::int16_t learnedLevel; }; #pragma pack(pop) @@ -124,7 +124,7 @@ public: /* 00FC */ int isWaitingEnterRoom; /* 0100 */ unsigned char equipmentRequestState[0x18]; /* 0118 */ std::string refuseWhisperName; - /* 0130 */ std::string unknown_0130; + /* 0130 */ std::string streamFileName; /* 0148 */ std::string exchangeName; /* 0160 */ CActorNameCardHolder nameCard; /* 0194 */ std::map guildMemberStatusCache; diff --git a/Source/Client/Mode/CLoginMode.h b/Source/Client/Mode/CLoginMode.h index a8f4a2409..ffff4bbd9 100644 --- a/Source/Client/Mode/CLoginMode.h +++ b/Source/Client/Mode/CLoginMode.h @@ -59,8 +59,8 @@ struct CharacterInfo { /* 008E */ char mapName[16]; /* 009E */ std::int32_t deleteDate; /* 00A2 */ std::int32_t robe; - /* 00A6 */ std::int32_t unknown_00A6; - /* 00AA */ std::int32_t unknown_00AA; + /* 00A6 */ std::int32_t slotChangeCount; + /* 00AA */ std::int32_t nameChangeCount; /* 00AE */ unsigned char sex; }; @@ -74,12 +74,12 @@ struct CharacterSlotExtension { #pragma pack(pop) struct LoginStringRecord { - /* 0000 */ std::string unknown_0000; - /* 0018 */ std::string unknown_0018; - /* 0030 */ std::string unknown_0030; - /* 0048 */ std::string unknown_0048; - /* 0060 */ std::string unknown_0060; - /* 0078 */ unsigned char unknown_0078[8]; + /* 0000 */ std::string display; + /* 0018 */ std::string description; + /* 0030 */ std::string balloon; + /* 0048 */ std::string address; + /* 0060 */ std::string port; + /* 0078 */ unsigned char typeAndVersion[8]; }; #if defined(_WIN32) && !defined(_WIN64) @@ -132,7 +132,7 @@ public: /* 6F45 */ unsigned char unknown_6F45[0x3]; /* 6F48 */ int selectedAccount; /* 6F4C */ int selectedSecondaryAccount; - /* 6F50 */ std::string unknown_6F50; + /* 6F50 */ std::string keycryptErrorInfo; /* 6F68 */ std::vector mapStates; /* 6F74 */ bool loginResponseReceived; /* 6F75 */ bool otpPending; @@ -216,7 +216,7 @@ static_assert(offsetof(CLoginMode, characterCount) == 0x1CC); static_assert(offsetof(CLoginMode, receivedCharacterCount) == 0x1D8); static_assert(offsetof(CLoginMode, characters) == 0x4068); static_assert(offsetof(CLoginMode, slotExtension) == 0x6EFC); -static_assert(offsetof(CLoginMode, unknown_6F50) == 0x6F50); +static_assert(offsetof(CLoginMode, keycryptErrorInfo) == 0x6F50); static_assert(offsetof(CLoginMode, mapStates) == 0x6F68); static_assert(sizeof(CLoginMode) == 0x6F7C); #endif diff --git a/Source/Client/Mode/EquipWindowLook.h b/Source/Client/Mode/EquipWindowLook.h index 6d5569552..ae47c476a 100644 --- a/Source/Client/Mode/EquipWindowLook.h +++ b/Source/Client/Mode/EquipWindowLook.h @@ -13,7 +13,7 @@ struct EquipWindowLook { /* 0018 */ int bodyPalette; /* 001C */ int headPalette; /* 0020 */ int robe; - /* 0024 */ int unknown_0024; + /* 0024 */ int bodyCostume; /* 0028 */ char name[24]; }; diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index b09260e30..9ea715e63 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -6084,7 +6084,7 @@ static_assert(sizeof(GameModeStoredItemEntry) == 0x19); #pragma pack(push, 1) struct GameModeUiMessage { - /* 0000 */ std::uint16_t unknown_0000; + /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ int values[6]; @@ -6092,7 +6092,7 @@ struct GameModeUiMessage { }; struct GameModeUiWhisperMessage { - /* 0000 */ std::uint16_t unknown_0000; + /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ char target[0x19]; @@ -6100,7 +6100,7 @@ struct GameModeUiWhisperMessage { }; struct GameModeUiKindTextMessage { - /* 0000 */ std::uint16_t unknown_0000; + /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ int kind; @@ -6109,7 +6109,7 @@ struct GameModeUiKindTextMessage { }; struct GameModeUiNavigationMessage { - /* 0000 */ std::uint16_t unknown_0000; + /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ char name[0x1E]; @@ -6122,7 +6122,7 @@ struct GameModeUiNavigationMessage { }; struct GameModeUiDestinationMessage { - /* 0000 */ std::uint16_t unknown_0000; + /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ char mapName[0x1E]; @@ -6131,7 +6131,7 @@ struct GameModeUiDestinationMessage { }; struct GameModeUiDragMessage { - /* 0000 */ std::uint16_t unknown_0000; + /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ int windowId; @@ -8016,7 +8016,7 @@ void CGameMode::ReceiveSkillList(int packetType, const std::vector(item.options)[index] = packet->options[index]; } - item.grade = packet->unknown_002F; + item.grade = packet->grade; if (lookup == 0) { g_session.UpdateInventoryItem(item, 1); @@ -7528,7 +7528,7 @@ void CGameMode::ReceiveRankingList(const unsigned char* data) { struct GuildStorageLogItem { /* 0000 */ ITEM_INFO item; - /* 00F8 */ unsigned char unknown_00F8; + /* 00F8 */ unsigned char highlighted; }; #pragma pack(push, 1) @@ -7537,7 +7537,7 @@ struct GuildStorageLogItemRecord { /* 0004 */ std::uint32_t itemId; /* 0008 */ std::uint32_t quantity; /* 000C */ unsigned char operation; - /* 000D */ unsigned char unknown_000D[8]; + /* 000D */ unsigned char uniqueId[8]; /* 0015 */ unsigned char identified; /* 0016 */ std::int16_t type; /* 0018 */ std::uint32_t cards[4]; diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index 05bf8cae7..7b3c6d2fe 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -6495,7 +6495,7 @@ void CGameMode::ApplyStatusChange( #pragma pack(push, 1) struct Window107Entry { - /* 0000 */ unsigned char unknown_0000[0x18]; + /* 0000 */ unsigned char repairItemData[0x18]; }; #pragma pack(pop) @@ -8050,7 +8050,7 @@ void CGameMode::ReceiveEquipWindowMicroscope5(const unsigned char* packet) { g_equipWindowLook.headPalette = *reinterpret_cast(packet + 0x28); memcpy_s(g_equipWindowLook.name, sizeof(g_equipWindowLook.name), packet + 4, sizeof(g_equipWindowLook.name)); g_equipWindowLook.robe = *reinterpret_cast(packet + 0x26); - g_equipWindowLook.unknown_0024 = *reinterpret_cast(packet + 0x2C); + g_equipWindowLook.bodyCostume = *reinterpret_cast(packet + 0x2C); if (!g_windowMgr.CloseWindow(WID_EQUIPWND_VIEWOTHER_1)) { g_windowMgr.EnsureWindow(WID_EQUIPWND_VIEWOTHER_1); @@ -8085,7 +8085,7 @@ void CGameMode::ReceiveEquipWindowMicroscope6(const unsigned char* packet) { g_equipWindowLook.headPalette = *reinterpret_cast(packet + 0x28); memcpy_s(g_equipWindowLook.name, sizeof(g_equipWindowLook.name), packet + 4, sizeof(g_equipWindowLook.name)); g_equipWindowLook.robe = *reinterpret_cast(packet + 0x26); - g_equipWindowLook.unknown_0024 = *reinterpret_cast(packet + 0x2C); + g_equipWindowLook.bodyCostume = *reinterpret_cast(packet + 0x2C); if (!g_windowMgr.CloseWindow(WID_EQUIPWND_VIEWOTHER_1)) { g_windowMgr.EnsureWindow(WID_EQUIPWND_VIEWOTHER_1); @@ -15826,7 +15826,7 @@ struct PartyMemberInfoPacket { /* 0000 */ std::uint16_t id; /* 0002 */ std::uint32_t accountId; /* 0006 */ std::int32_t leader; - /* 000A */ unsigned char unknown_000A[4]; + /* 000A */ unsigned char position[4]; /* 000E */ unsigned char offline; /* 000F */ char partyName[24]; /* 0027 */ char memberName[24]; @@ -22304,7 +22304,7 @@ void CGameMode::ProcessIncomingPackets() { entry.spCost = record->spCost; entry.range = record->range; entry.upgradable = record->upgradable; - entry.unknown_000D = record->level; + entry.learnedLevel = record->level; skills.push_back(entry); } this->ReceiveSkillList(*reinterpret_cast(g_gameModePacketBuffer), skills); diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp index 807fc6cd0..06ddc1c31 100644 --- a/Source/Client/Mode/LoginMode.cpp +++ b/Source/Client/Mode/LoginMode.cpp @@ -984,7 +984,7 @@ void CLoginMode::End() { g_soundMgr->EndSamples(); ResourceMgr::Instance().ClearUnused(); g_renderer->atlas.Clear(); - this->unknown_6F50.clear(); + this->keycryptErrorInfo.clear(); } // OFFSET: 0x00D975C0 @@ -2228,7 +2228,7 @@ void CLoginMode::ShowLoginError(int code, int argument) { // OFFSET: 0x00D8C6A0 // FUNCTION: fn_22258 -CLoginMode::CLoginMode() : wallpaperName(), noticeCommands(), unknown_6F2C(), accountInfo(), unknown_6F50(), mapStates() { +CLoginMode::CLoginMode() : wallpaperName(), noticeCommands(), unknown_6F2C(), accountInfo(), keycryptErrorInfo(), mapStates() { this->fadeInRequested = 1; this->nextKeepaliveTime = timeGetTime() + 12000; this->savedInlineCharset = g_inlineCharset; @@ -3391,7 +3391,7 @@ struct CharServerEnterPacket { /* 0002 */ std::uint32_t aid; /* 0006 */ int authCode; /* 000A */ int userLevel; - /* 000E */ std::uint16_t unknown_000E; + /* 000E */ std::uint16_t clientType; /* 0010 */ unsigned char sex; }; @@ -3982,7 +3982,7 @@ void CLoginMode::OnChangeState(int value) { g_charServerAccountIdPending = 1; CharServerEnterPacket packet; packet.id = 0x65; - packet.unknown_000E = 0; + packet.clientType = 0; packet.aid = g_session.m_aid; packet.authCode = account.authCode; packet.userLevel = account.userLevel; diff --git a/Source/Client/Session.h b/Source/Client/Session.h index a074fabf6..01c613ad0 100644 --- a/Source/Client/Session.h +++ b/Source/Client/Session.h @@ -161,7 +161,7 @@ struct SubChatWndInfo { struct SessionEntry00A4 { /* 0000 */ std::string name; - /* 0018 */ unsigned char unknown_0018[0x0C]; + /* 0018 */ unsigned char skillIdPositionAndMaxLevel[0x0C]; /* 0024 */ std::vector values; }; @@ -185,8 +185,8 @@ public: /* 008C */ std::list m_mercSkills; /* 0094 */ std::list m_mainCooldownIcons; /* 009C */ std::list m_alternateCooldownIcons; - /* 00A4 */ std::map unknown_00A4; - /* 00AC */ std::map unknown_00AC; + /* 00A4 */ std::map m_skillTreePositions; + /* 00AC */ std::map m_jobInheritance; /* 00B4 */ int m_simplifiedSkillList; /* 00B8 */ int m_showSkillDescription; /* 00BC */ unsigned char m_hotkeyPage; @@ -273,13 +273,13 @@ public: /* 0F60 */ int m_autoOpenFriendWhisperWindow; /* 0F64 */ unsigned char whisperOptions[0x08]; /* 0F6C */ const char* const* m_humanMaleHeadNames; - /* 0F70 */ unsigned char unknown_0F70[0x08]; + /* 0F70 */ unsigned char m_humanMaleHeadNamesEndAndCapacity[0x08]; /* 0F78 */ const char* const* m_humanFemaleHeadNames; - /* 0F7C */ unsigned char unknown_0F7C[0x08]; + /* 0F7C */ unsigned char m_humanFemaleHeadNamesEndAndCapacity[0x08]; /* 0F84 */ const char* const* m_imfNames; /* 0F88 */ unsigned char additionalSpriteNames[0x14]; /* 0F9C */ const char* const* m_shieldJobNames; - /* 0FA0 */ unsigned char unknown_0FA0[0x08]; + /* 0FA0 */ unsigned char m_shieldJobNamesEndAndCapacity[0x08]; /* 0FA8 */ std::vector m_jobNameTable; /* 0FB4 */ std::map m_jobNameTableWoman; /* 0FBC */ std::map m_jobNameTableMan; @@ -301,7 +301,7 @@ public: /* 1050 */ int petEggIndex; /* 1054 */ int petPreviousHunger; /* 1058 */ int m_petActionTable[5][5][7]; - /* 1314 */ std::string unknown_1314[25]; + /* 1314 */ std::string m_petTalkStrings[25]; /* 156C */ XmlDocument m_petTalkTable; /* 159C */ XmlDocument m_monsterSkillInfo; /* 15CC */ XmlDocument m_monsterTalkTable; @@ -369,12 +369,12 @@ public: /* 5280 */ std::list unknown_5280; /* 5288 */ unsigned char unknown_5288[0x0C]; /* 5294 */ const char* const* m_bodyJobNames; - /* 5298 */ unsigned char unknown_5298[0x08]; + /* 5298 */ unsigned char m_bodyJobNamesEndAndCapacity[0x08]; /* 52A0 */ const char* const* m_sexNames; - /* 52A4 */ unsigned char unknown_52A4[0x08]; + /* 52A4 */ unsigned char m_sexNamesEndAndCapacity[0x08]; /* 52AC */ const char* const* m_weaponNamesBegin; /* 52B0 */ const char* const* m_weaponNamesEnd; - /* 52B4 */ unsigned char unknown_52B4[0x04]; + /* 52B4 */ unsigned char m_weaponNamesCapacityEnd[0x04]; /* 52B8 */ std::vector m_accessoryNames; /* 52C4 */ std::vector m_robeNames; /* 52D0 */ std::vector m_navigationForbiddenMaps; @@ -417,10 +417,10 @@ public: /* 54A8 */ int partyItemDistribute; /* 54AC */ std::string partyRequestName; /* 54C4 */ std::string partyName; - /* 54DC */ std::string unknown_54DC; - /* 54F4 */ std::string unknown_54F4; + /* 54DC */ std::string accountAddress; + /* 54F4 */ std::string registrationUrl; /* 550C */ std::string storeTitle; - /* 5524 */ std::string unknown_5524; + /* 5524 */ std::string accountPort; /* 553C */ std::string m_serverName; union { /* 5554 */ unsigned char whisperRecordStorage[4]; @@ -559,9 +559,9 @@ public: /* 6184 */ int playerAppearanceState; /* 6188 */ int m_lastIntervalTime; /* 618C */ const char* const* m_doramMaleHeadNames; - /* 6190 */ unsigned char unknown_6190[0x08]; + /* 6190 */ unsigned char m_doramMaleHeadNamesEndAndCapacity[0x08]; /* 6198 */ const char* const* m_doramFemaleHeadNames; - /* 619C */ unsigned char unknown_619C[0x08]; + /* 619C */ unsigned char m_doramFemaleHeadNamesEndAndCapacity[0x08]; /* 61A4 */ int automaticSkillHotkey; union { /* 61A8 */ unsigned char hotkeyAndSortOptions[0x10]; diff --git a/Source/Contents/Actors/GameActor.h b/Source/Contents/Actors/GameActor.h index 871f87de1..897b1c76f 100644 --- a/Source/Contents/Actors/GameActor.h +++ b/Source/Contents/Actors/GameActor.h @@ -26,7 +26,7 @@ struct ActorHitInfo { /* 0008 */ int extraDamage; /* 000C */ int type; /* 0010 */ std::uint32_t targetAid; - /* 0014 */ int unknown_0014; + /* 0014 */ int startTime; /* 0018 */ int hitCount; /* 001C */ int cellX; /* 0020 */ int cellY; @@ -40,7 +40,7 @@ struct ActorSkillInfo { /* 0004 */ int damage; /* 0008 */ int type; /* 000C */ std::uint32_t targetAid; - /* 0010 */ int unknown_0010; + /* 0010 */ int startTime; /* 0014 */ int level; /* 0018 */ int hitCount; /* 001C */ int cellX; @@ -109,7 +109,7 @@ public: /* 0294 */ int xSize; /* 0298 */ int ySize; /* 029C */ unsigned char headType[0x04]; - /* 02A0 */ std::list unknown_02A0; + /* 02A0 */ std::list willBeAttackList; /* 02A8 */ std::list willBeAttackedList; /* 02B0 */ int willBeDead; /* 02B4 */ int hasLevelAura; @@ -333,7 +333,7 @@ static_assert(offsetof(CGameActor, lastServerTime) == 0x258); static_assert(offsetof(CGameActor, actorWindows) == 0x264); static_assert(offsetof(CGameActor, nameWidth) == 0x290); static_assert(offsetof(CGameActor, ySize) == 0x298); -static_assert(offsetof(CGameActor, unknown_02A0) == 0x2A0); +static_assert(offsetof(CGameActor, willBeAttackList) == 0x2A0); static_assert(offsetof(CGameActor, willBeAttackedList) == 0x2A8); static_assert(offsetof(CGameActor, levelAuraType) == 0x2B8); static_assert(offsetof(CGameActor, damageDestX) == 0x2D0); diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index d93c0eb38..572561137 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -1160,7 +1160,7 @@ struct PcMoveEntry { /* 0054 */ int accessory3; /* 0058 */ int headPalette; /* 005C */ int bodyPalette; - /* 0060 */ int unknown_0060; + /* 0060 */ int headDir; /* 0064 */ int guildId; /* 0068 */ int guildVersion; /* 006C */ int honor; diff --git a/Source/Contents/Actors/GraffiSkill.h b/Source/Contents/Actors/GraffiSkill.h index 7a6dc595f..0b563a1dd 100644 --- a/Source/Contents/Actors/GraffiSkill.h +++ b/Source/Contents/Actors/GraffiSkill.h @@ -18,7 +18,7 @@ public: virtual void BuildTexture(); virtual void ReleaseTexture(); - /* 0440 */ unsigned char unknown_0440[0x04]; + /* 0440 */ unsigned char m_masterGid[0x04]; /* 0444 */ int m_cellX; /* 0448 */ int m_cellY; /* 044C */ CTexture* m_canvas; diff --git a/Source/Contents/Actors/GrannyGameActor.h b/Source/Contents/Actors/GrannyGameActor.h index ebd4446b1..e27e4d898 100644 --- a/Source/Contents/Actors/GrannyGameActor.h +++ b/Source/Contents/Actors/GrannyGameActor.h @@ -51,10 +51,10 @@ public: /* 053D */ unsigned char unknown_053D[0x03]; /* 0540 */ unsigned brightness; /* 0544 */ int motion; - /* 0548 */ unsigned char unknown_0548[0x04]; + /* 0548 */ unsigned char currentFrame[0x04]; /* 054C */ char name[0x104]; /* 0650 */ int renderState; - /* 0654 */ int unknown_0654; + /* 0654 */ int cellTexture; /* 0658 */ granny_control* controls[20]; /* 06A8 */ unsigned char initializeFacing; /* 06A9 */ unsigned char unknown_06A9[0x03]; @@ -62,7 +62,7 @@ public: /* 0724 */ std::uint16_t* meshIndices[30]; /* 079C */ int meshTriangleCounts[30]; /* 0814 */ matrix meshTransforms[30]; - /* 0DB4 */ unsigned char unknown_0DB4[0x04]; + /* 0DB4 */ unsigned char worldPose[0x04]; /* 0DB8 */ CTexture* texture; /* 0DBC */ std::vector litPositions; }; diff --git a/Source/Contents/Actors/Pc.h b/Source/Contents/Actors/Pc.h index 7c9671739..13663898b 100644 --- a/Source/Contents/Actors/Pc.h +++ b/Source/Contents/Actors/Pc.h @@ -323,7 +323,7 @@ public: /* 0F35 */ unsigned char unknown_0F35[0x03]; /* 0F38 */ unsigned brightness; /* 0F3C */ int motion; - /* 0F40 */ unsigned char unknown_0F40[4]; + /* 0F40 */ unsigned char currentFrame[4]; /* 0F44 */ char modelName[0x104]; /* 1048 */ unsigned char unknown_1048[8]; /* 1050 */ granny_control* controls[20]; diff --git a/Source/Contents/Actors/Player.cpp b/Source/Contents/Actors/Player.cpp index c5a422586..641440ef7 100644 --- a/Source/Contents/Actors/Player.cpp +++ b/Source/Contents/Actors/Player.cpp @@ -4757,7 +4757,7 @@ struct PcMoveEntry { /* 0054 */ int accessory3; /* 0058 */ int headPalette; /* 005C */ int bodyPalette; - /* 0060 */ int unknown_0060; + /* 0060 */ int headDir; /* 0064 */ int guildId; /* 0068 */ int guildVersion; /* 006C */ int honor; diff --git a/Source/Contents/Actors/RenderObject.cpp b/Source/Contents/Actors/RenderObject.cpp index 2df20458c..b769745d1 100644 --- a/Source/Contents/Actors/RenderObject.cpp +++ b/Source/Contents/Actors/RenderObject.cpp @@ -2684,7 +2684,7 @@ void CCharacterNpc::Render(int) { } struct CharacterNpcViewInfo { - /* 0000 */ int unknown_0000; + /* 0000 */ int aid; /* 0004 */ int job; /* 0008 */ int unknown_0008[10]; /* 0030 */ int standAccessory; @@ -3452,7 +3452,7 @@ C3dGrannyGameActor::C3dGrannyGameActor(const char* name) { this->alpha = 0xFF; std::strcpy(this->name, name); this->renderState = 0; - this->unknown_0654 = 0; + this->cellTexture = 0; for (int index = 0; index < 20; ++index) { this->controls[index] = nullptr; } diff --git a/Source/Contents/Actors/Skill.cpp b/Source/Contents/Actors/Skill.cpp index 306585351..efe26ff9a 100644 --- a/Source/Contents/Actors/Skill.cpp +++ b/Source/Contents/Actors/Skill.cpp @@ -38,14 +38,14 @@ struct SkillHitMessage { /* 0000 */ int skillId; /* 0004 */ int damage; - /* 0008 */ int unknown_0008; + /* 0008 */ int action; /* 000C */ std::uint32_t targetAid; - /* 0010 */ int unknown_0010; + /* 0010 */ int startTime; /* 0014 */ int monsterValue; /* 0018 */ int hitCount; /* 001C */ int cellX; /* 0020 */ int cellY; - /* 0024 */ int unknown_0024; + /* 0024 */ int attackMotionTime; /* 0028 */ int motionSpeed; }; diff --git a/Source/Contents/Camera/Camera.h b/Source/Contents/Camera/Camera.h index a4f384bf3..8f4f16126 100644 --- a/Source/Contents/Camera/Camera.h +++ b/Source/Contents/Camera/Camera.h @@ -39,10 +39,10 @@ public: /* 0004 */ CameraShake shake; /* 0020 */ CameraState camera; - /* 0050 */ float unknown_0050[3]; - /* 005C */ unsigned char unknown_005C[0xC]; - /* 0068 */ float unknown_0068[3]; - /* 0074 */ unsigned char unknown_0074[0xC]; + /* 0050 */ float backupCurrentTarget[3]; + /* 005C */ unsigned char backupCurrentAnglesAndDistance[0xC]; + /* 0068 */ float backupDesiredTarget[3]; + /* 0074 */ unsigned char backupDesiredAnglesAndDistance[0xC]; /* 0080 */ CameraFrame frame; /* 00F8 */ WorldViewSpatial spatial; /* 01B0 */ CWorld* scene; diff --git a/Source/Contents/ClientItemLists.cpp b/Source/Contents/ClientItemLists.cpp index 5d014b441..941949c41 100644 --- a/Source/Contents/ClientItemLists.cpp +++ b/Source/Contents/ClientItemLists.cpp @@ -206,7 +206,7 @@ public: unsigned char unknown_0004[0x9]; bool m_dirty; unsigned char unknown_000E[0x12]; - UIWindow* unknown_0020; + UIWindow* m_window; /* 0024 */ std::unordered_map properties1; /* 0044 */ unsigned char unknown_0044[0x1B8]; diff --git a/Source/Contents/Effects/EffectEmitter.h b/Source/Contents/Effects/EffectEmitter.h index 5329a51c6..05a2afb7d 100644 --- a/Source/Contents/Effects/EffectEmitter.h +++ b/Source/Contents/Effects/EffectEmitter.h @@ -32,7 +32,7 @@ struct EZ2STREmitter { /* 3F5D */ unsigned char fadeOut; /* 3F5E */ unsigned char unknown_3F5E[0x3A]; /* 3F98 */ int lifetimeLimit; - /* 3F9C */ int unknown_3F9C; + /* 3F9C */ int remainingLoops; /* 3FA0 */ int duration; /* 3FA4 */ float rotationAngle; /* 3FA8 */ float pitch; diff --git a/Source/Contents/Effects/EffectPrimitiveState.h b/Source/Contents/Effects/EffectPrimitiveState.h index 71dae6d7b..12410d425 100644 --- a/Source/Contents/Effects/EffectPrimitiveState.h +++ b/Source/Contents/Effects/EffectPrimitiveState.h @@ -88,7 +88,7 @@ struct EffectPrimitiveState { /* 0200 */ int changePoint; /* 0204 */ unsigned totalTexture; /* 0208 */ std::uint32_t playWaveType; - /* 020C */ unsigned char unknown_020C[40]; + /* 020C */ unsigned char notifyCounts[40]; /* 0234 */ std::uint32_t RGBCycleDelay; /* 0238 */ std::uint32_t commonPattern; /* 023C */ int red; diff --git a/Source/Contents/FlyingShipRouteInfo.h b/Source/Contents/FlyingShipRouteInfo.h index 92b92b0c5..c040c47e6 100644 --- a/Source/Contents/FlyingShipRouteInfo.h +++ b/Source/Contents/FlyingShipRouteInfo.h @@ -10,11 +10,11 @@ struct WorldViewRecord; struct FlyingShipRouteEntry { /* 0000 */ std::string name; - /* 0018 */ int unknown_0018[4]; - /* 0028 */ int unknown_0028; + /* 0018 */ int areaBounds[4]; + /* 0028 */ int areaFlags; /* 002C */ float screenPosition[2]; - /* 0034 */ float unknown_0034; - /* 0038 */ float unknown_0038; + /* 0034 */ float width; + /* 0038 */ float height; FlyingShipRouteEntry() = default; FlyingShipRouteEntry(const FlyingShipRouteEntry& other) = default; @@ -56,8 +56,8 @@ public: #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(FlyingShipRouteEntry) == 0x3C); -static_assert(offsetof(FlyingShipRouteEntry, unknown_0018) == 0x18); -static_assert(offsetof(FlyingShipRouteEntry, unknown_0038) == 0x38); +static_assert(offsetof(FlyingShipRouteEntry, areaBounds) == 0x18); +static_assert(offsetof(FlyingShipRouteEntry, height) == 0x38); static_assert(sizeof(CFlyingShipRouteInfo) == 0x50); static_assert(offsetof(CFlyingShipRouteInfo, entries) == 0x04); static_assert(offsetof(CFlyingShipRouteInfo, routeReset) == 0x28); diff --git a/Source/Contents/Ground/GroundGeometry.h b/Source/Contents/Ground/GroundGeometry.h index 30126987b..bed4b9288 100644 --- a/Source/Contents/Ground/GroundGeometry.h +++ b/Source/Contents/Ground/GroundGeometry.h @@ -63,7 +63,7 @@ public: /* 000C */ int height; /* 0010 */ float cellSize; /* 0014 */ GroundLightmapSet lightmapSet; - /* 0034 */ std::uint32_t unknown_0034; + /* 0034 */ std::uint32_t surfaceCount; /* 0038 */ float waterLevel; /* 003C */ int waterAnimation; /* 0040 */ int waterPitch; diff --git a/Source/Contents/Ground/GroundSpatial.h b/Source/Contents/Ground/GroundSpatial.h index 9c2dd3157..6494ba9b3 100644 --- a/Source/Contents/Ground/GroundSpatial.h +++ b/Source/Contents/Ground/GroundSpatial.h @@ -12,13 +12,13 @@ struct GroundQuad { GroundQuad(); /* 0000 */ float vertices[4][8]; - /* 0080 */ std::uint32_t unknown_0080; + /* 0080 */ std::uint32_t vertexOffset; /* 0084 */ CTexture* texture; /* 0088 */ CTexture* lightmapTexture; /* 008C */ GroundLightmap* lightmap; /* 0090 */ std::uint32_t color; /* 0094 */ std::uint32_t selected; - /* 0098 */ std::uint32_t unknown_0098; + /* 0098 */ std::uint32_t materialId; }; struct GroundCell { diff --git a/Source/Contents/Items/ItemInfo.h b/Source/Contents/Items/ItemInfo.h index 493de3af6..20c49899f 100644 --- a/Source/Contents/Items/ItemInfo.h +++ b/Source/Contents/Items/ItemInfo.h @@ -8,18 +8,18 @@ #include struct RawItemData { - /* 0000 */ std::uint32_t unknown_0000; + /* 0000 */ std::uint32_t source; /* 0004 */ std::uint32_t index; /* 0008 */ std::uint32_t price; /* 000C */ std::uint32_t realPrice; /* 0010 */ std::int32_t quantity; - /* 0014 */ std::uint32_t unknown_0014; + /* 0014 */ std::uint32_t slot; /* 0018 */ std::uint32_t type; /* 001C */ std::uint32_t refiningLevel; /* 0020 */ unsigned char identified; /* 0021 */ unsigned char unknown_0021[27]; /* 003C */ std::string itemId; - /* 0054 */ unsigned char unknown_0054[28]; + /* 0054 */ unsigned char skillNameAndLevel[28]; /* 0070 */ std::uint32_t cards[4]; /* 0080 */ unsigned char unknown_0080[8]; /* 0088 */ std::int32_t optionCount; diff --git a/Source/Contents/Jobs/JobInheritance.cpp b/Source/Contents/Jobs/JobInheritance.cpp index 7cf1da60e..194afae55 100644 --- a/Source/Contents/Jobs/JobInheritance.cpp +++ b/Source/Contents/Jobs/JobInheritance.cpp @@ -1790,7 +1790,7 @@ public: int GetType() override; CEquipment* GetOwner(); - /* 0038 */ int unknown_0038; + /* 0038 */ int m_slotIndex; /* 003C */ CEquipment* m_owner; }; diff --git a/Source/Contents/Messenger/ClientMessenger.cpp b/Source/Contents/Messenger/ClientMessenger.cpp index 1be3e809c..a53e49c22 100644 --- a/Source/Contents/Messenger/ClientMessenger.cpp +++ b/Source/Contents/Messenger/ClientMessenger.cpp @@ -416,11 +416,11 @@ namespace EquipmentProperties { namespace EquipmentProperties { class CEquipmentAttachable : public CEquipment { public: - /* 0038 */ int unknown_0038; + /* 0038 */ int m_slotIndex; /* 003C */ CEquipment* m_owner; // INLINED - CEquipmentAttachable(const int& id, int index, CEquipment* owner) : CEquipment(id), unknown_0038(index), m_owner(owner) { + CEquipmentAttachable(const int& id, int index, CEquipment* owner) : CEquipment(id), m_slotIndex(index), m_owner(owner) { } void Load(bool force) override; diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index c5776215b..bbbc883e2 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -709,7 +709,7 @@ void CHalluPlant::SendMsg( } struct NpcAppearInfo { - /* 0000 */ int unknown_0000; + /* 0000 */ int aid; /* 0004 */ int job; /* 0008 */ int unknown_0008[22]; /* 0060 */ int guildId; diff --git a/Source/Contents/World/WorldProximity.cpp b/Source/Contents/World/WorldProximity.cpp index 120a009f6..f8d4a59f3 100644 --- a/Source/Contents/World/WorldProximity.cpp +++ b/Source/Contents/World/WorldProximity.cpp @@ -203,7 +203,7 @@ void CWorld::RemovePcPosForMove(std::uint32_t aid, bool notify) { } struct WorldProximityGuildMasterCallback { - void* unknown_0000; + void* vtable; CWorld* world; bool Invoke(const std::uint32_t& aid); @@ -245,7 +245,7 @@ bool WorldProximityGuildMasterCallback::Invoke(const std::uint32_t& aidRef) { } struct WorldProximityRangeCallback { - void* unknown_0000; + void* vtable; int range; float playerX; float playerZ; diff --git a/Source/Render/SpriteQuad.h b/Source/Render/SpriteQuad.h index 59def284a..75ba6981e 100644 --- a/Source/Render/SpriteQuad.h +++ b/Source/Render/SpriteQuad.h @@ -17,9 +17,9 @@ struct SpriteQuad { /* 0014 */ float topRhw; /* 0018 */ std::uint32_t color; /* 001C */ float angle; - /* 0020 */ std::int32_t unknown_0020; - /* 0024 */ std::int32_t unknown_0024; - /* 0028 */ std::int32_t unknown_0028; + /* 0020 */ std::int32_t cacheTextureIndex; + /* 0024 */ std::int32_t u; + /* 0028 */ std::int32_t v; /* 002C */ const SpriteRleImage* image; }; diff --git a/Source/Resource/EZeffectResource.h b/Source/Resource/EZeffectResource.h index 1f580841e..eea1f1763 100644 --- a/Source/Resource/EZeffectResource.h +++ b/Source/Resource/EZeffectResource.h @@ -67,7 +67,7 @@ public: /* 0110 */ int maximumFrame; /* 0114 */ int fps; /* 0118 */ int clipCount; - /* 011C */ int unknown_011C; + /* 011C */ int endLayerCount; /* 0120 */ EZeffectClip clips[60]; private: diff --git a/Source/Resource/Models/AnimatedModelResource.cpp b/Source/Resource/Models/AnimatedModelResource.cpp index 73e064ac1..5624d0725 100644 --- a/Source/Resource/Models/AnimatedModelResource.cpp +++ b/Source/Resource/Models/AnimatedModelResource.cpp @@ -68,8 +68,8 @@ AnimatedModelNode::~AnimatedModelNode() { // OFFSET: 0x007550E0 // FUNCTION: fn_07979 C3dAnimModelRes::C3dAnimModelRes() - : recordCount(0), records(nullptr), shade(2), frameCount(0), animationLength(0), speed(1.0f), unknown_0150(0), originX(0.0f), unknown_0158(0.0f), - unknown_015C(0.0f), alpha(255) { + : recordCount(0), records(nullptr), shade(2), frameCount(0), animationLength(0), speed(1.0f), unknown_0150(0), originX(0.0f), originY(0.0f), + originZ(0.0f), alpha(255) { } // OFFSET: 0x00756480 diff --git a/Source/Resource/Models/AnimatedModelResource.h b/Source/Resource/Models/AnimatedModelResource.h index d49f83275..0a65b8610 100644 --- a/Source/Resource/Models/AnimatedModelResource.h +++ b/Source/Resource/Models/AnimatedModelResource.h @@ -6,8 +6,8 @@ struct AnimatedModelFace { /* 0000 */ std::uint16_t vertices[3]; /* 0006 */ std::uint16_t textureVertices[3]; - /* 000C */ std::uint32_t unknown_000C; - /* 0010 */ std::uint32_t unknown_0010; + /* 000C */ std::uint32_t materialIndex; + /* 0010 */ std::uint32_t twoSided; /* 0014 */ int smoothGroup; }; @@ -75,8 +75,8 @@ public: /* 014C */ float speed; /* 0150 */ std::uint32_t unknown_0150; /* 0154 */ float originX; - /* 0158 */ float unknown_0158; - /* 015C */ float unknown_015C; + /* 0158 */ float originY; + /* 015C */ float originZ; /* 0160 */ std::uint32_t alpha; }; diff --git a/Source/Resource/Models/GrannyModelResource.h b/Source/Resource/Models/GrannyModelResource.h index a5b5a3008..1273160eb 100644 --- a/Source/Resource/Models/GrannyModelResource.h +++ b/Source/Resource/Models/GrannyModelResource.h @@ -57,7 +57,7 @@ struct granny_material_binding { struct granny_mesh { /* 0000 */ const char* name; - /* 0004 */ unsigned char unknown_0004[0x10]; + /* 0004 */ unsigned char vertexAndTopologyData[0x10]; /* 0014 */ std::int32_t materialBindingCount; /* 0018 */ granny_material_binding* materialBindings; }; @@ -69,7 +69,7 @@ struct granny_model_mesh_binding { struct granny_model { /* 0000 */ const char* name; /* 0004 */ granny_skeleton* skeleton; - /* 0008 */ unsigned char unknown_0008[0x44]; + /* 0008 */ unsigned char initialPlacement[0x44]; /* 004C */ std::int32_t meshBindingCount; /* 0050 */ granny_model_mesh_binding* meshBindings; }; @@ -78,13 +78,13 @@ struct granny_file_info { /* 0000 */ unsigned char unknown_0000[0x10]; /* 0010 */ std::int32_t textureCount; /* 0014 */ granny_texture** textures; - /* 0018 */ unsigned char unknown_0018[8]; + /* 0018 */ unsigned char materialTable[8]; /* 0020 */ std::int32_t skeletonCount; /* 0024 */ granny_skeleton** skeletons; - /* 0028 */ unsigned char unknown_0028[0x18]; + /* 0028 */ unsigned char geometryTables[0x18]; /* 0040 */ std::int32_t modelCount; /* 0044 */ granny_model** models; - /* 0048 */ unsigned char unknown_0048[8]; + /* 0048 */ unsigned char trackGroupTable[8]; /* 0050 */ std::int32_t animationCount; /* 0054 */ granny_animation** animations; }; diff --git a/Source/Resource/Models/ModelMesh.h b/Source/Resource/Models/ModelMesh.h index bd8809f7b..5bb0d4e9c 100644 --- a/Source/Resource/Models/ModelMesh.h +++ b/Source/Resource/Models/ModelMesh.h @@ -40,7 +40,7 @@ struct ModelMesh { /* 0014 */ ModelTextureVertex* textureVertices; /* 0018 */ std::array* faceNormals; /* 001C */ std::array* vertexNormals; - /* 0020 */ unsigned char unknown_0020[4]; + /* 0020 */ unsigned char parentMesh[4]; /* 0024 */ std::array, 32> indices; /* 01A4 */ unsigned char unknown_01A4[48]; diff --git a/Source/Resource/World/WorldResource.cpp b/Source/Resource/World/WorldResource.cpp index 22dbb2604..e2256ca1c 100644 --- a/Source/Resource/World/WorldResource.cpp +++ b/Source/Resource/World/WorldResource.cpp @@ -26,7 +26,7 @@ namespace { struct WorldLightFileRecord { /* 0000 */ char name[80]; /* 0050 */ float position[3]{}; - /* 005C */ unsigned char unknown_005C[16]; + /* 005C */ unsigned char colorAndRange[16]; }; struct WorldLegacySoundFileRecord { diff --git a/Source/Resource/World/WorldResource.h b/Source/Resource/World/WorldResource.h index 2f9de5527..f7c769812 100644 --- a/Source/Resource/World/WorldResource.h +++ b/Source/Resource/World/WorldResource.h @@ -20,7 +20,7 @@ struct WorldModelRecord { /* 00EC */ int animation; /* 00F0 */ int animationType; /* 00F4 */ float animationSpeed; - /* 00F8 */ unsigned char unknown_00F8[12]; + /* 00F8 */ unsigned char legacyPosition[12]; /* 0104 */ unsigned char flag; /* 0105 */ unsigned char unknown_0105[3]; /* 0108 */ int index; diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 1b889290e..fcbffa791 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -1381,7 +1381,7 @@ int UISpellListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argumen return 0; } case UM_SETCHOOSE: - this->unknown_00FC = static_cast(argument1); + this->m_sourceSkillId = static_cast(argument1); return 0; case UM_REFRESH: this->UpdateScroll(); @@ -1412,14 +1412,14 @@ int UISpellListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argumen if (selected < 0 || static_cast(selected) >= this->m_skills.size()) { return 0; } - if (this->unknown_00FC != 0) { - mode->SendMsg(MM_SKILL_SELECT_RESPONSE, this->m_skills[selected], this->unknown_00FC, 0, 0); + if (this->m_sourceSkillId != 0) { + mode->SendMsg(MM_SKILL_SELECT_RESPONSE, this->m_skills[selected], this->m_sourceSkillId, 0, 0); } else { mode->SendMsg(MM_SELECT_SPELL, this->m_skills[selected], 0, 0, 0); } } else if (argument1 == ID_CANCEL) { - if (this->unknown_00FC != 0) { - mode->SendMsg(MM_SKILL_SELECT_RESPONSE, 0, this->unknown_00FC, 0, 0); + if (this->m_sourceSkillId != 0) { + mode->SendMsg(MM_SKILL_SELECT_RESPONSE, 0, this->m_sourceSkillId, 0, 0); } else { mode->SendMsg(MM_SELECT_SPELL, 0, 0, 0, 0); } @@ -9736,7 +9736,7 @@ UIItemCompositionWnd::UIItemCompositionWnd() // OFFSET: 0x008C90E0 // FUNCTION: fn_11976 UISpellListWnd::UISpellListWnd() : UIItemIdentifyWnd() { - this->unknown_00FC = 0; + this->m_sourceSkillId = 0; } // OFFSET: 0x00900B10 @@ -11600,7 +11600,7 @@ void UIEquipWnd::RefreshLook() appearance[2] = g_equipWindowLook.head; appearance[6] = g_equipWindowLook.bodyPalette; appearance[7] = g_equipWindowLook.headPalette; - costumeJob = g_equipWindowLook.unknown_0024; + costumeJob = g_equipWindowLook.bodyCostume; } appearance[3] = 0; appearance[4] = 0; @@ -11980,7 +11980,7 @@ int UIChooseWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in } const int selected = this->m_list->selected; if (selected != -1) { - g_modeMgr.GetGameMode()->SendMsg(MM_CHOOSE_MENU, this->m_items[selected] + 1, this->unknown_00C8, 0, 0); + g_modeMgr.GetGameMode()->SendMsg(MM_CHOOSE_MENU, this->m_items[selected] + 1, this->m_npcAid, 0, 0); g_windowMgr.CloseWindow(WID_CHOOSEWND); } } @@ -12003,8 +12003,8 @@ int UIChooseWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in text = FindItemDescription(itemId).identifiedName; } this->m_list->AddLine(text.c_str()); - ++this->unknown_00B4; - this->m_items.push_back(this->unknown_00B4); + ++this->m_lastItemIndex; + this->m_items.push_back(this->m_lastItemIndex); const int previousWidth = this->m_list->geometry.width; if (previousWidth < this->m_list->contentWidth + 15) { this->m_list->Resize(this->m_list->contentWidth + 15, this->m_list->geometry.height); @@ -12016,7 +12016,7 @@ int UIChooseWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in } return 0; case UM_SETNAID: - this->unknown_00C8 = static_cast(a); + this->m_npcAid = static_cast(a); return 0; case UM_REPLAY_FRAMED_DATA: { const unsigned char* records = reinterpret_cast(a); @@ -12052,7 +12052,7 @@ int UIChooseWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in } case UM_CANCEL_NPC_CHOICE: if (CMode* mode = g_modeMgr.GetGameMode()) { - mode->SendMsg(MM_CHOOSE_MENU, -1, this->unknown_00C8, 0, 0); + mode->SendMsg(MM_CHOOSE_MENU, -1, this->m_npcAid, 0, 0); } return 0; default: @@ -12074,8 +12074,8 @@ int UIChoose3Wnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i line = FindItemDescription(itemId).identifiedName; } this->m_list->AddLine(line); - ++this->unknown_00B4; - this->m_items.push_back(this->unknown_00B4); + ++this->m_lastItemIndex; + this->m_items.push_back(this->m_lastItemIndex); UIListBox* list = this->m_list; const int listWidth = list->geometry.width; const int growWidth = 0; diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index be34b8456..049d39c5d 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -3617,7 +3617,7 @@ void UISlotBmpButton::Paint() { if (this->m_slot >= 0) { CharacterInfo* info = reinterpret_cast(g_modeMgr.gameMode->SendMsg(MM_QUERYCHARICTORINFO, this->m_slot, 0, 0, 0)); if (info) { - if (info->unknown_00AA > 0 || info->unknown_00A6 > 0) { + if (info->nameChangeCount > 0 || info->slotChangeCount > 0) { if (this->m_inRange) { CBitmapRes* bitmap = static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\select_character_ver3\\buyslot_add_ons.bmp"))); this->DrawBitmap(0, 0, bitmap, true); diff --git a/Source/UI/Dialogs/UIChooseWnd.cpp b/Source/UI/Dialogs/UIChooseWnd.cpp index 1174f9295..b48f50ecb 100644 --- a/Source/UI/Dialogs/UIChooseWnd.cpp +++ b/Source/UI/Dialogs/UIChooseWnd.cpp @@ -10,6 +10,6 @@ UIChooseWnd::~UIChooseWnd() { // FUNCTION: fn_11932 UIChooseWnd::UIChooseWnd() : UIFrameWnd(0), m_list(nullptr), m_okButton(nullptr), m_cancelButton(nullptr) { - this->unknown_00B4 = -1; + this->m_lastItemIndex = -1; this->m_placement = nullptr; } diff --git a/Source/UI/Dialogs/UIChooseWnd.h b/Source/UI/Dialogs/UIChooseWnd.h index 5f25ab675..491517049 100644 --- a/Source/UI/Dialogs/UIChooseWnd.h +++ b/Source/UI/Dialogs/UIChooseWnd.h @@ -19,10 +19,10 @@ public: 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 GetReplayData() override; - /* 00B4 */ int unknown_00B4; + /* 00B4 */ int m_lastItemIndex; /* 00B8 */ std::vector m_items; /* 00C4 */ UIListBox* m_list; - /* 00C8 */ int unknown_00C8; + /* 00C8 */ int m_npcAid; /* 00CC */ ChooseWndInfo* m_placement; /* 00D0 */ UIBitmapButton* m_okButton; /* 00D4 */ UIBitmapButton* m_cancelButton; diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp index 53a639fda..eafc6db15 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp @@ -229,7 +229,7 @@ bool CUIEquipmentPropertiesWnd::IsTransmitMouseInput() { // FUNCTION: fn_15025 template <> CUIListBoxEx::CUIListBoxEx() - : CUIControl(), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), + : CUIControl(), hoverImage(), pressedImage(), disabledImage(), imageNames(), disabledName(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), unknown_00C5{}, items(), data(), selected(static_cast(-1)), selectionFlag(1), rebind(0), unknown_00E2{}, onSelect(), binder() { } diff --git a/Source/UI/Items/UISpellListWnd.h b/Source/UI/Items/UISpellListWnd.h index f56981ef5..b6e43acc4 100644 --- a/Source/UI/Items/UISpellListWnd.h +++ b/Source/UI/Items/UISpellListWnd.h @@ -11,7 +11,7 @@ public: UISpellListWnd(); ~UISpellListWnd() override; /* 00F0 */ std::vector m_skills; - /* 00FC */ std::int16_t unknown_00FC; + /* 00FC */ std::int16_t m_sourceSkillId; 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/UIListBoxTemplate.h b/Source/UI/Lists/UIListBoxTemplate.h index 99b78b453..18dd70084 100644 --- a/Source/UI/Lists/UIListBoxTemplate.h +++ b/Source/UI/Lists/UIListBoxTemplate.h @@ -269,9 +269,9 @@ public: } /* 0080 */ CResPtr normalImage; - /* 0084 */ CResPtr unknown_0084; - /* 0088 */ CResPtr unknown_0088; - /* 008C */ CResPtr unknown_008C; + /* 0084 */ CResPtr hoverImage; + /* 0088 */ CResPtr pressedImage; + /* 008C */ CResPtr disabledImage; /* 0090 */ std::map imageNames; /* 0098 */ std::string disabledName; /* 00B0 */ CUIVScrollBar* scrollBar; @@ -472,9 +472,9 @@ public: } /* 0080 */ CResPtr normalImage; - /* 0084 */ CResPtr unknown_0084; - /* 0088 */ CResPtr unknown_0088; - /* 008C */ CResPtr unknown_008C; + /* 0084 */ CResPtr hoverImage; + /* 0088 */ CResPtr pressedImage; + /* 008C */ CResPtr disabledImage; /* 0090 */ std::map imageNames; /* 0098 */ std::string disabledName; /* 00B0 */ CUIVScrollBar* scrollBar; diff --git a/Source/UI/MiniPartyGrid.h b/Source/UI/MiniPartyGrid.h index 5e25f1d8a..ca714dd6e 100644 --- a/Source/UI/MiniPartyGrid.h +++ b/Source/UI/MiniPartyGrid.h @@ -23,7 +23,7 @@ struct MiniPartyGrid { int FindCell(int x, int y) const; void BuildAvailableCells(); - /* 0000 */ std::uint32_t unknown_0000; + /* 0000 */ std::uint32_t vtable; /* 0004 */ int left; /* 0008 */ int top; /* 000C */ int right; diff --git a/Source/UI/Quest/UIOngoingQuestInfo.cpp b/Source/UI/Quest/UIOngoingQuestInfo.cpp index 07debf6ce..a255e3c7b 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.cpp +++ b/Source/UI/Quest/UIOngoingQuestInfo.cpp @@ -688,7 +688,7 @@ CUIContents::CUIContents() : CUIControl(), icon(nullptr), title(nullptr), textVi // OFFSET: 0x00A54D90 // FUNCTION: fn_16290 CUIOngoingQuestInfo::CUIOngoingQuestInfo() - : titleBar(nullptr), unknown_00DC{}, titleText(nullptr), scrollWindow(nullptr), dateText(nullptr), unknown_00EC{}, questId(0) { + : titleBar(nullptr), backgroundStorage{}, titleText(nullptr), scrollWindow(nullptr), dateText(nullptr), closeButtonStorage{}, questId(0) { } namespace OngoingQuestInfo { diff --git a/Source/UI/Quest/UIOngoingQuestInfo.h b/Source/UI/Quest/UIOngoingQuestInfo.h index f36882020..357e37dee 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.h +++ b/Source/UI/Quest/UIOngoingQuestInfo.h @@ -27,14 +27,14 @@ public: /* 00D8 */ CUITitleBar* titleBar; union { - /* 00DC */ unsigned char unknown_00DC[0x04]; + /* 00DC */ unsigned char backgroundStorage[0x04]; /* 00DC */ CUIStaticImage* background; }; /* 00E0 */ CUIStaticText* titleText; /* 00E4 */ OngoingQuestInfo::CUIScrollWindow* scrollWindow; /* 00E8 */ CUIStaticText* dateText; union { - /* 00EC */ unsigned char unknown_00EC[0x04]; + /* 00EC */ unsigned char closeButtonStorage[0x04]; /* 00EC */ CUIImageButton* closeButton; }; /* 00F0 */ unsigned int questId; diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index 68c5f8a1b..186704952 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -42,7 +42,7 @@ void CUIListBoxEx CUIListBoxEx::CUIListBoxEx() - : CUIControl(), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), + : CUIControl(), hoverImage(), pressedImage(), disabledImage(), imageNames(), disabledName(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), unknown_00C5{}, items(), data(), selected(static_cast(-1)), selectionFlag(1), rebind(0), unknown_00E2{}, onSelect(), binder() { } @@ -51,7 +51,7 @@ CUIListBoxEx::CUIListBoxEx() // FUNCTION: fn_16647 template <> CUIListBoxEx::CUIListBoxEx() - : CUIControl(), unknown_0084(), unknown_0088(), unknown_008C(), imageNames(), disabledName(), scrollBar(nullptr), + : CUIControl(), hoverImage(), pressedImage(), disabledImage(), imageNames(), disabledName(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), unknown_00C5{}, items(), data(), selected(static_cast(-1)), selectionFlag(1), rebind(0), unknown_00E2{}, onSelect(), binder() { } diff --git a/Source/UI/Text/UIAchWnd.h b/Source/UI/Text/UIAchWnd.h index 30d213747..bb5305553 100644 --- a/Source/UI/Text/UIAchWnd.h +++ b/Source/UI/Text/UIAchWnd.h @@ -22,7 +22,7 @@ class UIBitmapButton; class UITextButton; struct UIAchListInfo { - /* 0000 */ int unknown_0000; + /* 0000 */ int treeHead; /* 0004 */ int count; }; diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index c17403f0f..cf7e7b237 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -1981,11 +1981,11 @@ void CUIListBoxEx::AddNewItem template <> 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)); - this->unknown_008C = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); + this->hoverImage = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); + this->pressedImage = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); + this->disabledImage = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); for (AdventureGuide::CUISubTab* item : this->items) { - item->SetImageResources(this->NormalImage(), this->unknown_0084, this->unknown_0088, this->unknown_008C); + item->SetImageResources(this->NormalImage(), this->hoverImage, this->pressedImage, this->disabledImage); } } @@ -1994,11 +1994,11 @@ void CUIListBox::LoadSkin(int resolveSkin) { template <> 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)); - this->unknown_008C = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); + this->hoverImage = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); + this->pressedImage = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); + this->disabledImage = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); for (AdventureGuide::CUITab* item : this->items) { - item->SetImageResources(this->NormalImage(), this->unknown_0084, this->unknown_0088, this->unknown_008C); + item->SetImageResources(this->NormalImage(), this->hoverImage, this->pressedImage, this->disabledImage); } } @@ -2007,11 +2007,11 @@ void CUIListBox::LoadSkin(int resolveSkin) { template <> 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)); - this->unknown_008C = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); + this->hoverImage = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); + this->pressedImage = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); + this->disabledImage = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); for (AdventureGuide::CUIItemInfo* item : this->items) { - item->SetImageResources(this->NormalImage(), this->unknown_0084, this->unknown_0088, this->unknown_008C); + item->SetImageResources(this->NormalImage(), this->hoverImage, this->pressedImage, this->disabledImage); } } @@ -2020,11 +2020,11 @@ void CUIListBoxEx::LoadS template <> 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)); - this->unknown_008C = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); + this->hoverImage = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); + this->pressedImage = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); + this->disabledImage = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); for (AdventureGuide::CUIMonsterInfo* item : this->items) { - item->SetImageResources(this->NormalImage(), this->unknown_0084, this->unknown_0088, this->unknown_008C); + item->SetImageResources(this->NormalImage(), this->hoverImage, this->pressedImage, this->disabledImage); } } @@ -2033,11 +2033,11 @@ void CUIListBoxEx: template <> 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)); - this->unknown_008C = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); + this->hoverImage = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); + this->pressedImage = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); + this->disabledImage = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); for (AdventureGuide::CUIQuestInfo* item : this->items) { - item->SetImageResources(this->NormalImage(), this->unknown_0084, this->unknown_0088, this->unknown_008C); + item->SetImageResources(this->NormalImage(), this->hoverImage, this->pressedImage, this->disabledImage); } } @@ -2046,11 +2046,11 @@ void CUIListBoxEx::Loa template <> 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)); - this->unknown_008C = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); + this->hoverImage = CResPtr(this->LoadBitmapResource(this->imageNames[1], resolveSkin)); + this->pressedImage = CResPtr(this->LoadBitmapResource(this->imageNames[2], resolveSkin)); + this->disabledImage = CResPtr(this->LoadBitmapResource(this->disabledName, resolveSkin)); for (AdventureGuide::CUITabInfo* item : this->items) { - item->SetImageResources(this->NormalImage(), this->unknown_0084, this->unknown_0088, this->unknown_008C); + item->SetImageResources(this->NormalImage(), this->hoverImage, this->pressedImage, this->disabledImage); } } diff --git a/Source/UI/Window/UIMonsterInfoWnd.h b/Source/UI/Window/UIMonsterInfoWnd.h index a6d7d1781..37dd028bd 100644 --- a/Source/UI/Window/UIMonsterInfoWnd.h +++ b/Source/UI/Window/UIMonsterInfoWnd.h @@ -7,7 +7,7 @@ #include struct MonsterInfo { - /* 0000 */ short unknown_0000; + /* 0000 */ short packetType; /* 0002 */ short job; /* 0004 */ short level; /* 0006 */ short size; diff --git a/Source/UI/Window/UINavigationWnd.h b/Source/UI/Window/UINavigationWnd.h index 47769b123..5a593b3a0 100644 --- a/Source/UI/Window/UINavigationWnd.h +++ b/Source/UI/Window/UINavigationWnd.h @@ -58,12 +58,12 @@ protected: union { /* 00FC */ UIBitmapButton* m_buttons[6]; struct { - /* 00FC */ UIWindow* unknown_00FC; - /* 0100 */ UIWindow* unknown_0100; + /* 00FC */ UIWindow* m_searchButton; + /* 0100 */ UIWindow* m_startButton; /* 0104 */ UIWindow* m_routeFooter; /* 0108 */ UIWindow* m_searchFooter; - /* 010C */ UIWindow* unknown_010C; - /* 0110 */ UIWindow* unknown_0110; + /* 010C */ UIWindow* m_systemChangeButton; + /* 0110 */ UIWindow* m_folderButton; }; }; /* 0114 */ UICheckBox* m_allowGates; diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h index 0da0705cc..a0651314a 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Window/UINewMakeCharWnd.h @@ -90,10 +90,10 @@ public: /* 0264 */ short m_job; /* 0266 */ short m_head; /* 0268 */ short m_costumeJob; - /* 026A */ short unknown_026A; + /* 026A */ short m_weapon; /* 026C */ short m_level; /* 026E */ short m_skillPoint; - /* 0270 */ short unknown_0270; + /* 0270 */ short m_accessory; /* 0272 */ short m_shield; /* 0274 */ short accessory2; /* 0276 */ short accessory3; diff --git a/Source/UI/Window/UINewSelectCharWnd.cpp b/Source/UI/Window/UINewSelectCharWnd.cpp index 903d7ffbe..f8b7e9bfb 100644 --- a/Source/UI/Window/UINewSelectCharWnd.cpp +++ b/Source/UI/Window/UINewSelectCharWnd.cpp @@ -684,14 +684,14 @@ int UINewSelectCharWnd::SendMsg(UIWindow* sender, int message, std::intptr_t arg static_cast(g_modeMgr.GetLoginMode())->ShowNotice(0x2E, false); } } else { - if (info->unknown_00A6 > 0) { + if (info->slotChangeCount > 0) { shown = static_cast(g_modeMgr.GetLoginMode())->ShowNotice(0x2D, false); } - if (info->unknown_00AA > 0) { + if (info->nameChangeCount > 0) { static_cast(g_modeMgr.GetLoginMode())->ShowNotice(0x2F, shown); } } - } else if (info != nullptr && info->unknown_00AA > 0) { + } else if (info != nullptr && info->nameChangeCount > 0) { static_cast(g_modeMgr.GetLoginMode())->ShowNotice(0x2F, shown); } } @@ -944,7 +944,7 @@ int UINewSelectCharWnd::SendMsg(UIWindow* sender, int message, std::intptr_t arg packet.id = 0x8D4; packet.from = static_cast(this->m_unknown138); packet.to = selected; - packet.count = static_cast(info->unknown_00A6); + packet.count = static_cast(info->slotChangeCount); GetRagConnection().Send(reinterpret_cast(GetRagConnection()).FixedLength(packet.id), &packet); } } diff --git a/Source/UI/Window/UITalkboxTrapInputWnd.h b/Source/UI/Window/UITalkboxTrapInputWnd.h index 51fc13a20..0a06c98b5 100644 --- a/Source/UI/Window/UITalkboxTrapInputWnd.h +++ b/Source/UI/Window/UITalkboxTrapInputWnd.h @@ -6,10 +6,10 @@ class UIEditCtrl; struct TalkboxTrapTarget { - /* 0000 */ int unknown_0000; - /* 0004 */ int unknown_0004; - /* 0008 */ int unknown_0008; - /* 000C */ int unknown_000C; + /* 0000 */ int skillId; + /* 0004 */ int cellX; + /* 0008 */ int cellY; + /* 000C */ int skillLevel; }; struct TalkboxTrapRequest { diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index 3c5a30305..fd7bb044f 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -867,7 +867,7 @@ void UIWindowMgr::ResetWindows() { // OFFSET: 0x00A88490 // FUNCTION: fn_17086 UIWindowMgr::UIWindowMgr() - : activeWindowId(0), retainedPersistentWindow(false), window_03DC(nullptr), previousMouseX(-1), previousMouseY(-1), unknown_0526(true), + : activeWindowId(0), retainedPersistentWindow(false), window_03DC(nullptr), previousMouseX(-1), previousMouseY(-1), basicInfoExpanded(true), window_0A30(nullptr), macroReporterVisible(false), unknown_4F211(false), window_4F2AC(nullptr) { this->ResetWindows(); this->backgroundSurface = nullptr; diff --git a/Source/UI/Window/UIWindowMgr.h b/Source/UI/Window/UIWindowMgr.h index 5c73cd9ee..b703da4cc 100644 --- a/Source/UI/Window/UIWindowMgr.h +++ b/Source/UI/Window/UIWindowMgr.h @@ -80,7 +80,7 @@ public: /* 0060 */ int drawCompass; /* 0064 */ int dragAllItems; /* 0068 */ int compactCompositionLayout; - /* 006C */ int unknown_006C; + /* 006C */ int rightToLeftChatEnabled; /* 0070 */ int unknown_0070; /* 0074 */ int unknown_0074; /* 0078 */ int unknown_0078; @@ -344,24 +344,24 @@ public: /* 0508 */ int windowVisibilityState; /* 050C */ std::list hiddenWindows; /* 0514 */ unsigned char basicInfoPlacement[0x12]; - /* 0526 */ bool unknown_0526; - /* 0527 */ unsigned char unknown_0527[0x25]; + /* 0526 */ bool basicInfoExpanded; + /* 0527 */ unsigned char itemPlacementStorage[0x25]; /* 054C */ int itemWndVisible; - /* 0550 */ unsigned char unknown_0550[0x18]; + /* 0550 */ unsigned char questPlacement[0x18]; /* 0568 */ int questWndVisible; - /* 056C */ unsigned char unknown_056C[0x1C]; + /* 056C */ unsigned char questDisplayAndStatusPlacement[0x1C]; /* 0588 */ int statusWndVisible; - /* 058C */ unsigned char unknown_058C[0x18]; + /* 058C */ unsigned char equipPlacementStorage[0x18]; /* 05A4 */ int equipWndVisible; - /* 05A8 */ unsigned char unknown_05A8[0x14]; + /* 05A8 */ unsigned char optionPlacement[0x14]; /* 05BC */ int optionWndVisible; - /* 05C0 */ unsigned char unknown_05C0[0x10]; + /* 05C0 */ unsigned char shortenItemPlacement[0x10]; /* 05D0 */ int shortenItemWndVisible; /* 05D4 */ unsigned char unknown_05D4[0x168]; /* 073C */ int messengerGroupWndVisible; /* 0740 */ unsigned char messengerPartyTabState[0x08]; /* 0748 */ NormalItemSlotWindow m_normalItemSlotWindow; - /* 075C */ unsigned char unknown_075C[0x20]; + /* 075C */ unsigned char exchangeAcceptAndSkillListPlacement[0x20]; /* 077C */ int skillListWndVisible; /* 0780 */ unsigned char merchantItemPlacement[0x10]; /* 0790 */ int merchantItemWndVisible; @@ -369,9 +369,9 @@ public: /* 0848 */ WindowPlacement m_whisperPlacement; /* 0858 */ unsigned char unknown_0858[0x94]; /* 08EC */ int homunculusSkillWndVisible; - /* 08F0 */ unsigned char unknown_08F0[0x20]; + /* 08F0 */ unsigned char mercenaryInfoAndSkillPlacement[0x20]; /* 0910 */ int mercenarySkillWndVisible; - /* 0914 */ unsigned char unknown_0914[0x20]; + /* 0914 */ unsigned char subChatPlacements[0x20]; /* 0934 */ unsigned char hotkeyPlacement[0x10]; /* 0944 */ unsigned char battlefieldPlacement[0x80]; /* 09C4 */ std::map browsers; @@ -400,7 +400,7 @@ public: /* 4F1A4 */ unsigned currentHitUid; /* 4F1A8 */ int miniMapClickX; /* 4F1AC */ int miniMapClickY; - /* 4F1B0 */ unsigned char unknown_4F1B0[0x1C]; + /* 4F1B0 */ unsigned char miniMapPlacementState[0x1C]; /* 4F1CC */ UIWindow* window_4F1CC; /* 4F1D0 */ UIWindow* window_4F1D0; /* 4F1D4 */ UIWindow* window_4F1D4; @@ -414,7 +414,7 @@ public: /* 4F1F4 */ UIWindow* window_4F1F4; /* 4F1F8 */ UIWindow* window_4F1F8; /* 4F1FC */ UIWindow* window_4F1FC; - /* 4F200 */ unsigned char unknown_4F200[16]; + /* 4F200 */ unsigned char macroReporterPlacement[16]; /* 4F210 */ bool macroReporterVisible; /* 4F211 */ bool unknown_4F211; /* 4F214 */ std::vector unknown_4F214;