summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorBlockMen <nmuelll@web.de>2013-08-01 18:36:11 +0200
committerPilzAdam <pilzadam@minetest.net>2013-08-06 17:49:39 +0200
commit7b13d119ed917c137fc375eff790a7754fd93386 (patch)
tree7372138943e6ad4db52a037e95fec70035b5ffaa /src/script
parentba65e2ae6c9578309049b685f3052e424fb410b8 (diff)
downloadminetest-7b13d119ed917c137fc375eff790a7754fd93386.tar.gz
minetest-7b13d119ed917c137fc375eff790a7754fd93386.tar.bz2
minetest-7b13d119ed917c137fc375eff790a7754fd93386.zip
Add support for different drowning damage and allow drowning in other nodetypes
Diffstat (limited to 'src/script')
-rw-r--r--src/script/common/c_content.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index ef0544400..f9765b655 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -400,7 +400,8 @@ ContentFeatures read_content_features(lua_State *L, int index)
getboolfield(L, index, "liquid_renewable", f.liquid_renewable);
getstringfield(L, index, "freezemelt", f.freezemelt);
- getboolfield(L, index, "drowning", f.drowning);
+ f.drowning = getintfield_default(L, index,
+ "drowning", f.drowning);
// Amount of light the node emits
f.light_source = getintfield_default(L, index,
"light_source", f.light_source);