diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc index f7d060bf..f7d7254f 100644 --- a/server/gameserver/buff.cc +++ b/server/gameserver/buff.cc @@ -947,14 +947,6 @@ void Buff::ProcMachineGun() caster_.Get()->need_sync_active_player = true; caster_.Get()->SyncAroundPlayers(__FILE__, __LINE__, __func__); } - if (skill_meta) { - if (skill_meta->GetMagicId() == MAGIC_FG) { - bool shot_ok = false; - a8::Vec2 target_dir = owner->GetAttackDir(); - owner->last_shot_frameno_ = 0; - owner->Shot(target_dir, shot_ok, 5); - } - } } void Buff::ProcRemoveMachineGun() diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 2b35f87c..c36f7263 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -314,7 +314,7 @@ void InternalShot(Creature* c, bullet_born_pos = c->GetPos() + bullet_born_offset; if (c->IsPlayer() || c->IsCar()) { #ifdef DEBUG - a8::XPrintf("offset:%f,%f angle:%f old_angle:%f angle_xy:%f,%f %f %f gun_muzzle_position:%f,%f,%f pos:%f,%f\n", + a8::XPrintf("offset:%f,%f angle:%f old_angle:%f angle_xy:%f,%f %f %f gun_muzzle_position:%f,%f,%f pos:%f,%f gun_id:%d\n", {bullet_born_offset.x, bullet_born_offset.y, bullet_born_angle, @@ -328,6 +328,7 @@ void InternalShot(Creature* c, gun_muzzle_position.z, bullet_born_pos.x, bullet_born_pos.y, + weapon_meta->i->id() }); #endif }