From 0050b02e817fd3024ec5c97b936a4b48b7fff831 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 17 Mar 2021 10:33:43 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc | 5 +++++
 server/gameserver/human.h  | 2 +-
 server/gameserver/room.cc  | 3 +--
 server/gameserver/room.h   | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 713fe5b..bb04f93 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1765,6 +1765,11 @@ void Human::FillItemList(::google::protobuf::RepeatedPtrField<::cs::MFPair>* pb_
     }
 }
 
+void Human::SummonHero(int heroid)
+{
+
+}
+
 void Human::AddObserver(Human* observer)
 {
     observers_.insert(observer);
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 1c82e6c..0491886 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -228,7 +228,7 @@ class Human : public MoveableEntity
     void FillBodyState(::google::protobuf::RepeatedPtrField<::cs::MFBodyState>* states);
     void FillBuffList(::google::protobuf::RepeatedPtrField<::cs::MFBuff>* pb_buff_list);
     void FillItemList(::google::protobuf::RepeatedPtrField<::cs::MFPair>* pb_item_list);
-    void SummonHero();
+    void SummonHero(int heroid);
     void AddObserver(Human* observer);
     void RemoveObserver(Human* observer);
     void SendUpdateMsg();
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 8296d06..7738086 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -571,11 +571,10 @@ Car* Room::CreateCar(Human* driver,
 }
 
 Hero* Room::CreateHero(Entity* master,
-                       int hero_uniid,
                        MetaData::Player* meta,
                        const a8::Vec2& pos)
 {
-    Hero* hero = EntityFactory::Instance()->MakeHero(hero_uniid);
+    Hero* hero = EntityFactory::Instance()->MakeHero(AllocUniid());
     hero->meta = meta;
     hero->room = this;
     hero->SetPos(pos);
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 42f0616..7c2d572 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -115,7 +115,6 @@ public:
                    MetaData::Equip* meta,
                    const a8::Vec2& pos);
     Hero* CreateHero(Entity* master,
-                     int hero_uniid,
                      MetaData::Player* meta,
                      const a8::Vec2& pos);