Merge branch 'master' into HTTPSizeT

Conflicts:
	src/HTTPServer/EnvelopeParser.h
	src/HTTPServer/HTTPFormParser.h
	src/HTTPServer/MultipartParser.h

lib/md5/md5.h

@@ -90,4 +90,4 @@ private:
 
 std::string md5(const std::string & str);
 
-#endif
+#endif

src/Bindings/DeprecatedBindings.cpp

@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "DeprecatedBindings.h"
+#undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 
 #include "Plugin.h"

src/Bindings/LuaState.cpp

@@ -11,6 +11,7 @@ extern "C"
 	#include "lua/src/lualib.h"
 }
 
+#undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 #include "Bindings.h"
 #include "ManualBindings.h"

src/Bindings/ManualBindings.cpp

@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ManualBindings.h"
+#undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 
 #include "Plugin.h"

src/Bindings/ManualBindings.h

@@ -5,4 +5,4 @@ class ManualBindings
 {
 public:
 	static void Bind( lua_State* tolua_S );
-};
+};

src/Bindings/PluginLua.cpp

@@ -5,7 +5,11 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
+#ifdef __APPLE__
+#define LUA_USE_MACOSX
+#else
 #define LUA_USE_POSIX
+#endif
 #include "PluginLua.h"
 #include "../CommandOutput.h"
 
@@ -14,6 +18,7 @@ extern "C"
 	#include "lua/src/lualib.h"
 }
 
+#undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 
 

src/Bindings/WebPlugin.cpp

@@ -110,4 +110,4 @@ AString cWebPlugin::SafeString( const AString & a_String )
 		RetVal.push_back( c );
 	}
 	return RetVal;
-}
+}

src/BlockTracer.h

@@ -28,6 +28,9 @@ public:
 	class cCallbacks abstract
 	{
 	public:
+		// Force a virtual destructor in descendants:
+		virtual ~cCallbacks() {}
+		
 		/** Called on each block encountered along the path, including the first block (path start)
 		When this callback returns true, the tracing is aborted.
 		*/

src/Entities/Boat.cpp

@@ -122,5 +122,3 @@ void cBoat::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
 
 	AddSpeed(ToAddSpeed);
 }
-
-	

src/Entities/Effects.h

@@ -27,4 +27,4 @@ enum ENUM_ENTITY_EFFECT
 	E_EFFECT_ABSORPTION = 22,
 	E_EFFECT_SATURATION = 23,
 } ; 
-// tolua_end
+// tolua_end

src/Entities/ExpOrb.h

@@ -42,4 +42,4 @@ protected:
 	
 	/** The number of ticks that the entity has existed / timer between collect and destroy; in msec */
 	float m_Timer;
-} ;  // tolua_export
+} ;  // tolua_export

src/Entities/Floater.h

@@ -43,4 +43,4 @@ protected:
 	// Entity IDs
 	int m_PlayerID;
 	int m_AttachedMobID;
-} ; // tolua_export
+} ; // tolua_export

src/Group.cpp

@@ -38,4 +38,4 @@ void cGroup::InheritFrom( cGroup* a_Group )
 void cGroup::ClearPermission()
 {
 	m_Permissions.clear();
-}
+}

src/HTTPServer/EnvelopeParser.h

@@ -19,6 +19,7 @@ public:
 	class cCallbacks
 	{
 	public:
+		// Force a virtual destructor in descendants:
 		virtual ~cCallbacks() {}
 		
 		/** Called when a full header line is parsed */

src/HTTPServer/HTTPFormParser.h

@@ -36,8 +36,8 @@ public:
 	class cCallbacks
 	{
 	public:
-	
+		// Force a virtual destructor in descendants:
-		virtual ~cCallbacks() {};
+		virtual ~cCallbacks() {}
 		
 		/// Called when a new file part is encountered in the form data
 		virtual void OnFileStart(cHTTPFormParser & a_Parser, const AString & a_FileName) = 0;

src/HTTPServer/MultipartParser.h

@@ -22,6 +22,7 @@ public:
 	class cCallbacks
 	{
 	public:
+		// Force a virtual destructor in descendants:
 		virtual ~cCallbacks() {}
 		
 		/** Called when a new part starts */

src/Items/ItemBoat.h

@@ -39,12 +39,20 @@ public:
 			public cBlockTracer::cCallbacks
 		{
 		public:
-			Vector3d Pos;
+			Vector3d m_Pos;
-			virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
+			bool m_HasFound;
+			
+			cCallbacks(void) :
+				m_HasFound(false)
 			{
-				if (a_BlockType != E_BLOCK_AIR)
+			}
+			
+			virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override
+			{
+				if (a_CBBlockType != E_BLOCK_AIR)
 				{
-					Pos = Vector3d(a_BlockX, a_BlockY, a_BlockZ);
+					m_Pos.Set(a_CBBlockX, a_CBBlockY, a_CBBlockZ);
+					m_HasFound = true;
 					return true;
 				}
 				return false;
@@ -57,15 +65,15 @@ public:
 
 		Tracer.Trace(Start.x, Start.y, Start.z, End.x, End.y, End.z);
 
-		double x = Callbacks.Pos.x;
+		if (!Callbacks.m_HasFound)
-		double y = Callbacks.Pos.y;
-		double z = Callbacks.Pos.z;
-		
-		if ((x == 0) && (y == 0) && (z == 0))
 		{
 			return false;
 		}
 
+		double x = Callbacks.m_Pos.x;
+		double y = Callbacks.m_Pos.y;
+		double z = Callbacks.m_Pos.z;
+		
 		cBoat * Boat = new cBoat(x + 0.5, y + 1, z + 0.5);
 		Boat->Initialize(a_World);
 

src/Mobs/Blaze.cpp

@@ -53,4 +53,4 @@ void cBlaze::Attack(float a_Dt)
 		m_AttackInterval = 0.0;
 		// ToDo: Shoot 3 fireballs instead of 1.
 	}
-}
+}

src/Mobs/Blaze.h

@@ -20,7 +20,3 @@ public:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void Attack(float a_Dt) override;
 } ;
-
-
-
-

src/Mobs/Skeleton.cpp

@@ -88,4 +88,4 @@ void cSkeleton::Attack(float a_Dt)
 		m_World->BroadcastSpawnEntity(*Arrow);
 		m_AttackInterval = 0.0;
 	}
-}
+}

src/OSSupport/Errors.cpp

@@ -22,7 +22,7 @@ AString GetOSErrorString( int a_ErrNo )
 	
 	// According to http://linux.die.net/man/3/strerror_r there are two versions of strerror_r():
 	
-	#if ( _GNU_SOURCE ) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
+	#if !defined(__APPLE__) && ( _GNU_SOURCE ) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
 	
 	char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer) );
 	if( res != NULL )

src/OSSupport/Sleep.h

@@ -4,4 +4,4 @@ class cSleep
 {
 public:
 	static void MilliSleep( unsigned int a_MilliSeconds );
-};
+};

src/OSSupport/Thread.h

@@ -23,4 +23,4 @@ private:
 	cEvent* m_StopEvent;
 
 	AString m_ThreadName;
-};
+};

src/WorldStorage/FireworksSerializer.h

@@ -89,4 +89,4 @@ public:
 	short m_FlightTimeInTicks;
 	std::vector<int> m_Colours;
 	std::vector<int> m_FadeColours;
-};
+};