thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-21 20:27:13 +01:00
Code Releases Activity

Return a null entity instance instead of throwing an error.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2018-07-27 19:50:18 +03:00
parent 2764028c43
commit 83c4e5ba23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Entity/Vehicle.cpp
View File

@ -260,19 +260,21 @@ LightObj & CVehicle::GetOccupant(Int32 slot) const
if (INVALID_ENTITYEX(id, SQMOD_PLAYER_POOL)) if (INVALID_ENTITYEX(id, SQMOD_PLAYER_POOL))
{ {
const vcmpError err = _Func->GetLastError(); const vcmpError err = _Func->GetLastError();
// Identify the type of error // Identify the type of error and at least log it
if (err == vcmpErrorArgumentOutOfBounds) if (err == vcmpErrorArgumentOutOfBounds)
{ {
STHROWF("Out of range slot [%d]", slot); LogWrn("Out of range slot [%d]", slot);
} }
else if (err == vcmpErrorNoSuchEntity) else if (err == vcmpErrorNoSuchEntity)
{ {
STHROWF("Unoccupied slot [%d]", id); LogWrn("Unoccupied slot [%d]", id);
} }
else else
{ {
STHROWF("Error while getting occupant at [%d] for [%s]", slot, m_Tag.c_str()); LogWrn("Error while getting occupant at [%d] for [%s]", slot, m_Tag.c_str());
} }
// Default to a null instance
return Core::Get().GetNullVehicle().GetObject();
} }
// Return the requested information // Return the requested information
return Core::Get().GetPlayer(id).mObj; return Core::Get().GetPlayer(id).mObj;