oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-12 16:58:39 +00:00
Code Wiki Activity

Respect object property hp_max field for players (#6287)

Browse source 
* 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
This commit is contained in:
SmallJoker 2017-08-23 22:32:10 +02:00 • committed by Loïc Blot
parent d01b65abeb
commit f7d50a8078
9 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/content_sao.cpp
View file

@ -782,7 +782,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
{
assert(m_peer_id != 0); // pre-condition
m_prop.hp_max = PLAYER_MAX_HP;
m_prop.hp_max = PLAYER_MAX_HP_DEFAULT;
m_prop.physical = false;
m_prop.weight = 75;
m_prop.collisionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f);
@ -799,7 +799,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
m_prop.is_visible = true;
m_prop.makes_footstep_sound = true;
m_prop.stepheight = PLAYER_DEFAULT_STEPHEIGHT * BS;
m_hp = PLAYER_MAX_HP;
m_hp = m_prop.hp_max;
}
PlayerSAO::~PlayerSAO()
@ -1235,8 +1235,8 @@ void PlayerSAO::setHP(s16 hp)
if (hp < 0)
hp = 0;
else if (hp > PLAYER_MAX_HP)
hp = PLAYER_MAX_HP;
else if (hp > m_prop.hp_max)
hp = m_prop.hp_max;
if (hp < oldhp && !g_settings->getBool("enable_damage")) {
return;