From 62ff2370ee33a7716761d3d371caa4433069ad1b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 May 2019 15:16:06 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 2 +- server/gameserver/roommgr.cc | 2 +- server/gameserver/roommgr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index f341c9e..2776e33 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -766,7 +766,7 @@ void Room::UpdateGas() gas_data.gas_mode = GasJump; gas_data.gas_start_frameno = frame_no; ShuaPlane(); - RoomMgr::Instance()->RemoveFromInactiveRoomHash(room_uuid); + RoomMgr::Instance()->ActiveRoom(room_uuid); int auto_jump_interval = MetaMgr::Instance()->GetSysParamAsInt("auto_jump_interval"); auto_jump_timer_ = xtimer.AddRepeatTimerAndAttach(SERVER_FRAME_RATE * auto_jump_interval, a8::XParams() diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 7d73527..91f3224 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -162,7 +162,7 @@ void RoomMgr::AddOverRoom(long long room_uuid) }); } -void RoomMgr::RemoveFromInactiveRoomHash(long long room_uuid) +void RoomMgr::ActiveRoom(long long room_uuid) { inactive_room_hash_.erase(room_uuid); } diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h index ae16cb8..46dc299 100644 --- a/server/gameserver/roommgr.h +++ b/server/gameserver/roommgr.h @@ -21,7 +21,7 @@ class RoomMgr : public a8::Singleton void Update(int delta_time); void _CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg); - void RemoveFromInactiveRoomHash(long long room_uuid); + void ActiveRoom(long long room_uuid); int RoomNum(); Room* GetRoomByUuid(long long uuid); void AddOverRoom(long long room_uuid);