diff options
| author | sapier <Sapier at GMX dot net> | 2013-05-05 01:44:55 +0200 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-05-20 01:18:45 +0200 |
| commit | 55a97f4605a263f4b670b447cd4af9ffa1a8d472 (patch) | |
| tree | 86b22a0d22480324c1732a883d71f34dbbc6506a /src/content_sao.cpp | |
| parent | 3e2efdf18ab95d3c88f66c7a1f6caf6b1c7231e5 (diff) | |
| download | minetest-55a97f4605a263f4b670b447cd4af9ffa1a8d472.tar.gz minetest-55a97f4605a263f4b670b447cd4af9ffa1a8d472.tar.bz2 minetest-55a97f4605a263f4b670b447cd4af9ffa1a8d472.zip | |
Allow nil as puncher e.g. to do damage by tnt
Diffstat (limited to 'src/content_sao.cpp')
| -rw-r--r-- | src/content_sao.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 24a9186f7..47b94a5d9 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -673,8 +673,14 @@ int LuaEntitySAO::punch(v3f dir, { setHP(getHP() - result.damage); + + std::string punchername = "nil"; + + if ( puncher != 0 ) + punchername = puncher->getDescription(); + actionstream<<getDescription()<<" punched by " - <<puncher->getDescription()<<", damage "<<result.damage + <<punchername<<", damage "<<result.damage <<" hp, health now "<<getHP()<<" hp"<<std::endl; { @@ -1307,8 +1313,13 @@ int PlayerSAO::punch(v3f dir, HitParams hitparams = getHitParams(m_armor_groups, toolcap, time_from_last_punch); + std::string punchername = "nil"; + + if ( puncher != 0 ) + punchername = puncher->getDescription(); + actionstream<<"Player "<<m_player->getName()<<" punched by " - <<puncher->getDescription()<<", damage "<<hitparams.hp + <<punchername<<", damage "<<hitparams.hp <<" HP"<<std::endl; setHP(getHP() - hitparams.hp); |