diff options
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp index e8d0238a3..926a16977 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1532,16 +1532,23 @@ void the_game( //if(input->getLeftClicked()) if(input->getLeftState()) { + bool do_punch = false; + bool do_punch_damage = false; if(object_hit_delay_timer <= 0.0){ + do_punch = true; + do_punch_damage = true; + object_hit_delay_timer = object_hit_delay; + } + if(input->getLeftClicked()){ + do_punch = true; + } + if(do_punch){ dstream<<DTIME<<"Left-clicked object"<<std::endl; + left_punch = true; + } + if(do_punch_damage){ client.clickActiveObject(0, selected_active_object->getId(), g_selected_item); - object_hit_delay_timer = object_hit_delay; - left_punch = true; - } else { - dstream<<DTIME<<"Left-clicked object faster than allowed" - <<std::endl; - left_punch_muted = true; } } else if(input->getRightClicked()) |