Skip to content

Commit e5e1305

Browse files
committed
Deleted one extra variable from cSPVerbTrayCollection.h
1 parent 748f19d commit e5e1305

2 files changed

Lines changed: 24 additions & 10 deletions

File tree

Spore ModAPI/Spore/Editors/cSPEditorVerbTrayCollection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ namespace Editors
1212
public:
1313
static const uint32_t TYPE = 0x4aa3b42;
1414
};
15-
ASSERT_SIZE(cSPEditorVerbTrayCollection, 0x58);
15+
ASSERT_SIZE(cSPEditorVerbTrayCollection, 0x54);
1616
}

Spore ModAPI/Spore/Editors/cSPVerbTrayCollection.h

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@
1212

1313
namespace Editors
1414
{
15-
class cSPVerbTrayCollection
16-
: public UTFWin::IWinProc
17-
, public DefaultRefCounted
15+
class ISPVerbTrayCollection
1816
{
1917
public:
20-
static const uint32_t TYPE = 0x4976064;
21-
22-
/* 00h */ virtual int AddRef() override;
23-
/* 04h */ virtual int Release() override;
18+
//* 00h */ virtual int AddRef();
19+
//* 04h */ virtual int Release();
2420
//* 08h */ virtual ~cSPVerbTrayCollection();
2521
//* 0Ch */ virtual void* Cast(uint32_t typeID);
2622
/* 10h */ virtual void Init(App::PropertyList* propList);
@@ -30,10 +26,28 @@ namespace Editors
3026
/* 20h */ virtual UTFWin::IWindow* GetTrayWindow(uint32_t controlID);
3127
/* 24h */ virtual void InitTrays(uint32_t instanceID, uint32_t typeID, uint32_t groupID);
3228
/* 28h */ virtual void LayoutCollection();
29+
};
30+
class cSPVerbTrayCollection
31+
: public ISPVerbTrayCollection
32+
, public DefaultRefCounted
33+
{
34+
public:
35+
static const uint32_t TYPE = 0x4976064;
36+
37+
/* 00h */ virtual int AddRef() override;
38+
/* 04h */ virtual int Release() override;
39+
//* 08h */ virtual ~cSPVerbTrayCollection();
40+
//* 0Ch */ virtual void* Cast(uint32_t typeID);
41+
/* 10h */ virtual void Init(App::PropertyList* propList) override;
42+
/* 14h */ virtual void SetTrayData(eastl::vector<VerbIconDataPtr>*) override;
43+
/* 18h */ virtual void Shutdown() override;
44+
/* 1Ch */ virtual void Update(App::PropertyList* propList) override;
45+
/* 20h */ virtual UTFWin::IWindow* GetTrayWindow(uint32_t controlID) override;
46+
/* 24h */ virtual void InitTrays(uint32_t instanceID, uint32_t typeID, uint32_t groupID) override;
47+
/* 28h */ virtual void LayoutCollection() override;
3348

3449
public:
3550
/* 0Ch */ eastl::vector<cSPEditorVerbIconTrayPtr> mVerbTrays;
36-
/* 1Ch */ int field_1C;
3751
/* 20h */ IWindowPtr mWinParent;
3852
/* 24h */ IWindowPtr mWinVerbTray;
3953
/* 28h */ eastl::map<IWindowPtr, cSPEditorVerbIconTrayPtr> mWindowsToVerbTrays;
@@ -42,6 +56,6 @@ namespace Editors
4256
/* 4Ch */ eLayoutStyle mLayoutStyle; //kFill
4357
/* 50h */ bool field_50; //false
4458
};
45-
ASSERT_SIZE(cSPVerbTrayCollection, 0x58);
59+
ASSERT_SIZE(cSPVerbTrayCollection, 0x54);
4660
}
4761

0 commit comments

Comments
 (0)