From 2d46bd1b644cf45111538b01330bb9c2520994ff Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 11 Apr 2019 14:17:45 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 2 +- server/gameserver/roommgr.cc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index c2125b1..08f5f35 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -18,7 +18,7 @@ #include "roommgr.h" const int ROOM_MAX_PLAYER_NUM = 50; -#if 0 +#if 1 const int ANDROID_NUM = 0; #else const int ANDROID_NUM = 10; diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index f36495b..c571870 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -42,7 +42,10 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) } room->map_meta = MetaMgr::Instance()->GetMap(1001); room->Initialize(); + inactive_room_hash_[room->room_uuid] = room; room_hash_[room->room_uuid] = room; + } else { + int i = 0; } Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.socket_handle, msg); hum->meta = hum_meta;