aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-03-05 15:34:39 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-03-05 15:36:20 +0100
commit9749d9fee6db99da1ab861dc04ec63ef973db3e0 (patch)
treeddf9c165e187a5bccdf0226f01b7bb35a6518ee8 /src/script/lua_api
parent0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 (diff)
downloadminetest-9749d9fee6db99da1ab861dc04ec63ef973db3e0.tar.gz
minetest-9749d9fee6db99da1ab861dc04ec63ef973db3e0.tar.bz2
minetest-9749d9fee6db99da1ab861dc04ec63ef973db3e0.zip
Fix issue #2441: crash on respawn, since a conversion std::list to std::vector on Environment.cpp
* Also change some std::list to std::vector for ClientMap::renderMap * Remove disabled code in ClientMap::renderMap, disabled since a long time
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_mapgen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index f14b0dfcb..54ec69010 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -459,7 +459,7 @@ int ModApiMapgen::l_register_biome(lua_State *L)
}
NodeResolveInfo *nri = new NodeResolveInfo(b);
- std::list<std::string> &nnames = nri->nodenames;
+ std::vector<std::string> &nnames = nri->nodenames;
nnames.push_back(getstringfield_default(L, index, "node_top", ""));
nnames.push_back(getstringfield_default(L, index, "node_filler", ""));
nnames.push_back(getstringfield_default(L, index, "node_stone", ""));