summaryrefslogtreecommitdiff
path: root/src/serverremoteplayer.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-12-02 10:57:40 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-12-02 10:57:40 +0200
commitc3579851354e92a24991c2c3a7844295b7d13a26 (patch)
tree965768539709d009abba03fcebfa68b032ffb27d /src/serverremoteplayer.cpp
parentae2b7f952368174aeac90a5076eadd90ddc7fff3 (diff)
downloadminetest-c3579851354e92a24991c2c3a7844295b7d13a26.tar.gz
minetest-c3579851354e92a24991c2c3a7844295b7d13a26.tar.bz2
minetest-c3579851354e92a24991c2c3a7844295b7d13a26.zip
Make hitting players make a visual damage flash to the player texture and the screen of the local player
Diffstat (limited to 'src/serverremoteplayer.cpp')
-rw-r--r--src/serverremoteplayer.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/serverremoteplayer.cpp b/src/serverremoteplayer.cpp
index f2bb85c92..ceb46c4ee 100644
--- a/src/serverremoteplayer.cpp
+++ b/src/serverremoteplayer.cpp
@@ -151,10 +151,19 @@ void ServerRemotePlayer::punch(ServerActiveObject *puncher,
HittingProperties hitprop = getHittingProperties(&mp, &tp,
time_from_last_punch);
- infostream<<"1. getHP()="<<getHP()<<std::endl;
setHP(getHP() - hitprop.hp);
- infostream<<"2. getHP()="<<getHP()<<std::endl;
puncher->damageWieldedItem(hitprop.wear);
+
+ {
+ std::ostringstream os(std::ios::binary);
+ // command (1 = punched)
+ writeU8(os, 1);
+ // damage
+ writeS16(os, hitprop.hp);
+ // create message and add to list
+ ActiveObjectMessage aom(getId(), false, os.str());
+ m_messages_out.push_back(aom);
+ }
}
void ServerRemotePlayer::rightClick(ServerActiveObject *clicker)