diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2017-08-23 22:32:10 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-23 22:32:10 +0200 |
| commit | f7d50a80782376d2e1c068e4d0a7ce9632f28bda (patch) | |
| tree | 1235977bb6ce8639c24a5315f094364a39e34ee0 /src/script/common/c_content.cpp | |
| parent | d01b65abebf3b2e86d076c6b69996fd3a205a960 (diff) | |
| download | minetest-f7d50a80782376d2e1c068e4d0a7ce9632f28bda.tar.gz minetest-f7d50a80782376d2e1c068e4d0a7ce9632f28bda.tar.bz2 minetest-f7d50a80782376d2e1c068e4d0a7ce9632f28bda.zip | |
Respect object property hp_max field for players (#6287)
* Respect object property hp_max field for players
This allows modders to configure the maximal HP per player
* Statbars: Downscale bar to full 20 HP when exceeding this value
Add default max HP for players and breath constants to builtin
Document the constants
* Rename PLAYER_MAX_HP -> PLAYER_MAX_HP_DEFAULT
Diffstat (limited to 'src/script/common/c_content.cpp')
| -rw-r--r-- | src/script/common/c_content.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index ddcdd803d..47443493b 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -183,7 +183,9 @@ void read_object_properties(lua_State *L, int index, if(!lua_istable(L, index)) return; - prop->hp_max = getintfield_default(L, -1, "hp_max", 10); + int hp_max = 0; + if (getintfield(L, -1, "hp_max", hp_max)) + prop->hp_max = (s16)rangelim(hp_max, 0, S16_MAX); getboolfield(L, -1, "physical", prop->physical); getboolfield(L, -1, "collide_with_objects", prop->collideWithObjects); |