summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-09 23:53:25 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-10 11:28:14 +0200
commit989aba1966373885d4cac306daea25e102f8d68d (patch)
tree7e735cba9a7c38eee1b3ccb4474cd5963e74a378 /src/content_sao.cpp
parent6b7d6c27ee53836c5f5a702056617770b59bf595 (diff)
downloadminetest-989aba1966373885d4cac306daea25e102f8d68d.tar.gz
minetest-989aba1966373885d4cac306daea25e102f8d68d.tar.bz2
minetest-989aba1966373885d4cac306daea25e102f8d68d.zip
Fix and tune things, add tool "recharge" animation, add dummyball
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 02a4eb1eb..568e4b1da 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -563,11 +563,11 @@ int LuaEntitySAO::punch(v3f dir,
if(result.did_punch)
{
+ setHP(getHP() - result.damage);
+
actionstream<<getDescription()<<" punched by "
<<puncher->getDescription()<<", damage "<<result.damage
- <<" HP"<<std::endl;
-
- setHP(getHP() - result.damage);
+ <<" hp, health now "<<getHP()<<" hp"<<std::endl;
{
std::ostringstream os(std::ios::binary);