diff options
author | aap <aap@papnet.eu> | 2020-05-24 15:14:27 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-25 18:33:34 +0200 |
commit | 7bf833785411955c2bcf35ed55e9d206facbc575 (patch) | |
tree | a69383e116ca35a5c6ac14e40a462d29b8b46c87 /src/core/Collision.cpp | |
parent | how did saving even work in original III? (diff) | |
download | re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.gz re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.bz2 re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.lz re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.xz re3-7bf833785411955c2bcf35ed55e9d206facbc575.tar.zst re3-7bf833785411955c2bcf35ed55e9d206facbc575.zip |
Diffstat (limited to 'src/core/Collision.cpp')
-rw-r--r-- | src/core/Collision.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index c29c1d28..d2e08f7c 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -414,8 +414,9 @@ CCollision::TestSphereTriangle(const CColSphere &sphere, return dist < sphere.radius; } +//--MIAMI: TODO bool -CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough) +CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough) { static CMatrix matTransform; int i; @@ -1042,10 +1043,11 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere, return true; } +//--MIAMI: TODO bool CCollision::ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, - CColPoint &point, float &mindist, bool ignoreSeeThrough) + CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough) { static CMatrix matTransform; int i; @@ -1081,10 +1083,11 @@ CCollision::ProcessLineOfSight(const CColLine &line, return false; } +//--MIAMI: TODO bool CCollision::ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, - CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly) + CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough, CStoredCollPoly *poly) { static CStoredCollPoly TempStoredPoly; int i; |