1
This commit is contained in:
parent
ecce9ffa0a
commit
528ffb1b67
@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8)
|
||||
set(GAME_ID 2001)
|
||||
|
||||
set(CMAKE_BUILD_TYPE "Debug")
|
||||
#set(CMAKE_BUILD_TYPE "Release")
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID}")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID}")
|
||||
|
||||
|
@ -86,11 +86,15 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
|
||||
if (GetRoomByUuid(room->room_uuid)) {
|
||||
abort();
|
||||
}
|
||||
#if 1
|
||||
room->map_meta = MetaMgr::Instance()->GetMap(2001);
|
||||
#else
|
||||
if (f8::IsOnlineEnv()) {
|
||||
room->map_meta = MetaMgr::Instance()->GetMap(1001);
|
||||
} else {
|
||||
room->map_meta = MetaMgr::Instance()->GetMap(2001);
|
||||
}
|
||||
#endif
|
||||
room->Init();
|
||||
inactive_room_hash_[room->room_uuid] = room;
|
||||
room_hash_[room->room_uuid] = room;
|
||||
|
Loading…
x
Reference in New Issue
Block a user