flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed crash in cBlockArea rotation.

Browse Source 
Fixes #720.
This commit is contained in:
madmaxoft 2014-02-24 09:34:00 +01:00
parent 728e3c68b6
commit 0aa8f765f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BlockArea.cpp
View File

@ -878,7 +878,7 @@ void cBlockArea::RotateCCW(void)
int NewX = z; int NewX = z;
for (int y = 0; y < m_SizeY; y++) for (int y = 0; y < m_SizeY; y++)
{ {
int NewIdx = NewX + NewZ * m_SizeX + y * m_SizeX * m_SizeZ; int NewIdx = NewX + NewZ * m_SizeZ + y * m_SizeX * m_SizeZ;
int OldIdx = MakeIndex(x, y, z); int OldIdx = MakeIndex(x, y, z);
NewTypes[NewIdx] = m_BlockTypes[OldIdx]; NewTypes[NewIdx] = m_BlockTypes[OldIdx];
NewMetas[NewIdx] = BlockHandler(m_BlockTypes[OldIdx])->MetaRotateCCW(m_BlockMetas[OldIdx]); NewMetas[NewIdx] = BlockHandler(m_BlockTypes[OldIdx])->MetaRotateCCW(m_BlockMetas[OldIdx]);
@ -923,7 +923,7 @@ void cBlockArea::RotateCW(void)
int NewX = m_SizeZ - z - 1; int NewX = m_SizeZ - z - 1;
for (int y = 0; y < m_SizeY; y++) for (int y = 0; y < m_SizeY; y++)
{ {
int NewIdx = NewX + NewZ * m_SizeX + y * m_SizeX * m_SizeZ; int NewIdx = NewX + NewZ * m_SizeZ + y * m_SizeX * m_SizeZ;
int OldIdx = MakeIndex(x, y, z); int OldIdx = MakeIndex(x, y, z);
NewTypes[NewIdx] = m_BlockTypes[OldIdx]; NewTypes[NewIdx] = m_BlockTypes[OldIdx];
NewMetas[NewIdx] = BlockHandler(m_BlockTypes[OldIdx])->MetaRotateCW(m_BlockMetas[OldIdx]); NewMetas[NewIdx] = BlockHandler(m_BlockTypes[OldIdx])->MetaRotateCW(m_BlockMetas[OldIdx]);
@ -1075,7 +1075,7 @@ void cBlockArea::RotateCCWNoMeta(void)
int NewX = z; int NewX = z;
for (int y = 0; y < m_SizeY; y++) for (int y = 0; y < m_SizeY; y++)
{ {
NewTypes[NewX + NewZ * m_SizeX + y * m_SizeX * m_SizeZ] = m_BlockTypes[MakeIndex(x, y, z)]; NewTypes[NewX + NewZ * m_SizeZ + y * m_SizeX * m_SizeZ] = m_BlockTypes[MakeIndex(x, y, z)];
} // for y } // for y
} // for z } // for z
} // for x } // for x
@ -1093,7 +1093,7 @@ void cBlockArea::RotateCCWNoMeta(void)
int NewX = z; int NewX = z;
for (int y = 0; y < m_SizeY; y++) for (int y = 0; y < m_SizeY; y++)
{ {
NewMetas[NewX + NewZ * m_SizeX + y * m_SizeX * m_SizeZ] = m_BlockMetas[MakeIndex(x, y, z)]; NewMetas[NewX + NewZ * m_SizeZ + y * m_SizeX * m_SizeZ] = m_BlockMetas[MakeIndex(x, y, z)];
} // for y } // for y
} // for z } // for z
} // for x } // for x
@ -1120,7 +1120,7 @@ void cBlockArea::RotateCWNoMeta(void)
int NewZ = x; int NewZ = x;
for (int y = 0; y < m_SizeY; y++) for (int y = 0; y < m_SizeY; y++)
{ {
NewTypes[NewX + NewZ * m_SizeX + y * m_SizeX * m_SizeZ] = m_BlockTypes[MakeIndex(x, y, z)]; NewTypes[NewX + NewZ * m_SizeZ + y * m_SizeX * m_SizeZ] = m_BlockTypes[MakeIndex(x, y, z)];
} // for y } // for y
} // for x } // for x
} // for z } // for z
@ -1138,7 +1138,7 @@ void cBlockArea::RotateCWNoMeta(void)
int NewZ = x; int NewZ = x;
for (int y = 0; y < m_SizeY; y++) for (int y = 0; y < m_SizeY; y++)
{ {
NewMetas[NewX + NewZ * m_SizeX + y * m_SizeX * m_SizeZ] = m_BlockMetas[MakeIndex(x, y, z)]; NewMetas[NewX + NewZ * m_SizeZ + y * m_SizeX * m_SizeZ] = m_BlockMetas[MakeIndex(x, y, z)];
} // for y } // for y
} // for x } // for x
} // for z } // for z