Merge remote-tracking branch 'origin/experimental' into experimental

This commit is contained in:
TotallyNotElite 2018-10-27 17:47:58 +02:00
commit f936f214b6
2 changed files with 17 additions and 1 deletions

View File

@ -112,7 +112,7 @@ class ignoremanager
Vector second = end->m_center;
first.z += 42;
second.z += 42;
return IsVectorVisible(first, second, false);
return IsVectorVisible(first, second, true);
}
static ignore_status runIgnoreChecks(CNavArea *begin, CNavArea *end)
{

View File

@ -86,6 +86,7 @@ bool trace::FilterNoPlayer::ShouldHitEntity(IHandleEntity *handle, int mask)
return false;
entity = (IClientEntity *) handle;
clazz = entity->GetClientClass();
/* Ignore invisible entities that we don't wanna hit */
switch (clazz->m_ClassID)
{
@ -129,6 +130,21 @@ void trace::FilterNoEntity::SetSelf(IClientEntity *self)
bool trace::FilterNoEntity::ShouldHitEntity(IHandleEntity *handle, int mask)
{
IClientEntity *entity;
ClientClass *clazz;
if (!handle)
return false;
entity = (IClientEntity *) handle;
clazz = entity->GetClientClass();
// Hit doors, carts, etc
switch (clazz->m_ClassID)
{
case 6:
case 7:
return true;
}
return false;
}