- 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

JGE/src/JFileSystem.cpp

@@ -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;

JGE/src/JGE.cpp

@@ -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();
 }

projects/mtg/bin/Res.txt

@@ -1,7 +1 @@
-./Res/
+
-ms0:/PSP/wagic_res/
-ms0:/wagic_res/
-../../wagic_res/
-../../../wagic_res/
-../wagic_res/
-wagic_res/

projects/mtg/src/TestSuiteAI.cpp

@@ -681,6 +681,7 @@ int TestSuite::load(const char * _filename)
         {
             if (!s.size()) continue;
             if (s[s.size() - 1] == '\r') s.erase(s.size() - 1); //Handle DOS files
+            if (!s.size()) continue;
             if (s[0] == '#') continue;
             std::transform(s.begin(), s.end(), s.begin(), ::tolower);
             if (s.compare("summoningsickness") == 0)