diff options
| author | Mattes D <github@xoft.cz> | 2014-02-04 22:10:44 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-02-04 22:10:44 +0100 |
| commit | dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435 (patch) | |
| tree | 01bca60c90c1d5a6a5d00429a95bb99b3dfa9ac1 /src/BoundingBox.cpp | |
| parent | Fixed chest placement. (diff) | |
| parent | Fix gcc not having operator ++ on enums (diff) | |
| download | cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.tar cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.tar.gz cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.tar.bz2 cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.tar.lz cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.tar.xz cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.tar.zst cuberite-dad49c6fddaa361cd4f98b095cfeb0e2d2e1a435.zip | |
Diffstat (limited to 'src/BoundingBox.cpp')
| -rw-r--r-- | src/BoundingBox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp index d0943d42a..86d4546c7 100644 --- a/src/BoundingBox.cpp +++ b/src/BoundingBox.cpp @@ -228,7 +228,7 @@ bool cBoundingBox::IsInside(const Vector3d & a_Min, const Vector3d & a_Max, doub -bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Line1, const Vector3d & a_Line2, double & a_LineCoeff, char & a_Face) +bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Line1, const Vector3d & a_Line2, double & a_LineCoeff, eBlockFace & a_Face) { return CalcLineIntersection(m_Min, m_Max, a_Line1, a_Line2, a_LineCoeff, a_Face); } @@ -237,7 +237,7 @@ bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Line1, const Vector3d -bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Min, const Vector3d & a_Max, const Vector3d & a_Line1, const Vector3d & a_Line2, double & a_LineCoeff, char & a_Face) +bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Min, const Vector3d & a_Max, const Vector3d & a_Line1, const Vector3d & a_Line2, double & a_LineCoeff, eBlockFace & a_Face) { if (IsInside(a_Min, a_Max, a_Line1)) { @@ -247,7 +247,7 @@ bool cBoundingBox::CalcLineIntersection(const Vector3d & a_Min, const Vector3d & return true; } - char Face = BLOCK_FACE_NONE; + eBlockFace Face = BLOCK_FACE_NONE; double Coeff = Vector3d::NO_INTERSECTION; // Check each individual bbox face for intersection with the line, remember the one with the lowest coeff |