1 files changed, 58 insertions, 23 deletions

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 92b410481..acfd6f4f8 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -37,7 +37,7 @@
 /****************************
  * Better error reporting for Lua
  **/
-int tolua_do_error(lua_State* L, const char * a_pMsg, tolua_Error * a_pToLuaError)
+static int tolua_do_error(lua_State* L, const char * a_pMsg, tolua_Error * a_pToLuaError)
 {
 	// Retrieve current function name
 	lua_Debug entry;
@@ -57,7 +57,7 @@ int tolua_do_error(lua_State* L, const char * a_pMsg, tolua_Error * a_pToLuaErro
 
 
 
-int lua_do_error(lua_State* L, const char * a_pFormat, ...)
+static int lua_do_error(lua_State* L, const char * a_pFormat, ...)
 {
 	// Retrieve current function name
 	lua_Debug entry;
@@ -235,7 +235,7 @@ static int tolua_Base64Decode(lua_State * tolua_S)
 
 
 
-cPluginLua * GetLuaPlugin(lua_State * L)
+static cPluginLua * GetLuaPlugin(lua_State * L)
 {
 	// Get the plugin identification out of LuaState:
 	lua_getglobal(L, LUA_PLUGIN_INSTANCE_VAR_NAME);
@@ -1750,7 +1750,6 @@ static int tolua_cWorld_ChunkStay(lua_State * tolua_S)
 	{
 		return 0;
 	}
-	cLuaChunkStay * ChunkStay = new cLuaChunkStay(*Plugin);
 	
 	// Read the params:
 	cWorld * World = (cWorld *)tolua_tousertype(tolua_S, 1, NULL);
@@ -1760,8 +1759,12 @@ static int tolua_cWorld_ChunkStay(lua_State * tolua_S)
 		L.LogStackTrace();
 		return 0;
 	}
+
+	cLuaChunkStay * ChunkStay = new cLuaChunkStay(*Plugin);
+
 	if (!ChunkStay->AddChunks(2))
 	{
+		delete ChunkStay;
 		return 0;
 	}
 
@@ -1773,20 +1776,20 @@ static int tolua_cWorld_ChunkStay(lua_State * tolua_S)
 
 
 
-static int tolua_cPlayer_GetGroups(lua_State* tolua_S)
+static int tolua_cPlayer_GetGroups(lua_State * tolua_S)
 {
-	cPlayer* self = (cPlayer*)  tolua_tousertype(tolua_S, 1, NULL);
+	cPlayer * self = (cPlayer *)tolua_tousertype(tolua_S, 1, NULL);
 
 	const cPlayer::GroupList & AllGroups = self->GetGroups();
 
-	lua_createtable(tolua_S, AllGroups.size(), 0);
+	lua_createtable(tolua_S, (int)AllGroups.size(), 0);
 	int newTable = lua_gettop(tolua_S);
 	int index = 1;
 	cPlayer::GroupList::const_iterator iter = AllGroups.begin();
-	while(iter != AllGroups.end())
+	while (iter != AllGroups.end())
 	{
-		const cGroup* Group = *iter;
-		tolua_pushusertype( tolua_S, (void*)Group, "const cGroup" );
+		const cGroup * Group = *iter;
+		tolua_pushusertype(tolua_S, (void *)Group, "const cGroup");
 		lua_rawseti(tolua_S, newTable, index);
 		++iter;
 		++index;
@@ -1798,20 +1801,20 @@ static int tolua_cPlayer_GetGroups(lua_State* tolua_S)
 
 
 
-static int tolua_cPlayer_GetResolvedPermissions(lua_State* tolua_S)
+static int tolua_cPlayer_GetResolvedPermissions(lua_State * tolua_S)
 {
-	cPlayer* self = (cPlayer*)  tolua_tousertype(tolua_S, 1, NULL);
+	cPlayer * self = (cPlayer*)  tolua_tousertype(tolua_S, 1, NULL);
 
 	cPlayer::StringList AllPermissions = self->GetResolvedPermissions();
 
-	lua_createtable(tolua_S, AllPermissions.size(), 0);
+	lua_createtable(tolua_S, (int)AllPermissions.size(), 0);
 	int newTable = lua_gettop(tolua_S);
 	int index = 1;
 	cPlayer::StringList::iterator iter = AllPermissions.begin();
-	while(iter != AllPermissions.end())
+	while (iter != AllPermissions.end())
 	{
-		std::string& Permission = *iter;
-		tolua_pushstring( tolua_S, Permission.c_str() );
+		std::string & Permission = *iter;
+		lua_pushlstring(tolua_S, Permission.c_str(), Permission.length());
 		lua_rawseti(tolua_S, newTable, index);
 		++iter;
 		++index;
@@ -2073,18 +2076,18 @@ static int tolua_get_HTTPRequest_FormData(lua_State* tolua_S)
 
 static int tolua_cWebAdmin_GetPlugins(lua_State * tolua_S)
 {
-	cWebAdmin* self = (cWebAdmin*)  tolua_tousertype(tolua_S, 1, NULL);
+	cWebAdmin * self = (cWebAdmin *)tolua_tousertype(tolua_S, 1, NULL);
 
 	const cWebAdmin::PluginList & AllPlugins = self->GetPlugins();
 
-	lua_createtable(tolua_S, AllPlugins.size(), 0);
+	lua_createtable(tolua_S, (int)AllPlugins.size(), 0);
 	int newTable = lua_gettop(tolua_S);
 	int index = 1;
 	cWebAdmin::PluginList::const_iterator iter = AllPlugins.begin();
-	while(iter != AllPlugins.end())
+	while (iter != AllPlugins.end())
 	{
-		const cWebPlugin* Plugin = *iter;
-		tolua_pushusertype( tolua_S, (void*)Plugin, "const cWebPlugin" );
+		const cWebPlugin * Plugin = *iter;
+		tolua_pushusertype(tolua_S, (void *)Plugin, "const cWebPlugin");
 		lua_rawseti(tolua_S, newTable, index);
 		++iter;
 		++index;
@@ -2535,6 +2538,37 @@ static int tolua_cBlockArea_GetSize(lua_State * tolua_S)
 
 
 
+static int tolua_cBlockArea_GetCoordRange(lua_State * tolua_S)
+{
+	// function cBlockArea::GetCoordRange()
+	// Returns all three sizes of the area, miuns one, so that they represent the maximum coord value
+	// Exported manually because there's no direct C++ equivalent,
+	// plus tolua would generate extra input params for the outputs
+	
+	cLuaState L(tolua_S);
+	if (!L.CheckParamUserType(1, "cBlockArea"))
+	{
+		return 0;
+	}
+	
+	cBlockArea * self = (cBlockArea *)tolua_tousertype(tolua_S, 1, NULL);
+	if (self == NULL)
+	{
+		tolua_error(tolua_S, "invalid 'self' in function 'cBlockArea:GetSize'", NULL);
+		return 0;
+	}
+	
+	// Push the three origin coords:
+	lua_pushnumber(tolua_S, self->GetSizeX() - 1);
+	lua_pushnumber(tolua_S, self->GetSizeY() - 1);
+	lua_pushnumber(tolua_S, self->GetSizeZ() - 1);
+	return 3;
+}
+
+
+
+
+
 static int tolua_cBlockArea_LoadFromSchematicFile(lua_State * tolua_S)
 {
 	// function cBlockArea::LoadFromSchematicFile
@@ -2861,8 +2895,8 @@ static int tolua_cCompositeChat_SetMessageType(lua_State * tolua_S)
 	}
 	
 	// Set the type:
-	int MessageType;
-	L.GetStackValue(1, MessageType);
+	int MessageType = mtCustom;
+	L.GetStackValue(2, MessageType);
 	self->SetMessageType((eMessageType)MessageType);
 	
 	// Cut away everything from the stack except for the cCompositeChat instance; return that:
@@ -2923,6 +2957,7 @@ void ManualBindings::Bind(lua_State * tolua_S)
 		
 		tolua_beginmodule(tolua_S, "cBlockArea");
 			tolua_function(tolua_S, "GetBlockTypeMeta",        tolua_cBlockArea_GetBlockTypeMeta);
+			tolua_function(tolua_S, "GetCoordRange",           tolua_cBlockArea_GetCoordRange);
 			tolua_function(tolua_S, "GetOrigin",               tolua_cBlockArea_GetOrigin);
 			tolua_function(tolua_S, "GetRelBlockTypeMeta",     tolua_cBlockArea_GetRelBlockTypeMeta);
 			tolua_function(tolua_S, "GetSize",                 tolua_cBlockArea_GetSize);