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.
This commit is contained in:
parent
dc3d5ce1a5
commit
fdbebbba25
61 changed files with 216 additions and 216 deletions
|
|
@ -1981,11 +1981,11 @@ void CUIListBoxEx<AdventureGuide::CUITabInfo, Guide_Intro::Contents>::AddNewItem
|
|||
template <>
|
||||
void CUIListBox<AdventureGuide::CUISubTab>::LoadSkin(int resolveSkin) {
|
||||
this->NormalImage() = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[0], resolveSkin));
|
||||
this->unknown_0084 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->unknown_0088 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->unknown_008C = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->disabledName, resolveSkin));
|
||||
this->hoverImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->pressedImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->disabledImage = CResPtr<CBitmapRes>(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<AdventureGuide::CUISubTab>::LoadSkin(int resolveSkin) {
|
|||
template <>
|
||||
void CUIListBox<AdventureGuide::CUITab>::LoadSkin(int resolveSkin) {
|
||||
this->NormalImage() = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[0], resolveSkin));
|
||||
this->unknown_0084 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->unknown_0088 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->unknown_008C = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->disabledName, resolveSkin));
|
||||
this->hoverImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->pressedImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->disabledImage = CResPtr<CBitmapRes>(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<AdventureGuide::CUITab>::LoadSkin(int resolveSkin) {
|
|||
template <>
|
||||
void CUIListBoxEx<AdventureGuide::CUIItemInfo, AdventureGuide::CItemData>::LoadSkin(int resolveSkin) {
|
||||
this->NormalImage() = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[0], resolveSkin));
|
||||
this->unknown_0084 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->unknown_0088 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->unknown_008C = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->disabledName, resolveSkin));
|
||||
this->hoverImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->pressedImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->disabledImage = CResPtr<CBitmapRes>(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<AdventureGuide::CUIItemInfo, AdventureGuide::CItemData>::LoadS
|
|||
template <>
|
||||
void CUIListBoxEx<AdventureGuide::CUIMonsterInfo, AdventureGuide::CMonsterData>::LoadSkin(int resolveSkin) {
|
||||
this->NormalImage() = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[0], resolveSkin));
|
||||
this->unknown_0084 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->unknown_0088 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->unknown_008C = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->disabledName, resolveSkin));
|
||||
this->hoverImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->pressedImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->disabledImage = CResPtr<CBitmapRes>(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<AdventureGuide::CUIMonsterInfo, AdventureGuide::CMonsterData>:
|
|||
template <>
|
||||
void CUIListBoxEx<AdventureGuide::CUIQuestInfo, AdventureGuide::CQuestInfo>::LoadSkin(int resolveSkin) {
|
||||
this->NormalImage() = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[0], resolveSkin));
|
||||
this->unknown_0084 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->unknown_0088 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->unknown_008C = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->disabledName, resolveSkin));
|
||||
this->hoverImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->pressedImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->disabledImage = CResPtr<CBitmapRes>(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<AdventureGuide::CUIQuestInfo, AdventureGuide::CQuestInfo>::Loa
|
|||
template <>
|
||||
void CUIListBoxEx<AdventureGuide::CUITabInfo, Guide_Intro::Contents>::LoadSkin(int resolveSkin) {
|
||||
this->NormalImage() = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[0], resolveSkin));
|
||||
this->unknown_0084 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->unknown_0088 = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->unknown_008C = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->disabledName, resolveSkin));
|
||||
this->hoverImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[1], resolveSkin));
|
||||
this->pressedImage = CResPtr<CBitmapRes>(this->LoadBitmapResource(this->imageNames[2], resolveSkin));
|
||||
this->disabledImage = CResPtr<CBitmapRes>(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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <string>
|
||||
|
||||
struct MonsterInfo {
|
||||
/* 0000 */ short unknown_0000;
|
||||
/* 0000 */ short packetType;
|
||||
/* 0002 */ short job;
|
||||
/* 0004 */ short level;
|
||||
/* 0006 */ short size;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -684,14 +684,14 @@ int UINewSelectCharWnd::SendMsg(UIWindow* sender, int message, std::intptr_t arg
|
|||
static_cast<CLoginMode*>(g_modeMgr.GetLoginMode())->ShowNotice(0x2E, false);
|
||||
}
|
||||
} else {
|
||||
if (info->unknown_00A6 > 0) {
|
||||
if (info->slotChangeCount > 0) {
|
||||
shown = static_cast<CLoginMode*>(g_modeMgr.GetLoginMode())->ShowNotice(0x2D, false);
|
||||
}
|
||||
if (info->unknown_00AA > 0) {
|
||||
if (info->nameChangeCount > 0) {
|
||||
static_cast<CLoginMode*>(g_modeMgr.GetLoginMode())->ShowNotice(0x2F, shown);
|
||||
}
|
||||
}
|
||||
} else if (info != nullptr && info->unknown_00AA > 0) {
|
||||
} else if (info != nullptr && info->nameChangeCount > 0) {
|
||||
static_cast<CLoginMode*>(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<std::int16_t>(this->m_unknown138);
|
||||
packet.to = selected;
|
||||
packet.count = static_cast<std::int16_t>(info->unknown_00A6);
|
||||
packet.count = static_cast<std::int16_t>(info->slotChangeCount);
|
||||
GetRagConnection().Send(reinterpret_cast<const PacketLengths&>(GetRagConnection()).FixedLength(packet.id), &packet);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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<UIWindow*> 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<HWND, CWebBrowser*> 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<WindowTextRecord> unknown_4F214;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue