From f66290b8208b2f2b37a5862040d9bd5a60d0e7e1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 21 Sep 2023 13:11:15 +0800 Subject: [PATCH] 1 --- server/gameserver/room.h | 1 + server/gameserver/roommgr.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 9e0ccd32..bed7a5d5 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -271,6 +271,7 @@ public: bool BulletCanReach(const glm::vec3& start, const glm::vec3& end); bool MoveCanReach(const glm::vec3& start, const glm::vec3& end); const mt::RankMatchConf* GetRankMatchConf() { return rank_match_conf_; } + bool IsCustomBattle() { return custom_battle_ != nullptr;} private: void ShuaAndroid(); diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 56963adb..79d6ed09 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -536,6 +536,7 @@ Room* RoomMgr::CreateRoom(const cs::CMJoin& msg, init_info.pve_instance_id = msg.pve_instance_id(); init_info.pve_human_num = std::max(1, msg.team_members_size()); init_info.is_newbie_room = msg.force_enter_newbie_room() ? true : false; + init_info.custom_battle = custom_battle; if (GetRoomByUuid(init_info.room_uuid)) { A8_ABORT(); }