summaryrefslogtreecommitdiffstats
path: root/src/core/Collision.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-09 09:57:44 +0200
committeraap <aap@papnet.eu>2019-07-09 09:57:44 +0200
commit74fcbc8c0a6bbac8e8057655c5f1133e15c63656 (patch)
tree75dabaa5dc285f1541c6ee058028c7f57095eecf /src/core/Collision.h
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar
re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.gz
re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.bz2
re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.lz
re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.xz
re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.zst
re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.zip
Diffstat (limited to 'src/core/Collision.h')
-rw-r--r--src/core/Collision.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/Collision.h b/src/core/Collision.h
index 5a9058d3..b2fe6564 100644
--- a/src/core/Collision.h
+++ b/src/core/Collision.h
@@ -147,7 +147,7 @@ public:
static bool ProcessSphereTriangle(const CColSphere &sph, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq);
static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough);
static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly);
- static int32 ProcessColModels(const CMatrix &matrix1, CColModel &model1, const CMatrix &matrix2, CColModel &model2, CColPoint *point1, CColPoint *point2, float *linedists);
+ static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists);
// TODO:
// CCollision::IsStoredPolyStillValidVerticalLine