Skip to content

Add "includeCustom" argument for getValidPedModels clientside #3796

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

Merged
merged 5 commits into from
Oct 15, 2024
+23 −10
Merged

Add "includeCustom" argument for getValidPedModels clientside #3796

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9f6345
edit clientside getValidPedModels add includeCustom
Fernando-A-Rocha Oct 14, 2024
2b87fd4
make it default true to not break backwards compatibility
Fernando-A-Rocha Oct 14, 2024
eac91d5
Update CLuaFunctionDefs.Util.cpp
Fernando-A-Rocha Oct 14, 2024
053fe99
Update Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Util.cpp
Fernando-A-Rocha Oct 14, 2024
352e762
Update CLuaFunctionDefs.Util.cpp
Fernando-A-Rocha Oct 14, 2024
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
33 changes: 23 additions & 10 deletions Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,40 @@

int CLuaFunctionDefs::GetValidPedModels(lua_State* luaVM)
{
int iIndex = 0;
bool includeCustom;
CScriptArgReader argStream(luaVM);
argStream.ReadBool(includeCustom, true);

auto modelManager = g_pClientGame->GetManager()->GetModelManager();

std::size_t index = 0;
lua_newtable(luaVM);

// Gather GTASA default skins
for (int i = 0; i <= 312; i++)
// Gather default and possibly custom GTASA ped model IDs
for (std::size_t i = 0; i <= 312; i++)
{
if (CClientPlayerManager::IsValidModel(i))
{
lua_pushnumber(luaVM, ++iIndex);
// Skip custom skins if not requested
if (!includeCustom && modelManager->FindModelByID(i))
continue;

lua_pushnumber(luaVM, ++index);
lua_pushnumber(luaVM, i);
lua_settable(luaVM, -3);
}
}

// Gather our custom skin model IDs allocated with engineRequestModel
// (there might be some < 313 as well, and since we don't want duplicates, we start at 313, others are already included by the loop above)
for (const auto& model : m_pManager->GetModelManager()->GetModelsByType(eClientModelType::PED, 313))
if (includeCustom)
{
lua_pushnumber(luaVM, ++iIndex);
lua_pushnumber(luaVM, model->GetModelID());
lua_settable(luaVM, -3);
// Gather the rest of custom skin model IDs allocated with engineRequestModel
// (there are usually some < 313 as well, and since we don't want duplicates, we start at 313, others are already included by the loop above)
for (const auto& model : m_pManager->GetModelManager()->GetModelsByType(eClientModelType::PED, 313))
{
lua_pushnumber(luaVM, ++index);
lua_pushnumber(luaVM, model->GetModelID());
lua_settable(luaVM, -3);
}
}

return 1;
Expand Down
Loading