1 files changed, 61 insertions, 52 deletions

diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index dcb660c3f..b9ca2f29b 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -29,6 +29,8 @@ extern "C"
 	#include "lua/src/lauxlib.h"
 }
 
+#include "../Vector3.h"
+
 
 
 
@@ -36,6 +38,7 @@ extern "C"
 class cWorld;
 class cPlayer;
 class cEntity;
+class cProjectileEntity;
 class cMonster;
 class cItem;
 class cItems;
@@ -52,7 +55,6 @@ class cWebAdmin;
 struct HTTPTemplateRequest;
 class cTNTEntity;
 class cCreeper;
-class Vector3i;
 class cHopperEntity;
 class cBlockEntity;
 
@@ -139,9 +141,14 @@ public:
 	/** Allows this object to be used in the same way as a lua_State *, for example in the LuaLib functions */
 	operator lua_State * (void) { return m_LuaState; }
 	
-	/** Creates the m_LuaState, if not closed already. This state will be automatically closed in the destructor */
+	/** Creates the m_LuaState, if not closed already. This state will be automatically closed in the destructor.
+	The regular Lua libs are registered, but the MCS API is not registered (so that Lua can be used as
+	lite-config as well), use RegisterAPILibs() to do that. */
 	void Create(void);
 	
+	/** Registers all the API libraries that MCS provides into m_LuaState. */
+	void RegisterAPILibs(void);
+	
 	/** Closes the m_LuaState, if not closed already */
 	void Close(void);
 	
@@ -177,6 +184,7 @@ public:
 	void Push(cPlayer * a_Player);
 	void Push(const cPlayer * a_Player);
 	void Push(cEntity * a_Entity);
+	void Push(cProjectileEntity * a_ProjectileEntity);
 	void Push(cMonster * a_Monster);
 	void Push(cItem * a_Item);
 	void Push(cItems * a_Items);
@@ -197,6 +205,19 @@ public:
 	void Push(void * a_Ptr);
 	void Push(cHopperEntity * a_Hopper);
 	void Push(cBlockEntity * a_BlockEntity);
+	
+	/** Retrieve value at a_StackPos, if it is a valid bool. If not, a_Value is unchanged */
+	void GetStackValue(int a_StackPos, bool & a_Value);
+	
+	/** Retrieve value at a_StackPos, if it is a valid string. If not, a_Value is unchanged */
+	void GetStackValue(int a_StackPos, AString & a_Value);
+	
+	/** Retrieve value at a_StackPos, if it is a valid number. If not, a_Value is unchanged */
+	void GetStackValue(int a_StackPos, int & a_Value);
+	
+	/** Retrieve value at a_StackPos, if it is a valid number. If not, a_Value is unchanged */
+	void GetStackValue(int a_StackPos, double & a_Value);
+	
 
 	/** Call any 0-param 0-return Lua function in a single line: */
 	template <typename FnT>
@@ -270,7 +291,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -292,7 +313,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		ASSERT(InitialTop == lua_gettop(m_LuaState));
 		return true;
@@ -315,7 +336,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -338,7 +359,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -362,7 +383,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -387,7 +408,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -414,7 +435,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -442,7 +463,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -471,7 +492,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -501,7 +522,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -532,7 +553,7 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-1, a_Ret1);
+		GetStackValue(-1, a_Ret1);
 		lua_pop(m_LuaState, 1);
 		return true;
 	}
@@ -553,8 +574,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -576,8 +597,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -601,8 +622,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -627,8 +648,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -654,8 +675,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -683,8 +704,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -713,8 +734,8 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-2, a_Ret1);
-		GetReturn(-1, a_Ret2);
+		GetStackValue(-2, a_Ret1);
+		GetStackValue(-1, a_Ret2);
 		lua_pop(m_LuaState, 2);
 		return true;
 	}
@@ -743,9 +764,9 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-3, a_Ret1);
-		GetReturn(-2, a_Ret2);
-		GetReturn(-1, a_Ret3);
+		GetStackValue(-3, a_Ret1);
+		GetStackValue(-2, a_Ret2);
+		GetStackValue(-1, a_Ret3);
 		lua_pop(m_LuaState, 3);
 		return true;
 	}
@@ -775,9 +796,9 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-3, a_Ret1);
-		GetReturn(-2, a_Ret2);
-		GetReturn(-1, a_Ret3);
+		GetStackValue(-3, a_Ret1);
+		GetStackValue(-2, a_Ret2);
+		GetStackValue(-1, a_Ret3);
 		lua_pop(m_LuaState, 3);
 		return true;
 	}
@@ -808,11 +829,11 @@ public:
 		{
 			return false;
 		}
-		GetReturn(-5, a_Ret1);
-		GetReturn(-4, a_Ret2);
-		GetReturn(-3, a_Ret3);
-		GetReturn(-2, a_Ret4);
-		GetReturn(-1, a_Ret5);
+		GetStackValue(-5, a_Ret1);
+		GetStackValue(-4, a_Ret2);
+		GetStackValue(-3, a_Ret3);
+		GetStackValue(-2, a_Ret4);
+		GetStackValue(-1, a_Ret5);
 		lua_pop(m_LuaState, 5);
 		return true;
 	}
@@ -849,10 +870,10 @@ public:
 	static bool ReportErrors(lua_State * a_LuaState, int status);
 	
 	/** Logs all items in the current stack trace to the server console */
-	void LogStackTrace(void);
+	void LogStackTrace(int a_StartingDepth = 0);
 	
 	/** Logs all items in the current stack trace to the server console */
-	static void LogStackTrace(lua_State * a_LuaState);
+	static void LogStackTrace(lua_State * a_LuaState, int a_StartingDepth = 0);
 	
 	/** Returns the type of the item on the specified position in the stack */
 	AString GetTypeText(int a_StackPos);
@@ -918,18 +939,6 @@ protected:
 	/** Pushes a usertype of the specified class type onto the stack */
 	void PushUserType(void * a_Object, const char * a_Type);
 
-	/** Retrieve value returned at a_StackPos, if it is a valid bool. If not, a_ReturnedVal is unchanged */
-	void GetReturn(int a_StackPos, bool & a_ReturnedVal);
-	
-	/** Retrieve value returned at a_StackPos, if it is a valid string. If not, a_ReturnedVal is unchanged */
-	void GetReturn(int a_StackPos, AString & a_ReturnedVal);
-	
-	/** Retrieve value returned at a_StackPos, if it is a valid number. If not, a_ReturnedVal is unchanged */
-	void GetReturn(int a_StackPos, int & a_ReturnedVal);
-	
-	/** Retrieve value returned at a_StackPos, if it is a valid number. If not, a_ReturnedVal is unchanged */
-	void GetReturn(int a_StackPos, double & a_ReturnedVal);
-	
 	/**
 	Calls the function that has been pushed onto the stack by PushFunction(),
 	with arguments pushed by PushXXX().