server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-09-21 13:11:15 +08:00
parent 781245b42e
commit f66290b820
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/room.h
View File

@ -271,6 +271,7 @@ public:
bool BulletCanReach(const glm::vec3& start, const glm::vec3& end); bool BulletCanReach(const glm::vec3& start, const glm::vec3& end);
bool MoveCanReach(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_; } const mt::RankMatchConf* GetRankMatchConf() { return rank_match_conf_; }
bool IsCustomBattle() { return custom_battle_ != nullptr;}
private: private:
void ShuaAndroid(); void ShuaAndroid();

1
server/gameserver/roommgr.cc
View File

@ -536,6 +536,7 @@ Room* RoomMgr::CreateRoom(const cs::CMJoin& msg,
init_info.pve_instance_id = msg.pve_instance_id(); init_info.pve_instance_id = msg.pve_instance_id();
init_info.pve_human_num = std::max(1, msg.team_members_size()); 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.is_newbie_room = msg.force_enter_newbie_room() ? true : false;
init_info.custom_battle = custom_battle;
if (GetRoomByUuid(init_info.room_uuid)) { if (GetRoomByUuid(init_info.room_uuid)) {
A8_ABORT(); A8_ABORT();
} }