2 files changed, 43 insertions, 13 deletions

diff --git a/source/BlockArea.cpp b/source/BlockArea.cpp
index c037c1115..8c4384ca3 100644
--- a/source/BlockArea.cpp
+++ b/source/BlockArea.cpp
@@ -919,8 +919,14 @@ void cBlockArea::RelLine(int a_RelX1, int a_RelY1, int a_RelZ1, int a_RelX2, int
 

 

 

-void cBlockArea::RotateCW(void)

+void cBlockArea::RotateCCW(void)

 {

+	if (!HasBlockTypes())

+	{

+		LOGWARNING("cBlockArea: Cannot rotate meta without blocktypes!");

+		return;

+	}

+	

 	ASSERT(!"Not implemented yet");

 	// TODO

 }

@@ -929,8 +935,14 @@ void cBlockArea::RotateCW(void)
 

 

 

-void cBlockArea::RotateCCW(void)

+void cBlockArea::RotateCW(void)

 {

+	if (!HasBlockTypes())

+	{

+		LOGWARNING("cBlockArea: Cannot rotate meta without blocktypes!");

+		return;

+	}

+

 	ASSERT(!"Not implemented yet");

 	// TODO

 }

@@ -941,6 +953,12 @@ void cBlockArea::RotateCCW(void)
 

 void cBlockArea::MirrorXY(void)

 {

+	if (!HasBlockTypes())

+	{

+		LOGWARNING("cBlockArea: Cannot mirror meta without blocktypes!");

+		return;

+	}

+

 	ASSERT(!"Not implemented yet");

 	// TODO

 }

@@ -951,6 +969,12 @@ void cBlockArea::MirrorXY(void)
 

 void cBlockArea::MirrorXZ(void)

 {

+	if (!HasBlockTypes())

+	{

+		LOGWARNING("cBlockArea: Cannot mirror meta without blocktypes!");

+		return;

+	}

+

 	ASSERT(!"Not implemented yet");

 	// TODO

 }

@@ -961,6 +985,12 @@ void cBlockArea::MirrorXZ(void)
 

 void cBlockArea::MirrorYZ(void)

 {

+	if (!HasBlockTypes())

+	{

+		LOGWARNING("cBlockArea: Cannot mirror meta without blocktypes!");

+		return;

+	}

+

 	ASSERT(!"Not implemented yet");

 	// TODO

 }

@@ -989,7 +1019,7 @@ void cBlockArea::RotateCCWNoMeta(void)
 		std::swap(m_BlockTypes, NewTypes);

 		delete[] NewTypes;

 	}

-	if (HasBlockTypes())

+	if (HasBlockMetas())

 	{

 		NIBBLETYPE * NewMetas = new NIBBLETYPE[m_SizeX * m_SizeY * m_SizeZ];

 		for (int x = 0; x < m_SizeX; x++)

@@ -1034,7 +1064,7 @@ void cBlockArea::RotateCWNoMeta(void)
 		std::swap(m_BlockTypes, NewTypes);

 		delete[] NewTypes;

 	}

-	if (HasBlockTypes())

+	if (HasBlockMetas())

 	{

 		NIBBLETYPE * NewMetas = new NIBBLETYPE[m_SizeX * m_SizeY * m_SizeZ];

 		for (int z = 0; z < m_SizeZ; z++)

@@ -1089,7 +1119,7 @@ void cBlockArea::MirrorXYNoMeta(void)
 				}  // for x

 			}  // for z

 		}  // for y

-	}  // if (HasBlockTypes)

+	}  // if (HasBlockMetas)

 }

 

 

@@ -1126,7 +1156,7 @@ void cBlockArea::MirrorXZNoMeta(void)
 				}  // for x

 			}  // for z

 		}  // for y

-	}  // if (HasBlockTypes)

+	}  // if (HasBlockMetas)

 }

 

 

@@ -1163,7 +1193,7 @@ void cBlockArea::MirrorYZNoMeta(void)
 				}  // for x

 			}  // for z

 		}  // for y

-	}  // if (HasBlockTypes)

+	}  // if (HasBlockMetas)

 }

 

 

diff --git a/source/BlockArea.h b/source/BlockArea.h
index 7624dec23..76c4f749a 100644
--- a/source/BlockArea.h
+++ b/source/BlockArea.h
@@ -149,12 +149,12 @@ public:
 		NIBBLETYPE a_BlockLight = 0, NIBBLETYPE a_BlockSkyLight = 0x0f

 	);

 	

-	/// Rotates the entire area clockwise around the Y axis

-	void RotateCW(void);

-	

 	/// Rotates the entire area counter-clockwise around the Y axis

 	void RotateCCW(void);

 	

+	/// Rotates the entire area clockwise around the Y axis

+	void RotateCW(void);

+	

 	/// Mirrors the entire area around the XY plane

 	void MirrorXY(void);

 	

@@ -164,12 +164,12 @@ public:
 	/// Mirrors the entire area around the YZ plane

 	void MirrorYZ(void);

 	

-	/// Rotates the entire area clockwise around the Y axis, doesn't use blockhandlers for block meta

-	void RotateCWNoMeta(void);

-	

 	/// Rotates the entire area counter-clockwise around the Y axis, doesn't use blockhandlers for block meta

 	void RotateCCWNoMeta(void);

 	

+	/// Rotates the entire area clockwise around the Y axis, doesn't use blockhandlers for block meta

+	void RotateCWNoMeta(void);

+	

 	/// Mirrors the entire area around the XY plane, doesn't use blockhandlers for block meta

 	void MirrorXYNoMeta(void);