From 501b8fe743c56ad07c5fd8bdd4bfffa13fcb3c4d Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 5 Mar 2012 01:30:55 +0200 Subject: Damage groups WIP --- src/game.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/game.cpp') 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); } -- cgit v1.2.3