X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscript%2Flua_api%2Fl_areastore.cpp;h=09a5c78f98a544da184f071d3458b7684bd707f9;hb=f7088f69ab7406ea9fefa853fa7ce11f914e88cf;hp=261baf6c942d3a5fa75882006c19ed91bf2237f5;hpb=821551a2669123ac9a476894d65b5efe10026040;p=dragonfireclient.git

diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index 261baf6c9..09a5c78f9 100644
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -111,6 +111,9 @@ int LuaAreaStore::l_get_area(lua_State *L)
 	const Area *res;
 
 	res = ast->getArea(id);
+	if (!res)
+		return 0;
+
 	push_area(L, res, include_borders, include_data);
 
 	return 1;
@@ -164,7 +167,7 @@ int LuaAreaStore::l_get_areas_in_area(lua_State *L)
 	return 1;
 }
 
-// insert_area(edge1, edge2, data)
+// insert_area(edge1, edge2, data, id)
 int LuaAreaStore::l_insert_area(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -179,6 +182,9 @@ int LuaAreaStore::l_insert_area(lua_State *L)
 
 	a.data = std::string(data, d_len);
 
+	if (lua_isnumber(L, 5))
+		a.id = lua_tonumber(L, 5);
+
 	if (!ast->insertArea(&a))
 		return 0;
 
@@ -257,7 +263,7 @@ int LuaAreaStore::l_to_file(lua_State *L)
 	AreaStore *ast = o->as;
 
 	const char *filename = luaL_checkstring(L, 2);
-	CHECK_SECURE_PATH_OPTIONAL(L, filename);
+	CHECK_SECURE_PATH(L, filename, true);
 
 	std::ostringstream os(std::ios_base::binary);
 	ast->serialize(os);
@@ -288,7 +294,7 @@ int LuaAreaStore::l_from_file(lua_State *L)
 	LuaAreaStore *o = checkobject(L, 1);
 
 	const char *filename = luaL_checkstring(L, 2);
-	CHECK_SECURE_PATH_OPTIONAL(L, filename);
+	CHECK_SECURE_PATH(L, filename, false);
 
 	std::ifstream is(filename, std::ios::binary);
 	return deserialization_helper(L, o->as, is);