server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-09-10 19:20:47 +08:00
parent ecce9ffa0a
commit 528ffb1b67
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/CMakeLists.txt
View File

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8)
set(GAME_ID 2001) set(GAME_ID 2001)
set(CMAKE_BUILD_TYPE "Debug") 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_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID}")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID}") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID}")

4
server/gameserver/roommgr.cc
View File

@ -86,11 +86,15 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
if (GetRoomByUuid(room->room_uuid)) { if (GetRoomByUuid(room->room_uuid)) {
abort(); abort();
} }
#if 1
room->map_meta = MetaMgr::Instance()->GetMap(2001);
#else
if (f8::IsOnlineEnv()) { if (f8::IsOnlineEnv()) {
room->map_meta = MetaMgr::Instance()->GetMap(1001); room->map_meta = MetaMgr::Instance()->GetMap(1001);
} else { } else {
room->map_meta = MetaMgr::Instance()->GetMap(2001); room->map_meta = MetaMgr::Instance()->GetMap(2001);
} }
#endif
room->Init(); room->Init();
inactive_room_hash_[room->room_uuid] = room; inactive_room_hash_[room->room_uuid] = room;
room_hash_[room->room_uuid] = room; room_hash_[room->room_uuid] = room;