diff options
| author | Samuel Barney <samjbarney@gmail.com> | 2015-07-29 17:04:03 +0200 |
|---|---|---|
| committer | Samuel Barney <samjbarney@gmail.com> | 2015-07-29 17:49:30 +0200 |
| commit | 804805d35a87c2acc9425d1762ad26b1ba2ec9ac (patch) | |
| tree | 13b603c8bbf8177da92ce87f5413fb646d204f3f /src/Tracer.cpp | |
| parent | Merge pull request #2376 from mjhanninen/fix-freebsd-build (diff) | |
| download | cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.gz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.bz2 cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.lz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.xz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.zst cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Tracer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Tracer.cpp b/src/Tracer.cpp index b54a50798..17f1bdfbc 100644 --- a/src/Tracer.cpp +++ b/src/Tracer.cpp @@ -264,7 +264,7 @@ bool cTracer::Trace(const Vector3f & a_Start, const Vector3f & a_Direction, int int Normal = GetHitNormal(a_Start, End, pos); if (Normal > 0) { - HitNormal = m_NormalTable()[Normal - 1]; + HitNormal = m_NormalTable()[static_cast<size_t>(Normal - 1)]; } return true; } @@ -349,7 +349,7 @@ int cTracer::intersect3D_SegmentPlane(const Vector3f & a_Origin, const Vector3f int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos) { Vector3i SmallBlockPos = a_BlockPos; - char BlockID = m_World->GetBlock(a_BlockPos.x, a_BlockPos.y, a_BlockPos.z); + BLOCKTYPE BlockID = static_cast<BLOCKTYPE>(m_World->GetBlock(a_BlockPos.x, a_BlockPos.y, a_BlockPos.z)); if ((BlockID == E_BLOCK_AIR) || IsBlockWater(BlockID)) { |