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 2024-04-18 16:59:03 +08:00
parent d6e870073b
commit da8c054096
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/room.cc
View File

@ -99,7 +99,7 @@ void Room::InitData(RoomInitInfo& init_info)
grid_service = init_info.grid_service; grid_service = init_info.grid_service;
map_service = init_info.map_service; map_service = init_info.map_service;
map_instance = init_info.map_instance; 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; map_meta_ = init_info.map_meta;
poly_ext_datas_ = map_instance->GetPolyExtDatas(); poly_ext_datas_ = map_instance->GetPolyExtDatas();
custom_battle_ = init_info.custom_battle; custom_battle_ = init_info.custom_battle;

4
server/gameserver/room.h
View File

@ -121,7 +121,7 @@ public:
RoomMode_e GetRoomMode() { return room_mode_; } RoomMode_e GetRoomMode() { return room_mode_; }
std::string GetRoomUuid() { return room_uuid_; } std::string GetRoomUuid() { return room_uuid_; }
int GetRoomIdx() { return room_idx_; } 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_; } const mt::Map* GetMapMeta() { return map_meta_; }
bool IsBattleStarting() { return battle_starting_; }; bool IsBattleStarting() { return battle_starting_; };
std::shared_ptr<CustomBattle> GetCustomBattle() { return custom_battle_; } std::shared_ptr<CustomBattle> GetCustomBattle() { return custom_battle_; }
@ -387,7 +387,7 @@ private:
int room_idx_ = 0; int room_idx_ = 0;
RoomMode_e room_mode_ = kPvpMode; RoomMode_e room_mode_ = kPvpMode;
std::string room_uuid_; std::string room_uuid_;
const mt::MapMode* map_mode_ = nullptr; const mt::MapMode* map_mode_meta_ = nullptr;
const mt::Map* map_meta_ = nullptr; const mt::Map* map_meta_ = nullptr;
std::string map_tpl_name_; std::string map_tpl_name_;
RoomType_e room_type_ = RoomType_NewBrid; RoomType_e room_type_ = RoomType_NewBrid;