From 71466b4f9b6b6ccb341ff2163fb02c0e12883eee Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 7 Jul 2021 06:17:40 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dc4=E9=97=AE=E9=A2=98-room?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/room.cc | 21 ++++++++++++---------
 server/gameserver/room.h  | 18 +++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 87294c9..2d93b8c 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -568,16 +568,17 @@ int Room::CreateLootEx(int equip_id, a8::Vec2 born_pos, a8::Vec2 pos, int count,
     }
 }
 
-void Room::CreateBullet(Creature* sender,
-                        Creature* passenger,
-                        MetaData::Equip* weapon_meta,
-                        MetaData::EquipUpgrade* weapon_upgrade_meta,
-                        MetaData::Equip* bullet_meta,
-                        a8::Vec2 pos,
-                        a8::Vec2 dir,
-                        float fly_distance,
-                        bool is_tank_skin)
+int Room::CreateBullet(Creature* sender,
+                       Creature* passenger,
+                       MetaData::Equip* weapon_meta,
+                       MetaData::EquipUpgrade* weapon_upgrade_meta,
+                       MetaData::Equip* bullet_meta,
+                       a8::Vec2 pos,
+                       a8::Vec2 dir,
+                       float fly_distance,
+                       bool is_tank_skin)
 {
+    int bullet_uniid = 0;
     if (grid_service->CanAdd(pos.x, pos.y)) {
         Bullet* bullet = EntityFactory::Instance()->MakeBullet(AllocUniid());
         bullet->sender.Attach(sender);
@@ -597,7 +598,9 @@ void Room::CreateBullet(Creature* sender,
         bullet->Initialize();
         AddObjectLater(bullet);
         grid_service->AddBullet(bullet);
+        bullet_uniid = bullet->GetUniId();
     }
+    return bullet_uniid;
 }
 
 Car* Room::CreateCar(Human* driver,
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 071ba0f..9f2824b 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -112,15 +112,15 @@ public:
 
     int CreateLoot(int equip_id, a8::Vec2 pos, int count, int equip_lv);
     int CreateLootEx(int equip_id, a8::Vec2 born_pos, a8::Vec2 pos, int count, int equip_lv, bool show_anim);
-    void CreateBullet(Creature* sender,
-                      Creature* passenger,
-                      MetaData::Equip* weapon_meta,
-                      MetaData::EquipUpgrade* weapon_upgrade_meta,
-                      MetaData::Equip* bullet_meta,
-                      a8::Vec2 pos,
-                      a8::Vec2 dir,
-                      float fly_distance,
-                      bool is_tank_skin = false);
+    int CreateBullet(Creature* sender,
+                     Creature* passenger,
+                     MetaData::Equip* weapon_meta,
+                     MetaData::EquipUpgrade* weapon_upgrade_meta,
+                     MetaData::Equip* bullet_meta,
+                     a8::Vec2 pos,
+                     a8::Vec2 dir,
+                     float fly_distance,
+                     bool is_tank_skin = false);
     Car* CreateCar(Human* driver,
                    int car_uniid,
                    MetaData::Equip* meta,