Kaynağa Gözat

Fixing platform related paths. Do not convert non field files.

myst6re 11 yıl önce
ebeveyn
işleme
7ca47fd9a7

+ 6 - 4
utilities/q-gears-launcher/src/ff7DataInstaller.cpp

@@ -47,8 +47,7 @@ void FF7DataInstaller::Convert(std::string inputDir, std::string outputDir, cons
 {
     for (const auto& file : files)
     {
-        // TODO: Comparison will be incorrect on some platforms
-        if (file == "field\\char.lgp")
+        if (file == "field/char.lgp")
         {
             /*
             auto fullPath = inputDir + file;
@@ -56,7 +55,7 @@ void FF7DataInstaller::Convert(std::string inputDir, std::string outputDir, cons
             ConvertFieldModels(fullPath, outputDir);
             mApp.getRoot()->removeResourceLocation(fullPath, "FFVII");*/
         }
-        else if (file == "field\\flevel.lgp")
+        else if (file == "field/flevel.lgp")
         {
             auto fullPath = inputDir + file;
             mApp.getRoot()->addResourceLocation(fullPath, "LGP", "FFVIIFields");
@@ -138,7 +137,10 @@ void FF7DataInstaller::ConvertFields(std::string archive, std::string outDir)
     Ogre::StringVectorPtr resources = mApp.ResMgr()->listResourceNames("FFVIIFields", "*");
     for (auto& resourceName : *resources)
     {
-        if (!QGears::StringUtil::endsWith(resourceName, ".tex") /*&& resourceName == "blin67_4"*/)
+        if (!QGears::StringUtil::endsWith(resourceName, ".tex")
+         && !QGears::StringUtil::endsWith(resourceName, ".tut")
+         && !QGears::StringUtil::endsWith(resourceName, ".siz")
+         && resourceName != "maplist" /*&& resourceName == "blin67_4"*/)
         {
             //try
             {

+ 2 - 2
utilities/q-gears-launcher/src/mainwindow.cpp

@@ -143,8 +143,8 @@ void MainWindow::on_btnGO_clicked()
 
 		// TODO: Enumerate files or find some better way to do this :)
 		std::vector<std::string> vec;
-		vec.push_back(QDir::toNativeSeparators("field/char.lgp").toStdString());
-		vec.push_back(QDir::toNativeSeparators("field/flevel.lgp").toStdString());
+		vec.push_back(QString("field/char.lgp").toStdString());
+		vec.push_back(QString("field/flevel.lgp").toStdString());
 
 		FF7DataInstaller conversion;
 		conversion.Convert(QDir::toNativeSeparators(input).toStdString(), QDir::toNativeSeparators(output).toStdString(), vec);