1 files changed, 38 insertions, 11 deletions

diff --git a/src/Defines.h b/src/Defines.h
index 6ab2274a4..38411c69d 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "ChatColor.h"
+#include <limits>
 
 
 
@@ -276,6 +277,26 @@ inline eBlockFace RotateBlockFaceCW(eBlockFace a_BlockFace)
 
 
 
+/** Returns the textual representation of the BlockFace constant. */
+inline AString BlockFaceToString(eBlockFace a_BlockFace)
+{
+	switch (a_BlockFace)
+	{
+		case BLOCK_FACE_XM: return "BLOCK_FACE_XM";
+		case BLOCK_FACE_XP: return "BLOCK_FACE_XP";
+		case BLOCK_FACE_YM: return "BLOCK_FACE_YM";
+		case BLOCK_FACE_YP: return "BLOCK_FACE_YP";
+		case BLOCK_FACE_ZM: return "BLOCK_FACE_ZM";
+		case BLOCK_FACE_ZP: return "BLOCK_FACE_ZP";
+		case BLOCK_FACE_NONE: return "BLOCK_FACE_NONE";
+	}
+	return Printf("Unknown BLOCK_FACE: %d", a_BlockFace);
+}
+
+
+
+
+
 inline bool IsValidBlock(int a_BlockType)
 {
 	if (
@@ -469,7 +490,7 @@ inline void EulerToVector(double a_Pan, double a_Pitch, double & a_X, double & a
 
 inline void VectorToEuler(double a_X, double a_Y, double a_Z, double & a_Pan, double & a_Pitch)
 {
-	if (a_X != 0)
+	if (fabs(a_X) < std::numeric_limits<double>::epsilon())
 	{
 		a_Pan = atan2(a_Z, a_X) * 180 / PI - 90;
 	}
@@ -509,16 +530,22 @@ enum eMessageType
 	// http://forum.mc-server.org/showthread.php?tid=1212
 	// MessageType...
 
-	mtCustom, // Send raw data without any processing
-	mtFailure, // Something could not be done (i.e. command not executed due to insufficient privilege)
-	mtInformation, // Informational message (i.e. command usage)
-	mtSuccess, // Something executed successfully
-	mtWarning, // Something concerning (i.e. reload) is about to happen
-	mtFatal, // Something catastrophic occured (i.e. plugin crash)
-	mtDeath, // Denotes death of player
-	mtPrivateMessage, // Player to player messaging identifier
-	mtJoin, // A player has joined the server
-	mtLeave, // A player has left the server
+	mtCustom,          // Send raw data without any processing
+	mtFailure,         // Something could not be done (i.e. command not executed due to insufficient privilege)
+	mtInformation,     // Informational message (i.e. command usage)
+	mtSuccess,         // Something executed successfully
+	mtWarning,         // Something concerning (i.e. reload) is about to happen
+	mtFatal,           // Something catastrophic occured (i.e. plugin crash)
+	mtDeath,           // Denotes death of player
+	mtPrivateMessage,  // Player to player messaging identifier
+	mtJoin,            // A player has joined the server
+	mtLeave,           // A player has left the server
+	
+	// Common aliases:
+	mtFail  = mtFailure,
+	mtError = mtFailure,
+	mtInfo  = mtInformation,
+	mtPM    = mtPrivateMessage,
 };