diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index f5580954..ee47b98b 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -99,7 +99,7 @@ void Room::InitData(RoomInitInfo& init_info) grid_service = init_info.grid_service; map_service = init_info.map_service; map_instance = init_info.map_instance; - map_mode_ = init_info.map_mode_meta; + map_mode_meta_ = init_info.map_mode_meta; map_meta_ = init_info.map_meta; poly_ext_datas_ = map_instance->GetPolyExtDatas(); custom_battle_ = init_info.custom_battle; diff --git a/server/gameserver/room.h b/server/gameserver/room.h index ae78d834..d31615bb 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -121,7 +121,7 @@ public: RoomMode_e GetRoomMode() { return room_mode_; } std::string GetRoomUuid() { return room_uuid_; } int GetRoomIdx() { return room_idx_; } - const mt::MapMode* GetMapModeMeta() { return map_mode_; } + const mt::MapMode* GetMapModeMeta() { return map_mode_meta_; } const mt::Map* GetMapMeta() { return map_meta_; } bool IsBattleStarting() { return battle_starting_; }; std::shared_ptr GetCustomBattle() { return custom_battle_; } @@ -387,7 +387,7 @@ private: int room_idx_ = 0; RoomMode_e room_mode_ = kPvpMode; std::string room_uuid_; - const mt::MapMode* map_mode_ = nullptr; + const mt::MapMode* map_mode_meta_ = nullptr; const mt::Map* map_meta_ = nullptr; std::string map_tpl_name_; RoomType_e room_type_ = RoomType_NewBrid;