From 47917094fd0a89010029e2ea45be3591175c12a8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 20 Mar 2019 17:43:02 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.h | 1 +
 server/gameserver/entity.h | 1 -
 server/gameserver/human.cc | 4 ++--
 server/gameserver/human.h  | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/bullet.h b/server/gameserver/bullet.h
index 479f235..a5ba43e 100644
--- a/server/gameserver/bullet.h
+++ b/server/gameserver/bullet.h
@@ -16,6 +16,7 @@ class Bullet : public Entity
     MetaData::Equip* gun_meta = nullptr;
     MetaData::Equip* meta = nullptr;
     Human* player = nullptr;
+    Vector2D dir;
     Vector2D born_pos;
     Vector2D born_dir;
 
diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h
index 1ff9d90..4bde90f 100644
--- a/server/gameserver/entity.h
+++ b/server/gameserver/entity.h
@@ -40,7 +40,6 @@ class Entity
     EntitySubType_e entity_subtype = EST_None;
     Room* room = nullptr;
     Vector2D pos;
-    Vector2D dir;
     int updated_times = 0;
     MovementComponent* movement = nullptr;
     std::list<ColliderComponent*> colliders;
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 44b23b2..c9724f2 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -42,7 +42,7 @@ void Human::FillMFObjectPart(cs::MFObjectPart* part_data)
     cs::MFPlayerPart* p = part_data->mutable_union_obj_1();
     p->set_obj_uniid(entity_uniid);
     pos.ToPB(p->mutable_pos());
-    dir.ToPB(p->mutable_dir());
+    attack_dir.ToPB(p->mutable_dir());
 }
 
 void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
@@ -51,7 +51,7 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
     cs::MFPlayerFull* p = full_data->mutable_union_obj_1();
     p->set_obj_uniid(entity_uniid);
     pos.ToPB(p->mutable_pos());
-    dir.ToPB(p->mutable_dir());
+    attack_dir.ToPB(p->mutable_dir());
 
     p->set_health(health);
     p->set_dead(dead);
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 68cc99e..86eac77 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -26,6 +26,9 @@ class Human : public Entity
     MetaData::Equip* chest_meta = nullptr;
     MetaData::Equip* weapon_meta = nullptr;
 
+    Vector2D move_dir;
+    Vector2D attack_dir;
+
     std::string name;
     float health = 0.0;
     bool dead = false;
@@ -45,7 +48,6 @@ class Human : public Entity
     HumanFrameData frame_data;
 
     bool moving = false;
-    Vector2D move_dir;
 
     std::set<Human*> my_seen_players;
     std::set<Human*> seen_me_players;