Commit bb6ef1e1 authored by Chen Bill's avatar Chen Bill Committed by GitHub

static member DataManager::FileSystem (#2644)

parent 1127be0f
......@@ -6,8 +6,8 @@
namespace ygo {
const wchar_t* DataManager::unknown_string = L"???";
unsigned char DataManager::scriptBuffer[0x100000];
IFileSystem* DataManager::FileSystem;
unsigned char DataManager::scriptBuffer[0x100000] = {};
IFileSystem* DataManager::FileSystem = nullptr;
DataManager dataManager;
DataManager::DataManager() : _datas(32768), _strings(32768) {
......
......@@ -268,11 +268,11 @@ FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
}
IReadFile* DeckManager::OpenDeckReader(const wchar_t* file) {
#ifdef _WIN32
IReadFile* reader = dataManager.FileSystem->createAndOpenFile(file);
IReadFile* reader = DataManager::FileSystem->createAndOpenFile(file);
#else
char file2[256];
BufferIO::EncodeUTF8(file, file2);
IReadFile* reader = dataManager.FileSystem->createAndOpenFile(file2);
IReadFile* reader = DataManager::FileSystem->createAndOpenFile(file2);
#endif
return reader;
}
......
......@@ -99,7 +99,7 @@ bool Game::Initialize() {
ErrorLog("Failed to load textures!");
return false;
}
dataManager.FileSystem = device->getFileSystem();
DataManager::FileSystem = device->getFileSystem();
if(!dataManager.LoadDB(L"cards.cdb")) {
ErrorLog("Failed to load card database (cards.cdb)!");
return false;
......@@ -1159,11 +1159,11 @@ void Game::LoadExpansions() {
}
if (!isdir && (IsExtension(name, L".zip") || IsExtension(name, L".ypk"))) {
#ifdef _WIN32
dataManager.FileSystem->addFileArchive(fpath, true, false, EFAT_ZIP);
DataManager::FileSystem->addFileArchive(fpath, true, false, EFAT_ZIP);
#else
char upath[1024];
BufferIO::EncodeUTF8(fpath, upath);
dataManager.FileSystem->addFileArchive(upath, true, false, EFAT_ZIP);
DataManager::FileSystem->addFileArchive(upath, true, false, EFAT_ZIP);
#endif
return;
}
......
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