diff options
| author | Mattes D <github@xoft.cz> | 2017-02-05 16:00:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-05 16:00:38 +0100 |
| commit | cbff1378fd78b6eaa59bad21759c8b89f1dab341 (patch) | |
| tree | d992f37f36a15ff110d9d3e37df2426407522f54 /src/BlockArea.cpp | |
| parent | Merge pull request #3565 from cuberite/luacheck (diff) | |
| download | cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.tar cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.tar.gz cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.tar.bz2 cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.tar.lz cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.tar.xz cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.tar.zst cuberite-cbff1378fd78b6eaa59bad21759c8b89f1dab341.zip | |
Diffstat (limited to 'src/BlockArea.cpp')
| -rw-r--r-- | src/BlockArea.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index 2c3af5fec..bca5544f9 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -434,7 +434,7 @@ void cBlockArea::SetOrigin(const Vector3i & a_Origin) -bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, int a_MinBlockX, int a_MaxBlockX, int a_MinBlockY, int a_MaxBlockY, int a_MinBlockZ, int a_MaxBlockZ, int a_DataTypes) +bool cBlockArea::Read(cForEachChunkProvider & a_ForEachChunkProvider, int a_MinBlockX, int a_MaxBlockX, int a_MinBlockY, int a_MaxBlockY, int a_MinBlockZ, int a_MaxBlockZ, int a_DataTypes) { // Normalize the coords: if (a_MinBlockX > a_MaxBlockX) @@ -501,7 +501,7 @@ bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, int a_MinB cChunkDef::AbsoluteToRelative(a_MaxBlockX, a_MaxBlockY, a_MaxBlockZ, MaxChunkX, MaxChunkZ); // Query block data: - if (!a_ForEachChunkProvider->ForEachChunkInRect(MinChunkX, MaxChunkX, MinChunkZ, MaxChunkZ, Reader)) + if (!a_ForEachChunkProvider.ForEachChunkInRect(MinChunkX, MaxChunkX, MinChunkZ, MaxChunkZ, Reader)) { Clear(); return false; @@ -514,7 +514,7 @@ bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, int a_MinB -bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, const cCuboid & a_Bounds, int a_DataTypes) +bool cBlockArea::Read(cForEachChunkProvider & a_ForEachChunkProvider, const cCuboid & a_Bounds, int a_DataTypes) { return Read( a_ForEachChunkProvider, @@ -529,7 +529,7 @@ bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, const cCub -bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, const Vector3i & a_Point1, const Vector3i & a_Point2, int a_DataTypes) +bool cBlockArea::Read(cForEachChunkProvider & a_ForEachChunkProvider, const Vector3i & a_Point1, const Vector3i & a_Point2, int a_DataTypes) { return Read( a_ForEachChunkProvider, @@ -544,7 +544,7 @@ bool cBlockArea::Read(cForEachChunkProvider * a_ForEachChunkProvider, const Vect -bool cBlockArea::Write(cForEachChunkProvider * a_ForEachChunkProvider, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) +bool cBlockArea::Write(cForEachChunkProvider & a_ForEachChunkProvider, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) { ASSERT((a_DataTypes & GetDataTypes()) == a_DataTypes); // Are you requesting only the data that I have? a_DataTypes = a_DataTypes & GetDataTypes(); // For release builds, silently cut off the datatypes that I don't have @@ -561,14 +561,14 @@ bool cBlockArea::Write(cForEachChunkProvider * a_ForEachChunkProvider, int a_Min a_MinBlockY = std::max(cChunkDef::Height - m_Size.y, 0); } - return a_ForEachChunkProvider->WriteBlockArea(*this, a_MinBlockX, a_MinBlockY, a_MinBlockZ, a_DataTypes); + return a_ForEachChunkProvider.WriteBlockArea(*this, a_MinBlockX, a_MinBlockY, a_MinBlockZ, a_DataTypes); } -bool cBlockArea::Write(cForEachChunkProvider * a_ForEachChunkProvider, const Vector3i & a_MinCoords, int a_DataTypes) +bool cBlockArea::Write(cForEachChunkProvider & a_ForEachChunkProvider, const Vector3i & a_MinCoords, int a_DataTypes) { return Write( a_ForEachChunkProvider, |