From 82a6b4ef01d0a2b5566d2f247fa4e4edba6b4fff Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 1 Jan 2023 17:04:56 +0800 Subject: [PATCH] 1 --- server/gameserver/roomobstacle.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 7c5d58dd..f25d9e4e 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -269,7 +269,7 @@ void RoomObstacle::Active() { #if 0 if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) { - SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP)); + SetRotate(master.Get()->GetMoveDir().CalcAngleEx(GlmHelper::UP)); } CalcTempPassObjects(); #endif @@ -279,7 +279,7 @@ void RoomObstacle::Active() { #if 0 if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) { - SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP)); + SetRotate(master.Get()->GetMoveDir().CalcAngleEx(GlmHelper::UP)); } ActiveStrengthenWall(); #endif @@ -494,8 +494,8 @@ void RoomObstacle::SummonAirDropBox(int box_id) Position born_pos = GetPos(); const mt::MapThing* thing_meta = mt::MapThing::GetById(box_id); if (thing_meta && thing_meta->summon_born_rad() > 0) { - a8::Vec2 born_dir = a8::Vec2::UP; - born_dir.Rotate(GetUniId()); + glm::vec3 born_dir = Glmhelper::UP; + GlmHelper::RotateY(born_dir, GetUniId()); // 999 #if 1 #else