- Improper GetfileInstance calls were preventing from correctly initializing the JGEFileSystem (Todo: init earlier, prevent from calling GetfileInstance if not initialized ?)
- fixed a problem with the test suite
This commit is contained in:
@@ -112,6 +112,9 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
|
||||
bool found = false;
|
||||
while (!found && std::getline(mfile, resPath))
|
||||
{
|
||||
if (!resPath.size())
|
||||
continue;
|
||||
|
||||
if (resPath[resPath.size() - 1] == '\r')
|
||||
resPath.erase(resPath.size() - 1); //Handle DOS files
|
||||
string testfile = resPath;
|
||||
|
||||
@@ -348,7 +348,7 @@ void JGE::Init()
|
||||
sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
|
||||
|
||||
JRenderer::GetInstance();
|
||||
JFileSystem::GetInstance();
|
||||
//JFileSystem::GetInstance(); Lazy loading
|
||||
//JSoundSystem::GetInstance(); let's do lazy loading
|
||||
|
||||
mDone = false;
|
||||
@@ -442,7 +442,7 @@ void JGE::Init()
|
||||
mPaused = false;
|
||||
mCriticalAssert = false;
|
||||
JRenderer::GetInstance();
|
||||
JFileSystem::GetInstance();
|
||||
//JFileSystem::GetInstance(); Lazy loading
|
||||
JSoundSystem::GetInstance();
|
||||
LeftClickedProcessed();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user