From 1cfeffe3f853f8823f1910635f4ca19669248877 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 28 Oct 2021 15:54:53 +0800 Subject: [PATCH] make --- server/gameserver/creature.cc | 18 ++++++++++++++---- server/gameserver/room.cc | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 3d04f81..e062522 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -1655,10 +1655,20 @@ void Creature::Shot(a8::Vec2& target_dir, bool& shot_ok, float fly_distance) CancelAction(); } - if ((room->GetFrameNo() - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE) < - GetCurrWeapon()->GetAttrValue(kHAT_FireRate) - ) { - return; + if (IsCar()) { + if (room->GetFrameNo() - last_shot_frameno_ > 0) { + if ((room->GetFrameNo() - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE) < + GetCurrWeapon()->GetAttrValue(kHAT_FireRate) + ) { + return; + } + } + } else { + if ((room->GetFrameNo() - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE) < + GetCurrWeapon()->GetAttrValue(kHAT_FireRate) + ) { + return; + } } if (GetCurrWeapon()->meta->power_charge.empty() || power_idx < 0) { diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 71d7456..cd8ce2f 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -3806,7 +3806,7 @@ void Room::AirRaid(int airraid_id) } } } - #if 0 + #ifdef DEBUG if (humans.size() > 0) { center = humans[0]->GetPos(); }