Skip to content

Commit

Permalink
Update for test patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@brainiac
brainiac committed Nov 20, 2024
1 parent aba6d83 commit a434c95
Show file tree
Hide file tree
Showing 21 changed files with 2,936 additions and 2,901 deletions.
2 changes: 1 addition & 1 deletion AltAbilities.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct AltAbilityEffectData
int slot;
};

// @sizeof(CAltAbilityData) == 0xe0 :: 2024-11-08 (live) @ 0x14020898d
// @sizeof(CAltAbilityData) == 0xe0 :: 2024-11-12 (test) @ 0x14020858d
constexpr size_t CAltAbilityData_size = 0xe0;

class [[offsetcomments]] CAltAbilityData
Expand Down
260 changes: 130 additions & 130 deletions CXWnd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ class CursorClass
// CXWnd
//============================================================================

// @sizeof(CXWnd) == 0x258 :: 2024-11-08 (live) @ 0x1405befd1
constexpr size_t CXWnd_size = 0x258;
// @sizeof(CXWnd) == 0x268 :: 2024-11-12 (test) @ 0x1405c04f1
constexpr size_t CXWnd_size = 0x268;
constexpr size_t CXWnd_vftable_size = 0x348;

class [[offsetcomments]] CXWnd
Expand Down Expand Up @@ -729,116 +729,116 @@ class [[offsetcomments]] CXWnd
EQLIB_OBJECT static void operator delete[](void* ptr);

// @start: CXWnd Members
/*0x030*/ bool MouseOver;
/*0x034*/ CXRect TransitionRect;
/*0x048*/ CStaticTintedBlendAnimationTemplate* TitlePiece2;
/*0x050*/ bool bClientRectChanged;
/*0x051*/ uint8_t Alpha;
/*0x054*/ COLORREF CRNormal;
/*0x058*/ bool bIsParentOrContextMenuWindow;
/*0x059*/ bool bMaximized;
/*0x05a*/ bool bAction;
/*0x05b*/ bool bBringToTopWhenClicked;
/*0x05c*/ int HScrollPos;
/*0x060*/ CTextureAnimation* IconTextureAnim;
/*0x068*/ ControllerBase* pController;
/*0x070*/ bool Faded;
/*0x078*/ CXStr XMLToolTip;
/*0x080*/ bool bMaximizable;
/*0x084*/ int RightOffset;
/*0x088*/ CXWnd* ParentWindow;
/*0x090*/ CXSize MaxClientSize;
/*0x098*/ bool bRightAnchoredToLeft;
/*0x0a0*/ CXStr WindowText;
/*0x0a8*/ bool Minimized;
/*0x0ac*/ int DeleteCount;
/*0x0b0*/ uint32_t LastTimeMouseOver;
/*0x0b4*/ uint8_t bResizableMask;
/*0x0b8*/ CTextObjectInterface* pTextObject;
/*0x0c0*/ uint32_t BackgroundDrawType;
/*0x0c4*/ uint8_t FadeToAlpha;
/*0x0c8*/ uint32_t LastBlinkFadeRefreshTime;
/*0x0cc*/ int LeftOffset;
/*0x0d0*/ bool Fades;
/*0x0d1*/ bool bEscapableLocked;
/*0x0d2*/ uint8_t TargetAlpha;
/*0x0d4*/ int VScrollMax;
/*0x0d8*/ bool bNeedsSaving;
/*0x0d9*/ uint8_t StartAlpha;
/*0x0da*/ uint8_t FadeAlpha;
/*0x0db*/ bool bScreenClipRectChanged;
/*0x0dc*/ bool bBottomAnchoredToTop;
/*0x0e0*/ int HScrollMax;
/*0x0e4*/ bool bActive;
/*0x0e5*/ bool bEnableShowBorder;
/*0x0e6*/ bool bHCenterTooltip;
/*0x0e7*/ bool Locked;
/*0x0e8*/ bool bShowBorder;
/*0x0e9*/ bool Unlockable;
/*0x0ea*/ bool bShowClickThroughMenuItem;
/*0x0ec*/ uint32_t FadeDuration;
/*0x0f0*/ uint32_t FadeDelay;
/*0x0f4*/ int ZLayer;
/*0x0f8*/ CLayoutStrategy* pLayoutStrategy;
/*0x100*/ bool bClipToParent;
/*0x104*/ uint32_t BlinkFadeDuration;
/*0x108*/ CXStr DataStr;
/*0x110*/ CXStr Tooltip;
/*0x118*/ int BottomOffset;
/*0x11c*/ bool bClientClipRectChanged;
/*0x11d*/ bool bCaptureTitle;
/*0x120*/ uint32_t TransitionStartTick;
/*0x128*/ int64_t Data;
/*0x130*/ ArrayClass2<uint32_t> RuntimeTypes;
/*0x150*/ bool dShow;
/*0x154*/ CXRect IconRect;
/*0x164*/ int VScrollPos;
/*0x168*/ uint32_t BlinkFadeFreq;
/*0x16c*/ int TopOffset;
/*0x170*/ CXWnd* FocusProxy;
/*0x178*/ int ParentAndContextMenuArrayIndex;
/*0x17c*/ CXRect ClipRectClient;
/*0x190*/ CXWndDrawTemplate* DrawTemplate;
/*0x198*/ bool bKeepOnScreen;
/*0x19c*/ uint32_t TransitionDuration;
/*0x1a0*/ int Transition;
/*0x1a4*/ bool bFullyScreenClipped;
/*0x1a8*/ CTextObjectInterface* pTipTextObject;
/*0x1b0*/ uint32_t XMLIndex;
/*0x1b4*/ uint32_t BGType;
/*0x1b8*/ bool bUseInLayoutVertical;
/*0x1bc*/ uint32_t WindowStyle;
/*0x1c0*/ CXRect OldLocation;
/*0x1d0*/ CStaticTintedBlendAnimationTemplate* TitlePiece;
/*0x1d8*/ CXSize MinClientSize;
/*0x1e0*/ COLORREF BGColor;
/*0x1e4*/ bool bTopAnchoredToTop;
/*0x1e8*/ int BlinkState;
/*0x1ec*/ bool bIsTransitioning;
/*0x1f0*/ COLORREF DisabledBackground;
/*0x1f4*/ bool bMarkedForDelete;
/*0x1f5*/ bool bTiled;
/*0x1f8*/ int BlinkStartTimer;
/*0x1fc*/ bool Enabled;
/*0x1fd*/ bool bClickThroughMenuItemStatus;
/*0x1fe*/ bool bClickThrough;
/*0x1ff*/ bool bUseInLayoutHorizontal;
/*0x200*/ int managerArrayIndex;
/*0x204*/ bool bLeftAnchoredToLeft;
/*0x208*/ CXRect ClientRect;
/*0x218*/ bool ValidCXWnd;
/*0x21c*/ uint32_t BlinkFadeStartTime;
/*0x220*/ CTextureFont* pFont;
/*0x228*/ CXRect Location;
/*0x238*/ int BlinkDuration;
/*0x23c*/ bool bEscapable;
/*0x240*/ CXRect ClipRectScreen;
/*0x250*/ bool bClickThroughToBackground;
/*0x030*/ uint32_t BackgroundDrawType;
/*0x034*/ bool Enabled;
/*0x038*/ int Transition;
/*0x03c*/ bool Locked;
/*0x03d*/ bool bClientRectChanged;
/*0x03e*/ bool bClipToParent;
/*0x03f*/ bool bScreenClipRectChanged;
/*0x040*/ bool Faded;
/*0x041*/ bool MouseOver;
/*0x048*/ CXWndDrawTemplate* DrawTemplate;
/*0x050*/ CStaticTintedBlendAnimationTemplate* TitlePiece2;
/*0x058*/ bool bKeepOnScreen;
/*0x05c*/ CXRect ClipRectScreen;
/*0x06c*/ CXSize MinClientSize;
/*0x074*/ bool bShowClickThroughMenuItem;
/*0x075*/ bool bClickThroughToBackground;
/*0x078*/ int LeftOffset;
/*0x07c*/ uint8_t FadeAlpha;
/*0x07d*/ bool bHCenterTooltip;
/*0x07e*/ bool bActive;
/*0x07f*/ bool bMaximized;
/*0x080*/ uint32_t BlinkFadeFreq;
/*0x088*/ CXStr Tooltip;
/*0x090*/ bool bTopAnchoredToTop;
/*0x091*/ uint8_t bResizableMask;
/*0x094*/ int BlinkDuration;
/*0x098*/ CTextureFont* pFont;
/*0x0a0*/ bool bEscapable;
/*0x0a4*/ int HScrollPos;
/*0x0a8*/ CXRect IconRect;
/*0x0b8*/ CXStr XMLToolTip;
/*0x0c0*/ bool bEnableShowBorder;
/*0x0c4*/ uint32_t WindowStyle;
/*0x0c8*/ int VScrollPos;
/*0x0cc*/ bool Fades;
/*0x0d0*/ uint32_t TransitionStartTick;
/*0x0d8*/ ArrayClass2<uint32_t> RuntimeTypes;
/*0x0f8*/ bool bNeedsSaving;
/*0x0fc*/ CXRect ClientRect;
/*0x10c*/ CXRect TransitionRect;
/*0x120*/ ControllerBase* pController;
/*0x128*/ bool ValidCXWnd;
/*0x12c*/ int BlinkState;
/*0x130*/ bool bIsTransitioning;
/*0x134*/ CXRect Location;
/*0x144*/ bool bBringToTopWhenClicked;
/*0x148*/ int64_t Data;
/*0x150*/ uint8_t TargetAlpha;
/*0x151*/ bool Minimized;
/*0x158*/ CTextObjectInterface* pTextObject;
/*0x160*/ int ZLayer;
/*0x168*/ CLayoutStrategy* pLayoutStrategy;
/*0x170*/ int DeleteCount;
/*0x174*/ uint8_t FadeToAlpha;
/*0x175*/ uint8_t Alpha;
/*0x176*/ bool bBottomAnchoredToTop;
/*0x178*/ uint32_t LastBlinkFadeRefreshTime;
/*0x17c*/ bool bAction;
/*0x17d*/ bool bClientClipRectChanged;
/*0x17e*/ bool bUseInLayoutVertical;
/*0x17f*/ bool Unlockable;
/*0x180*/ bool bRightAnchoredToLeft;
/*0x184*/ int TopOffset;
/*0x188*/ uint32_t FadeDelay;
/*0x18c*/ bool bMarkedForDelete;
/*0x190*/ int VScrollMax;
/*0x198*/ CXWnd* ParentWindow;
/*0x1a0*/ bool bClickThrough;
/*0x1a4*/ uint32_t LastTimeMouseOver;
/*0x1a8*/ CXStr DataStr;
/*0x1b0*/ CXStr WindowText;
/*0x1b8*/ int BottomOffset;
/*0x1bc*/ CXSize MaxClientSize;
/*0x1c4*/ bool bTiled;
/*0x1c5*/ bool bLeftAnchoredToLeft;
/*0x1c8*/ COLORREF DisabledBackground;
/*0x1d0*/ CTextObjectInterface* pTipTextObject;
/*0x1d8*/ uint8_t StartAlpha;
/*0x1d9*/ bool bIsParentOrContextMenuWindow;
/*0x1dc*/ uint32_t BlinkFadeStartTime;
/*0x1e0*/ CTextureAnimation* IconTextureAnim;
/*0x1e8*/ bool bMaximizable;
/*0x1ec*/ int HScrollMax;
/*0x1f0*/ bool bUseInLayoutHorizontal;
/*0x1f8*/ CXWnd* FocusProxy;
/*0x200*/ uint32_t BGType;
/*0x204*/ bool bFullyScreenClipped;
/*0x208*/ COLORREF BGColor;
/*0x20c*/ COLORREF CRNormal;
/*0x210*/ bool bEscapableLocked;
/*0x214*/ uint32_t BlinkFadeDuration;
/*0x218*/ int ParentAndContextMenuArrayIndex;
/*0x21c*/ bool bShowBorder;
/*0x220*/ CStaticTintedBlendAnimationTemplate* TitlePiece;
/*0x228*/ uint32_t TransitionDuration;
/*0x22c*/ CXRect OldLocation;
/*0x23c*/ bool dShow;
/*0x240*/ CXRect ClipRectClient;
/*0x250*/ int managerArrayIndex;
/*0x254*/ int RightOffset;
/*0x258*/ int BlinkStartTimer;
/*0x25c*/ uint32_t FadeDuration;
/*0x260*/ uint32_t XMLIndex;
/*0x264*/ bool bClickThroughMenuItemStatus;
/*0x265*/ bool bCaptureTitle;

// @end: CXWnd Members
/*0x251*/ bool bUsesClassicUI;
/*0x252*/ bool bMouseOverEvent;
/*0x254*/
/*0x266*/ bool bUsesClassicUI;
/*0x267*/ bool bMouseOverEvent;
/*0x268*/

ALT_MEMBER_ALIAS(bool, bEscapable, CloseOnESC);
ALT_MEMBER_ALIAS_DEPRECATED(bool, bEnableShowBorder, bBorder, "Use bEnableShowBorder instead of bBorder");
Expand Down Expand Up @@ -872,8 +872,8 @@ enum eIniFlags
eIniFlag_All = 0xffffffff
};

// @sizeof(CSidlScreenWnd) == 0x2c0 :: 2024-11-08 (live) @ 0x1405b9a51
constexpr size_t CSidlScreenWnd_size = 0x2c0;
// @sizeof(CSidlScreenWnd) == 0x2d0 :: 2024-11-12 (test) @ 0x1405baf51
constexpr size_t CSidlScreenWnd_size = 0x2d0;
constexpr size_t CSidlScreenWnd_vftable_size = 0x380;

class [[offsetcomments]] CSidlScreenWnd : public CXWnd
Expand Down Expand Up @@ -909,23 +909,23 @@ class [[offsetcomments]] CSidlScreenWnd : public CXWnd

//----------------------------------------------------------------------------
// data members
/*0x258*/ bool bControlsCreated;
/*0x260*/ CXStr SidlText;
/*0x268*/ CScreenTemplate* SidlPiece;
/*0x270*/ ArrayClass<CRadioGroup*> RadioGroup;
/*0x288*/ bool bInitVisibility;
/*0x289*/ bool bVisibleBeforeResize;
/*0x28c*/ int IniFlags;
/*0x290*/ CXStr IniStorageName;
/*0x298*/ int IniVersion;
/*0x29c*/ int LastResX;
/*0x2a0*/ int LastResY;
/*0x2a4*/ bool bLastResFullscreen;
/*0x2a8*/ int ContextMenuID;
/*0x2b0*/ CXWnd* pFirstVScrollChild;
/*0x2b8*/ int ContextMenuTipID;
/*0x2bc*/ bool bHasActivatedFirstTimeAlert;
/*0x2c0*/
/*0x268*/ bool bControlsCreated;
/*0x270*/ CXStr SidlText;
/*0x278*/ CScreenTemplate* SidlPiece;
/*0x280*/ ArrayClass<CRadioGroup*> RadioGroup;
/*0x298*/ bool bInitVisibility;
/*0x299*/ bool bVisibleBeforeResize;
/*0x29c*/ int IniFlags;
/*0x2a0*/ CXStr IniStorageName;
/*0x2a8*/ int IniVersion;
/*0x2ac*/ int LastResX;
/*0x2b0*/ int LastResY;
/*0x2b4*/ bool bLastResFullscreen;
/*0x2b8*/ int ContextMenuID;
/*0x2c0*/ CXWnd* pFirstVScrollChild;
/*0x2c8*/ int ContextMenuTipID;
/*0x2cc*/ bool bHasActivatedFirstTimeAlert;
/*0x2d0*/

//----------------------------------------------------------------------------
// functions that we provide offsets for
Expand Down Expand Up @@ -1178,7 +1178,7 @@ class [[offsetcomments]] CXWndManager
// CEQXWndManager
//============================================================================

// @sizeof(CEQXWndManager) == 0x298 :: 2024-11-08 (live) @ 0x140190185
// @sizeof(CEQXWndManager) == 0x298 :: 2024-11-12 (test) @ 0x1401907f5
constexpr size_t CEQXWndManager_size = 0x298;

class [[offsetcomments]] CEQXWndManager : public CXWndManager
Expand Down
7 changes: 5 additions & 2 deletions Constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,10 @@ enum EQExpansion
EQExpansionTOL = EXPANSION_LEVEL_TOL,
EQExpansionNOS = EXPANSION_LEVEL_NOS,
EQExpansionLS = EXPANSION_LEVEL_LS,
EQExpansionTOB = EXPANSION_LEVEL_TOB,
};

#define EQ_EXPANSION(x) (1 << (x - 1))
#define EQ_EXPANSION(x) (1ll << (x - 1))

// These macros define the bit mask representing expansion flags, often used to determine
// expansion ownership or requirements
Expand Down Expand Up @@ -572,6 +573,7 @@ enum EQExpansion
#define EXPANSION_TOL EQ_EXPANSION(EXPANSION_LEVEL_TOL)
#define EXPANSION_NOS EQ_EXPANSION(EXPANSION_LEVEL_NOS)
#define EXPANSION_LS EQ_EXPANSION(EXPANSION_LEVEL_LS)
#define EXPANSION_TOB EQ_EXPANSION(EXPANSION_LEVEL_TOB)

// Enumeration defining expansion bit mask representing expansion flags. Often used to
// determine expansion ownership or requirements.
Expand Down Expand Up @@ -608,10 +610,11 @@ enum EQExpansionOwned
EQExpansionTOLOwned = EXPANSION_TOL,
EQExpansionNOSOwned = EXPANSION_NOS,
EQExpansionLSOwned = EXPANSION_LS,
EQExpansionTOBOwned = EXPANSION_TOB,

// Mask representing all expansions
EQExpansionHighestOwnedPlusOne_,
EQExpansionAllOwned = ((EQExpansionHighestOwnedPlusOne_ - 1) << 1) - 1,
EQExpansionAllOwned = ((EQExpansionHighestOwnedPlusOne_ - 1ll) << 1) - 1,
};

constexpr int NUM_EXPANSIONS = MQ_EXPANSION_LEVEL;
Expand Down
8 changes: 4 additions & 4 deletions EQClasses.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ struct [[offsetcomments]] LabelCache
//============================================================================
//============================================================================

// @sizeof(EQGroundItem) == 0xa0 :: 2024-11-08 (live) @ 0x1401ed24c
// @sizeof(EQGroundItem) == 0xa0 :: 2024-11-12 (test) @ 0x1401ED9D2
constexpr size_t EQGroundItem_size = 0xa0;

class [[offsetcomments]] EQGroundItem
Expand Down Expand Up @@ -533,7 +533,7 @@ struct [[offsetcomments]] CTaskElement

const int MAX_TASK_ELEMENTS = 20;

// @sizeof(CTaskEntry) == 0x3d70 :: 2024-11-08 (live) @ 0x140048c44
// @sizeof(CTaskEntry) == 0x3d70 :: 2024-11-12 (test) @ 0x140048c44
constexpr size_t CTaskEntry_size = 0x3d70;

struct [[offsetcomments]] CTaskEntry
Expand Down Expand Up @@ -1137,7 +1137,7 @@ inline namespace deprecated {
}


// @sizeof(EQWorldData) == 0x1f88 :: 2024-11-08 (live) @ 0x1402566d4
// @sizeof(EQWorldData) == 0x1f88 :: 2024-11-12 (test) @ 0x1402562DA
constexpr size_t EQWorldData_size = 0x1f88;

class [[offsetcomments]] EQWorldData
Expand Down Expand Up @@ -1654,7 +1654,7 @@ using SKILL = EQ_Skill;
using PSKILL = EQ_Skill*;


// @sizeof(SkillManager) == 0x376a00 :: 2024-11-08 (live) @ 0x140256814
// @sizeof(SkillManager) == 0x376a00 :: 2024-11-12 (test) @ 0x14025641A
constexpr size_t SkillManager_size = 0x376a00;

class [[offsetcomments]] SkillManager
Expand Down
Loading

0 comments on commit a434c95

Please sign in to comment.