Skip to content

Add CEconItemDefinition::m_iItemSets #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Natanel-Shitrit wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add CEconItemDefinition::m_iItemSets #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0183869
Add `m_iItemSets` accessors
Natanel-Shitrit Mar 5, 2022
741208e
Add `m_iItemSets` natives
Natanel-Shitrit Mar 5, 2022
6564199
Add `m_iItemSets` natives to include
Natanel-Shitrit Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,14 @@ class CEconItemDefinition

// other
CEconItemDefinition* GetOwningPackBundle() const { return m_pOwningPackBundle; }

// Item sets
int GetItemSetsCount() const { return m_iItemSets.Count(); }
int GetItemSet(int iIndex) const
{
return m_iItemSets.IsValidIndex(iIndex) ? m_iItemSets[iIndex] : -1;
}

private:
void* m_pVTable; // 0 (4)
KeyValues* m_pKVItem; // 4 (4)
Expand Down
25 changes: 24 additions & 1 deletion natives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/**
* EconAPI
* Copyright (C) 2021-2022 Natanel 'LuqS' Shitrit
*
Expand Down Expand Up @@ -908,6 +908,26 @@ static cell_t CEconItemDefinition_GetModel(IPluginContext* pContext, const cell_
return numBytes;
}

static cell_t CEconItemSetDefinition_GetItemSetsCount(IPluginContext* pContext, const cell_t* params)
{
CEconItemDefinition* pItemDefinition = reinterpret_cast<CEconItemDefinition*>(params[1]);

SM_NATIVE_ERROR_IF_NULL(pItemDefinition);

return pItemDefinition->GetItemSetsCount();
}

static cell_t CEconItemSetDefinition_GetItemSet(IPluginContext* pContext, const cell_t* params)
{
SM_NATIVE_ERROR_IF_NULL(g_pCEconItemSchema);

CEconItemDefinition* pItemDefinition = reinterpret_cast<CEconItemDefinition*>(params[1]);

SM_NATIVE_ERROR_IF_NULL(pItemDefinition);

return reinterpret_cast<cell_t>(g_pCEconItemSchema->GetItemSetDefinition(pItemDefinition->GetItemSet(params[2])));
}

// CCStrike15ItemDefinition
static cell_t CEconItemDefinition_GetLoadoutSlot(IPluginContext* pContext, const cell_t* params)
{
Expand Down Expand Up @@ -2803,6 +2823,9 @@ extern const sp_nativeinfo_t g_ExtensionNatives[] =
{ "CEconItemDefinition.GetLoadoutSlot", CEconItemDefinition_GetLoadoutSlot },
{ "CEconItemDefinition.GetModel", CEconItemDefinition_GetModel },

{ "CEconItemDefinition.ItemSetsCount.get", CEconItemSetDefinition_GetItemSetsCount },
{ "CEconItemDefinition.GetItemSet", CEconItemSetDefinition_GetItemSet },

// CPaintKit
{ "CPaintKit.Get", CPaintKit_Get },
{ "CPaintKit.Count", CPaintKit_Count },
Expand Down
10 changes: 10 additions & 0 deletions sourcemod/scripting/include/EconAPI.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,13 @@ methodmap CEconItemDefinition
* @error Invalid model_type or invalid CEconItemDefinition. (NULL)
*/
public native int GetModel(ModelType model_type, char[] buffer, int len);

property int ItemSetsCount
{
public native get();
}

public native CEconItemSetDefinition GetItemSet(int index);
}

methodmap CPaintKit
Expand Down Expand Up @@ -1709,6 +1716,9 @@ public __ext_EconAPI_SetNTVOptional()
MarkNativeAsOptional("CEconItemDefinition.GetLoadoutSlot");
MarkNativeAsOptional("CEconItemDefinition.GetModel");

MarkNativeAsOptional("CEconItemDefinition.ItemSetsCount.get");
MarkNativeAsOptional("CEconItemDefinition.GetItemSet");

// CPaintKit
MarkNativeAsOptional("CPaintKit.Get");
MarkNativeAsOptional("CPaintKit.Count");
Expand Down