diff options
author | Perttu Ahola <celeron55@gmail.com> | 2012-03-05 01:30:55 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-10 11:28:13 +0200 |
commit | 501b8fe743c56ad07c5fd8bdd4bfffa13fcb3c4d (patch) | |
tree | 77400d94bc48a74cb34d6934e4f3d09ef1a49881 /src/game.cpp | |
parent | e9cdb938fe44282e09fb88628a6e86e5e7279c69 (diff) | |
download | minetest-501b8fe743c56ad07c5fd8bdd4bfffa13fcb3c4d.tar.gz minetest-501b8fe743c56ad07c5fd8bdd4bfffa13fcb3c4d.tar.bz2 minetest-501b8fe743c56ad07c5fd8bdd4bfffa13fcb3c4d.zip |
Damage groups WIP
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp index 594583fdc..d5a733c60 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2088,10 +2088,13 @@ void the_game( } if(do_punch_damage){ // Report direct punch - v3f objpos = selected_object->getPosition(); - v3f dir = (objpos - player_position).normalize(); - - bool disable_send = selected_object->directReportPunch(playeritem.name, dir); + v3f objpos = selected_object->getPosition(); + v3f dir = (objpos - player_position).normalize(); + + // TODO: Get time_from_last_punch from somewhere + float time_from_last_punch = 1000000; + bool disable_send = selected_object->directReportPunch( + dir, &playeritem, time_from_last_punch); if(!disable_send) client.interact(0, pointed); } |