From 694c06b0ed7c6bbcf2e8bcbfd14a073c4f449b00 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 27 Dec 2022 17:05:09 +0800 Subject: [PATCH] 1 --- server/gameserver/shot.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/gameserver/shot.cc b/server/gameserver/shot.cc index cc77be19..e78f283b 100644 --- a/server/gameserver/shot.cc +++ b/server/gameserver/shot.cc @@ -346,14 +346,14 @@ void InternalShot(Creature* c, return; } for (auto& tuple : weapon_meta->_bullet_born_offset) { - a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple)); + glm::vec3 bullet_born_offset = glm::vec3(std::get<0>(tuple), 0.0f, std::get<1>(tuple)); float bullet_born_angle = GlmHelper::CalcAngle(c->GetAttackDir(), GlmHelper::UP); if (c->GetAttackDir().x > 0.00001f) { bullet_born_angle = -bullet_born_angle; } - bullet_born_offset.Rotate(bullet_born_angle); + GlmHelper::RotateY(bullet_born_offset, bullet_born_angle); Position bullet_born_pos; - bullet_born_pos.FromVec2(c->GetPos().ToVec2() + bullet_born_offset); + bullet_born_pos.FromGlmVec3(c->GetPos().ToGlmVec3() + bullet_born_offset); if (c->room->OverBorder(bullet_born_pos, 0.0f)) { return; }