From ca90cab7b8a98116ba2d1f40c123e7ce19f3c631 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 20 Dec 2022 11:34:49 +0800
Subject: [PATCH] 1

---
 server/gameserver/framemaker.cc  |  3 ++-
 server/gameserver/human.cc       | 11 ++++++++--
 server/gameserver/typeconvert.cc | 35 --------------------------------
 server/gameserver/typeconvert.h  |  6 ------
 4 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 56debde9..6718566d 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -159,7 +159,8 @@ void FrameMaker::PostProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameDat
     }
     if (room->GetGasData().GetGasMode() == GasMoving) {
         msg->set_gas_progress(room->GetGasData().gas_progress);
-        TypeConvert::ToPb(room->GetGasData().pos_old, msg->mutable_gas_pos_old());
+        glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y);
+        TypeConvert::ToPb(v3, msg->mutable_gas_pos_old());
     }
     if (room->GetFrameNo() - room->AliveCountChgFrameNo() <= 4 ||
         room->GetFrameNo() - hum->join_frameno <= 2) {
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index dcf12c95..05540f3a 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1711,8 +1711,15 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
             gas_data->set_duration(0);
         }
     }
-    TypeConvert::ToPb(room->GetGasData().pos_old, gas_data->mutable_pos_old());
-    TypeConvert::ToPb(room->GetGasData().pos_new, gas_data->mutable_pos_new());
+    // 333
+    {
+        glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y);
+        TypeConvert::ToPb(v3, gas_data->mutable_pos_old());
+    }
+    {
+        glm::vec3 v3(room->GetGasData().pos_new.x, 0.0f, room->GetGasData().pos_new.y);
+        TypeConvert::ToPb(v3, gas_data->mutable_pos_new());
+    }
     gas_data->set_rad_old(room->GetGasData().rad_old);
     gas_data->set_rad_new(room->GetGasData().rad_new);
 }
diff --git a/server/gameserver/typeconvert.cc b/server/gameserver/typeconvert.cc
index f5d4252b..403fc83c 100644
--- a/server/gameserver/typeconvert.cc
+++ b/server/gameserver/typeconvert.cc
@@ -6,22 +6,6 @@
 
 namespace TypeConvert
 {
-    void ToPb(const a8::Vec2& v, cs::MFVec2* pb_obj)
-    {
-        pb_obj->set_x(v.x);
-        pb_obj->set_y(v.y);
-    }
-
-    void ToPb(const Position& v, cs::MFVec2* pb_obj)
-    {
-#ifdef SXY
-        pb_obj->set_x(v.x);
-        pb_obj->set_y(v.z);
-#else
-        pb_obj->set_x(v.x);
-        pb_obj->set_y(v.y);
-#endif
-    }
 
     void ToPb(const Position v, cs::MFVec3* pb_obj)
     {
@@ -49,25 +33,6 @@ namespace TypeConvert
 #endif
     }
 
-    void ToPb(const a8::Vec2& v, cs::MFVec3* pb_obj)
-    {
-        pb_obj->set_x(v.x);
-        pb_obj->set_y(v.y);
-        pb_obj->set_z(0.0f);
-    }
-
-    void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj)
-    {
-        v.x = pb_obj->x();
-        v.y = pb_obj->y();
-    }
-
-    void FromPb(a8::Vec2& v, const cs::MFVec3* pb_obj)
-    {
-        v.x = pb_obj->x();
-        v.y = pb_obj->y();
-    }
-
     void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj)
     {
         pb_obj->set_x(v.x);
diff --git a/server/gameserver/typeconvert.h b/server/gameserver/typeconvert.h
index 4c0adb40..84002771 100644
--- a/server/gameserver/typeconvert.h
+++ b/server/gameserver/typeconvert.h
@@ -2,7 +2,6 @@
 
 namespace cs
 {
-    class MFVec2;
     class MFVec3;
     class MFOverReward;
 }
@@ -11,13 +10,8 @@ struct OverReward;
 
 namespace TypeConvert
 {
-    void ToPb(const a8::Vec2& v, cs::MFVec2* pb_obj);
-    void ToPb(const Position v, cs::MFVec2* pb_obj);
     void ToPb(const Position v, cs::MFVec3* pb_obj);
-    void ToPb(const a8::Vec2& v, cs::MFVec3* pb_obj);
     void ToPb(const glm::vec3& v, cs::MFVec3* pb_obj);
-    void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj);
-    void FromPb(a8::Vec2& v, const cs::MFVec3* pb_obj);
     void FromPb(glm::vec3& v, const cs::MFVec3* pb_obj);
 
     void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj);