Commit 2a3d6954 authored by nanahira's avatar nanahira

Merge branch 'server' of github.com:moecube/ygopro into server

parents 9ea66949 2a596c22
...@@ -13,15 +13,13 @@ IFileSystem* DataManager::FileSystem; ...@@ -13,15 +13,13 @@ IFileSystem* DataManager::FileSystem;
DataManager dataManager; DataManager dataManager;
bool DataManager::LoadDB(const wchar_t* wfile) { bool DataManager::LoadDB(const wchar_t* wfile) {
#ifdef YGOPRO_SERVER_MODE
char file[256]; char file[256];
BufferIO::EncodeUTF8(wfile, file); BufferIO::EncodeUTF8(wfile, file);
#ifdef YGOPRO_SERVER_MODE
sqlite3* pDB; sqlite3* pDB;
if(sqlite3_open_v2(file, &pDB, SQLITE_OPEN_READONLY, 0) != SQLITE_OK) if(sqlite3_open_v2(file, &pDB, SQLITE_OPEN_READONLY, 0) != SQLITE_OK)
return Error(pDB); return Error(pDB);
#else #else
char file[256];
BufferIO::EncodeUTF8(wfile, file);
#ifdef _WIN32 #ifdef _WIN32
IReadFile* reader = FileSystem->createAndOpenFile(wfile); IReadFile* reader = FileSystem->createAndOpenFile(wfile);
#else #else
......
Subproject commit 4171d93b92670c988059ce9e0236ba2c79ce5010 Subproject commit 96821733e00b1dae57a2e60fffa99db84ff311bd
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