Changeset 400

Timestamp:

Jul 7, 2009, 1:53:24 AM (15 years ago)

Author:

gumby

Message:

moved VanillaDats to install\

File:

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

AE/Installer/trunk/source/main_window.cpp

@@ -130 +130 @@
 
 
-                path VanillaCharacters = "packages/VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
-                path VanillaParticles = "packages/VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
-                path VanillaTextures  = "packages/VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
-                path VanillaSounds = "packages/VanillaDats/level0_Final/level0_Sounds/level0_Sounds.oni";
-                path VanillaAnimations = "packages/VanillaDats/level0_Final/level0_Animations/level0_Animations.oni";
-                path VanillaTRAC = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAC.oni";
-                path VanillaTRAM = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
+                path VanillaCharacters = "VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
+                path VanillaParticles = "VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
+                path VanillaTextures  = "VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
+                path VanillaSounds = "VanillaDats/level0_Final/level0_Sounds/level0_Sounds.oni";
+                path VanillaAnimations = "VanillaDats/level0_Final/level0_Animations/level0_Animations.oni";
+                path VanillaTRAC = "VanillaDats/level0_Final/level0_Animations/level0_TRAC.oni";
+                path VanillaTRAM = "VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
 
                 vector<path> VanillaPaths;
@@ -170 +170 @@
                 create_directory( "packages" );
 
-                if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats"); 
-                create_directory( "packages/VanillaDats" );
-                create_directory( "packages/VanillaDats/level0_Final/" );
+                if (exists("VanillaDats")) remove_all("VanillaDats"); 
+                create_directory( "VanillaDats" );
+                create_directory( "VanillaDats/level0_Final/" );
                 //blah blah finish this.
-                //logfile <<  "packages/VanillaDats/level0_Final/ created";
+                //logfile <<  "VanillaDats/level0_Final/ created";
                 create_directory( Characters );
                 create_directory( Particles );
@@ -206 +206 @@
                                 //                              setStatusArea(strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat");
                                 system((strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat").c_str());
-                                create_directory( "packages/VanillaDats/level" + levels[i] + "_Final" ); 
-                                create_directory( "packages/VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final" );
+                                create_directory( "VanillaDats/level" + levels[i] + "_Final" ); 
+                                create_directory( "VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final" );
 
                                 directory_iterator end_iter;
@@ -287 +287 @@
                                                                 cout <<dir_itr->path().filename() << "\n";
 
-                                                                if(!exists( "packages/VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "packages/VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
+                                                                if(!exists( "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
                                                                 else remove(dir_itr->path());
                                                 }
@@ -316 +316 @@
                         //printf(Step_x_x,"Step %d/%d: reimporting level", parts_done + 1, 7 + 2 * num_levels); setStatusArea((string)Step_x_x + levels[i] + (string)"_Final.dat");
                         setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
-                        logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level" 
+                        logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level" 
                                 + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
-                        string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
+                        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");
                                 system(sys_str.c_str() );
@@ -548 +548 @@
         setStatusArea("Importing levels...");
         //setStatusArea("Recompiling Data...");
-        path vanilla_dir = "./packages/VanillaDats/";
+        path vanilla_dir = "./VanillaDats/";
         string importCommand = "";
         char statusString[128];
@@ -579 +579 @@
                         }
                 }
-
+                try {
                 //recursive_directory_iterator end_iter;
 
@@ -585 +585 @@
                 out << numberOfDats;
                 datString = out.str();
-                try {
                         for ( recursive_directory_iterator dir_itr( vanilla_dir );
                                 dir_itr != end_iter;
@@ -599 +598 @@
                                                                 importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename();
 
-                                                        //else cout << " packages/VanillaDats/" + installedMods[i] + "/oni/";
+                                                        //else cout << " VanillaDats/" + installedMods[i] + "/oni/";
                                                 }
                                                 importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";