From ee3a937644619dece2db46c6012f5f3e42814303 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 13 Sep 2021 10:36:28 +0000
Subject: [PATCH] 1

---
 server/gameserver/framemaker.cc | 26 ++++++++++++--------------
 server/gameserver/framemaker.h  |  1 -
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 14113bf..bfbbdee 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -72,28 +72,35 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
     cs::SMUpdate* msg = new cs::SMUpdate;
     Room* room = hum->room;
     {
+        msg->set_frameno(hum->room->GetFrameNo() / 2);
+        if (hum->room->GetGasData().gas_mode == GasJump) {
+            cs::MFPlane* p = msg->mutable_plane();
+            TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
+            TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
+            TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
+        }
     }
     SerializeNewObjects(msg, room, hum, framedata);
     SerializePartObjects(msg, room, hum, framedata);
     SerializeDelObjects(msg, room, hum, framedata);
     SerializeOutObjects(msg, room, hum, framedata);
     SerializeShots(msg, room, hum, framedata);
+    SerializeEmotes(msg, room, hum, framedata);
     SerializeBullets(msg, room, hum, framedata);
-    SerializeDelBullets(msg, room, hum, framedata);
-    SerializeExplosions(msg, room, hum, framedata);
     SerializeSmokes(msg, room, hum, framedata);
     SerializePlaySkills(msg, room, hum, framedata);
-    SerializeEmotes(msg, room, hum, framedata);
-    SerializeChgedBulletNums(msg, room, hum, framedata);
+    SerializeExplosions(msg, room, hum, framedata);
     SerializeChgedBuffs(msg, room, hum, framedata);
+    SerializeChgedBulletNums(msg, room, hum, framedata);
+    SerializeChgedHps(msg, room, hum, framedata);
     SerializeChgedSkillCds(msg, room, hum, framedata);
     SerializeChgedSkillCurrTimes(msg, room, hum, framedata);
-    SerializeChgedHps(msg, room, hum, framedata);
     SerializeChgedItems(msg, room, hum, framedata);
     SerializeChgedWeaponAmmo(msg, room, hum, framedata);
     SerializeDeadAliveObjs(msg, room, hum, framedata);
     SerializeChgedCars(msg, room, hum, framedata);
     SerializeChgedProps(msg, room, hum, framedata);
+    SerializeDelBullets(msg, room, hum, framedata);
     {
         if (room->frame_event.airdrops_.size() > 0) {
             *msg->mutable_airdrop() = room->frame_event.airdrops_.Get(0);
@@ -115,15 +122,6 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
 
 void FrameMaker::SerializeNewObjects(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata)
 {
-    #if 0
-    msg->set_frameno(hum->room->GetFrameNo() / 2);
-    if (hum->room->GetGasData().gas_mode == GasJump) {
-        cs::MFPlane* p = msg->mutable_plane();
-        TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
-        TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
-        TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
-    }
-    #endif
 #ifdef DEBUG
     Debug_FullObject(hum);
 #endif
diff --git a/server/gameserver/framemaker.h b/server/gameserver/framemaker.h
index 496d5e7..e3676e8 100644
--- a/server/gameserver/framemaker.h
+++ b/server/gameserver/framemaker.h
@@ -32,7 +32,6 @@ private:
     void SerializeChgedSkillCurrTimes(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeChgedItems(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeChgedWeaponAmmo(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
-    void SerializeChgedRace(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeDeadAliveObjs(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeChgedCars(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);
     void SerializeChgedProps(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata);