summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-11-27 17:18:51 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-11-27 17:18:51 +0100
commitf50a53e2907bcadd5c89781c4d9c025a45c8a113 (patch)
tree0d2ad5a9df78804ea6de68d812a8793869715e4c /src/control
parentUpdate README.md (diff)
downloadre3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.tar
re3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.tar.gz
re3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.tar.bz2
re3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.tar.lz
re3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.tar.xz
re3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.tar.zst
re3-f50a53e2907bcadd5c89781c4d9c025a45c8a113.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Garages.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 5a04285f..fc8f84f2 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -1260,9 +1260,9 @@ bool CGarage::IsPlayerOutsideGarage()
bool CGarage::IsEntityTouching3D(CEntity * pEntity)
{
float radius = pEntity->GetBoundRadius();
- if (pEntity->GetPosition().x - radius < m_fX1 || pEntity->GetPosition().x + radius > m_fX2 ||
- pEntity->GetPosition().y - radius < m_fY1 || pEntity->GetPosition().y + radius > m_fY2 ||
- pEntity->GetPosition().z - radius < m_fZ1 || pEntity->GetPosition().z + radius > m_fZ2)
+ if (m_fX1 - radius > pEntity->GetPosition().x || m_fX2 + radius < pEntity->GetPosition().x ||
+ m_fY1 - radius > pEntity->GetPosition().y || m_fY2 + radius < pEntity->GetPosition().y ||
+ m_fZ1 - radius > pEntity->GetPosition().z || m_fZ2 + radius < pEntity->GetPosition().z)
return false;
CColModel* pColModel = pEntity->GetColModel();
for (int i = 0; i < pColModel->numSpheres; i++) {
@@ -1271,9 +1271,9 @@ bool CGarage::IsEntityTouching3D(CEntity * pEntity)
if (pos.x + radius > m_fX1 && pos.x - radius < m_fX2 &&
pos.y + radius > m_fY1 && pos.y - radius < m_fY2 &&
pos.z + radius > m_fZ1 && pos.z - radius < m_fZ2)
- return false;
+ return true;
}
- return true;
+ return false;
}
bool CGarage::EntityHasASphereWayOutsideGarage(CEntity * pEntity, float fMargin)