Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 13:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

dlu is moving to bitbucket again

Browse Source
This commit is contained in:
Jettford 2023-11-22 01:51:49 +00:00
parent 3f9d1a18f0
commit 9314b6a562
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dMasterServer/MasterServer.cpp
View File

@ -169,8 +169,8 @@ int main(int argc, char** argv) {
(BinaryPathFinder::GetBinaryDir() / "resServer" / "CDServer.sqlite").c_str(), (BinaryPathFinder::GetBinaryDir() / "resServer" / "CDServer.sqlite").c_str(),
(Game::assetManager->GetResPath() / "cdclient.fdb").c_str()); (Game::assetManager->GetResPath() / "cdclient.fdb").c_str());
AssetMemoryBuffer cdClientBuffer = Game::assetManager->GetFileAsBuffer("cdclient.fdb"); auto cdclientStream = Game::assetManager->GetFile("cdclient.fdb");
if (!cdClientBuffer.m_Success) { if (!cdclientStream) {
LOG("Failed to load %s", (Game::assetManager->GetResPath() / "cdclient.fdb").c_str()); LOG("Failed to load %s", (Game::assetManager->GetResPath() / "cdclient.fdb").c_str());
throw std::runtime_error("Aborting initialization due to missing cdclient.fdb."); throw std::runtime_error("Aborting initialization due to missing cdclient.fdb.");
} }
@ -178,11 +178,10 @@ int main(int argc, char** argv) {
LOG("Found %s. Converting to SQLite", (Game::assetManager->GetResPath() / "cdclient.fdb").c_str()); LOG("Found %s. Converting to SQLite", (Game::assetManager->GetResPath() / "cdclient.fdb").c_str());
Game::logger->Flush(); Game::logger->Flush();
if (FdbToSqlite::Convert((BinaryPathFinder::GetBinaryDir() / "resServer").string()).ConvertDatabase(cdClientBuffer) == false) { if (FdbToSqlite::Convert((BinaryPathFinder::GetBinaryDir() / "resServer").string()).ConvertDatabase(cdclientStream) == false) {
LOG("Failed to convert fdb to sqlite."); LOG("Failed to convert fdb to sqlite.");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
cdClientBuffer.close();
} }
} }