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

Send player damage to all clients and apply [brighten

Browse source
This commit is contained in:
PilzAdam 2013-08-13 23:06:39 +02:00
parent 3ee8098708
commit 787b43b218
4 changed files with 45 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/content_sao.cpp
View file

@ -942,6 +942,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
m_player(player_),
m_peer_id(peer_id_),
m_inventory(NULL),
m_damage(0),
m_last_good_position(0,0,0),
m_time_from_last_punch(0),
m_nocheat_dig_pos(32767, 32767, 32767),
@ -1298,14 +1299,6 @@ int PlayerSAO::punch(v3f dir,
setHP(getHP() - hitparams.hp);
if(hitparams.hp != 0)
{
std::string str = gob_cmd_punched(hitparams.hp, getHP());
// create message and add to list
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push_back(aom);
}
return hitparams.wear;
}
@ -1318,6 +1311,13 @@ s16 PlayerSAO::getHP() const
return m_player->hp;
}
s16 PlayerSAO::readDamage()
{
s16 damage = m_damage;
m_damage = 0;
return damage;
}
void PlayerSAO::setHP(s16 hp)
{
s16 oldhp = m_player->hp;
@ -1335,19 +1335,15 @@ void PlayerSAO::setHP(s16 hp)
m_player->hp = hp;
if(hp != oldhp)
if(hp != oldhp) {
m_hp_not_sent = true;
// On death or reincarnation send an active object message
if((hp == 0) != (oldhp == 0))
{
// Will send new is_visible value based on (getHP()!=0)
m_properties_sent = false;
// Send new HP
std::string str = gob_cmd_punched(0, getHP());
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push_back(aom);
if(oldhp > hp)
m_damage += oldhp - hp;
}
// Update properties on death
if((hp == 0) != (oldhp == 0))
m_properties_sent = false;
}
u16 PlayerSAO::getBreath() const