summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-11-17 02:22:24 -0500
committerkwolekr <kwolekr@minetest.net>2013-11-17 02:22:24 -0500
commitcca4f09ba15eca707a6ae1717a00fcf73c6efa6f (patch)
treebcd1139352f516d7b36b59ceed35fd5c276bf17b /src/script
parente396fb29840c3b87b0442fe6d641c94e8165ed27 (diff)
downloadminetest-cca4f09ba15eca707a6ae1717a00fcf73c6efa6f.tar.gz
minetest-cca4f09ba15eca707a6ae1717a00fcf73c6efa6f.tar.bz2
minetest-cca4f09ba15eca707a6ae1717a00fcf73c6efa6f.zip
Decoration: Stop DecoSimple::resolveNodeNames from complaining about no node name if decolist is used
Fix warning message for spawnby nodes Prevent type-punning warning caused by casting enum to int
Diffstat (limited to 'src/script')
-rw-r--r--src/script/lua_api/l_mapgen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 822685e34..b0ad202be 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -522,11 +522,11 @@ int ModApiMapgen::l_place_schematic(lua_State *L)
if (!read_schematic(L, 2, &dschem, getServer(L)))
return 0;
- Rotation rot = ROTATE_0;
+ int rot = ROTATE_0;
if (lua_isstring(L, 3))
- string_to_enum(es_Rotation, (int &)rot, std::string(lua_tostring(L, 3)));
+ string_to_enum(es_Rotation, rot, std::string(lua_tostring(L, 3)));
- dschem.rotation = rot;
+ dschem.rotation = (Rotation)rot;
if (lua_istable(L, 4)) {
int index = 4;