1
This commit is contained in:
parent
be6c6e5272
commit
2d46bd1b64
@ -18,7 +18,7 @@
|
|||||||
#include "roommgr.h"
|
#include "roommgr.h"
|
||||||
|
|
||||||
const int ROOM_MAX_PLAYER_NUM = 50;
|
const int ROOM_MAX_PLAYER_NUM = 50;
|
||||||
#if 0
|
#if 1
|
||||||
const int ANDROID_NUM = 0;
|
const int ANDROID_NUM = 0;
|
||||||
#else
|
#else
|
||||||
const int ANDROID_NUM = 10;
|
const int ANDROID_NUM = 10;
|
||||||
|
@ -42,7 +42,10 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
|
|||||||
}
|
}
|
||||||
room->map_meta = MetaMgr::Instance()->GetMap(1001);
|
room->map_meta = MetaMgr::Instance()->GetMap(1001);
|
||||||
room->Initialize();
|
room->Initialize();
|
||||||
|
inactive_room_hash_[room->room_uuid] = room;
|
||||||
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);
|
Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.socket_handle, msg);
|
||||||
hum->meta = hum_meta;
|
hum->meta = hum_meta;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user