Skip to content

Y
ygopro
Commit 19477842 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'server' into server-develop

parents 20bfecea b77ddd14
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
gframe/game.cpp
View file @ 19477842
...@@ -93,16 +93,16 @@ HostInfo game_info; ...@@ -93,16 +93,16 @@ HostInfo game_info;
void Game::MainServerLoop() { void Game::MainServerLoop() {
#ifdef SERVER_ZIP_SUPPORT #ifdef SERVER_ZIP_SUPPORT
deckManager.FileSystem = new irr::io::CFileSystem(); dataManager.FileSystem = new irr::io::CFileSystem();
#endif #endif
initUtils(); initUtils();
deckManager.LoadLFList(); deckManager.LoadLFList();
dataManager.LoadDB(L"cards.cdb"); dataManager.LoadDB(L"cards.cdb");
LoadExpansionsAll(); LoadExpansionsAll();
#ifdef SERVER_PRO2_SUPPORT #ifdef SERVER_PRO2_SUPPORT
deckManager.FileSystem->addFileArchive("data/script.zip", true, false, irr::io::EFAT_ZIP); dataManager.FileSystem->addFileArchive("data/script.zip", true, false, irr::io::EFAT_ZIP);
#elif defined(SERVER_PRO3_SUPPORT) #elif defined(SERVER_PRO3_SUPPORT)
deckManager.FileSystem->addFileArchive("Data/script.zip", true, false, irr::io::EFAT_ZIP); dataManager.FileSystem->addFileArchive("Data/script.zip", true, false, irr::io::EFAT_ZIP);
#endif #endif
server_port = NetServer::StartServer(server_port); server_port = NetServer::StartServer(server_port);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment