Changeset 410 for AE

Timestamp:

Jul 8, 2009, 7:20:07 PM (15 years ago)

Author:

gumby

Message:

fixed onvl bug

File:

• AE/Installer/trunk/source/main_window.cpp (modified) (9 diffs)

AE/Installer/trunk/source/main_window.cpp

@@ -122 +122 @@
 
                 vector<path> GDFPaths;
-                GDFPaths.push_back(Characters);
+                //GDFPaths.push_back(Characters);
                 GDFPaths.push_back(Particles);
                 GDFPaths.push_back(Textures);
@@ -140 +140 @@
                 vector<path> VanillaPaths;
 
-                VanillaPaths.push_back(VanillaCharacters);
+                //VanillaPaths.push_back(VanillaCharacters);
                 VanillaPaths.push_back(VanillaParticles);
                 VanillaPaths.push_back(VanillaTextures);
@@ -230 +230 @@
                                                 }
                                                 else if (dir_itr->path().filename().substr(0,4) == "TRAC"
-                                                        || dir_itr->path().filename().substr(0,4) == "ONVL") {
+                                                        ) {
                                                                 cout <<dir_itr->path().filename() << "\n";
                                                                 if(!exists( TRAC / dir_itr->filename())) rename(dir_itr->path(), TRAC / dir_itr->filename());
@@ -250 +250 @@
                                                         || dir_itr->path().filename().substr(0,4) == "TRBS"
                                                         || dir_itr->path().filename().substr(0,4) == "ONCV"
+                                                        || dir_itr->path().filename().substr(0,4) == "ONVL"
                                                         || dir_itr->path().filename().substr(0,4) == "TRMA"
                                                         || dir_itr->path().filename().substr(0,4) == "TRSC"
@@ -290 +291 @@
                                                                 else remove(dir_itr->path());
                                                 }
+
                                                 if (exists(dir_itr->path())) {
 
@@ -319 +321 @@
                                 + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
                         string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
-                                + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log");
+                                + levels[i] + "_Final/level" + levels[i] + "_Final.oni");
                                 system(sys_str.c_str() );
                         setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
                         parts_done++;
                 }
-                create_directory( VanillaCharacters.parent_path() );
+                //create_directory( VanillaCharacters.parent_path() );
                 create_directory( VanillaParticles.parent_path() );
                 create_directory( VanillaTextures.parent_path() );
@@ -337 +339 @@
                         setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) )); 
                 }
+                logfile << "\nMoving level0_Characters\n";
+                setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": moving level0_Characters" );      
+                copy((path)"../GameDataFolder/level0_Characters", (path)("VanillaDats/level0_Final"));
                 /*
                 printf(Step_x_x,"Step %d/%d: reimporting level0_Characters", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) )); 
@@ -1147 +1152 @@
 #endif
 
+
         /*if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
                 strImportOption = "-import:sep";
@@ -1156 +1162 @@
         }*/
         
+
+#ifndef WIN32
+                strImportOption = "-import:sep";
+                splitInstances = NOT_SPLIT;
+#else
+                strImportOption = "-import:nosep";
+                splitInstances = SPLIT;
+#endif
+
 #ifndef WIN32
         strImportOption = "-import:sep";