Skip to content

Re-add dynamic ped ID allocating #349

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 2 commits into from
Sep 8, 2019
Merged

Re-add dynamic ped ID allocating #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d43c2
Re-add dynamic ped ID allocating
qaisjp Aug 29, 2018
3da3ae3
Merge branch 'master' into feature/dynamic-ped-allocating
qaisjp Sep 8, 2019
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
2 changes: 1 addition & 1 deletion Client/core/CModelCacheManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************
*
* PROJECT: Multi Theft Auto v1.0
* PROJECT: Multi Theft Auto
* LICENSE: See LICENSE in the top level directory
*
* Multi Theft Auto is available from http://www.multitheftauto.com/
Expand Down
16 changes: 5 additions & 11 deletions Client/game_sa/CGameSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,24 +300,18 @@ bool CGameSA::IsInForeground()
return *VAR_IsForegroundWindow;
}

CModelInfo* CGameSA::GetModelInfo(DWORD dwModelID)
CModelInfo* CGameSA::GetModelInfo(DWORD dwModelID, bool bCanBeInvalid)
{
DEBUG_TRACE("CModelInfo * CGameSA::GetModelInfo(DWORD dwModelID )");
DEBUG_TRACE("CModelInfo * CGameSA::GetModelInfo(DWORD dwModelID, bool bCanBeInvalid)");
if (dwModelID < MODELINFO_MAX)
{
if (ModelInfo[dwModelID].IsValid())
if (ModelInfo[dwModelID].IsValid() || bCanBeInvalid)
{
return &ModelInfo[dwModelID];
}
else
{
return NULL;
}
}
else
{
return NULL;
return nullptr;
}
return nullptr;
}

/**
Expand Down
Loading