--- AE/Installer/trunk/source/main_window.cpp	2009/07/06 23:53:24	400
+++ AE/Installer/trunk/source/main_window.cpp	2009/07/08 17:20:07	410
@@ -121,7 +121,7 @@ int globalizeData(void)
 		path TRAM = Animations / "level0_TRAM";
 
 		vector<path> GDFPaths;
-		GDFPaths.push_back(Characters);
+		//GDFPaths.push_back(Characters);
 		GDFPaths.push_back(Particles);
 		GDFPaths.push_back(Textures);
 		GDFPaths.push_back(Sounds);
@@ -139,7 +139,7 @@ int globalizeData(void)
 
 		vector<path> VanillaPaths;
 
-		VanillaPaths.push_back(VanillaCharacters);
+		//VanillaPaths.push_back(VanillaCharacters);
 		VanillaPaths.push_back(VanillaParticles);
 		VanillaPaths.push_back(VanillaTextures);
 		VanillaPaths.push_back(VanillaSounds);
@@ -229,7 +229,7 @@ int globalizeData(void)
 							else remove(dir_itr->path());
 						}
 						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());
 								else remove(dir_itr->path());
@@ -249,6 +249,7 @@ int globalizeData(void)
 						else if (dir_itr->path().filename().substr(0,4) == "ONCC" 
 							|| 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"
 							|| dir_itr->path().filename().substr(0,4) == "TRAS") {
@@ -289,6 +290,7 @@ int globalizeData(void)
 								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());
 						}
+
 						if (exists(dir_itr->path())) {
 
 						}
@@ -318,12 +320,12 @@ int globalizeData(void)
 			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 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() );
 		create_directory( VanillaSounds.parent_path() );
@@ -336,6 +338,9 @@ int globalizeData(void)
 			parts_done++;
 			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) )); 
 		system((strOniSplit + " " + strImportOption + " " + Characters.string() + " " + VanillaCharacters.string()).c_str());
@@ -357,8 +362,10 @@ int globalizeData(void)
 		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
 		setProgressBar( 1000 );
 
-		copy("../../persist.dat","..");
-		copy("../../key_config.txt",".."); 
+		if(!exists("../persist.dat"))
+			copy("../../persist.dat","..");
+		if(!exists("../key_config.txt"))
+			copy("../../key_config.txt",".."); 
 		
 #ifndef WIN32
 		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
@@ -1139,19 +1146,37 @@ void MainWindow::CreateControls()
     // Connect events and objects
     Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
 	////@end MainWindow content construction
-
+#ifdef WIN32
 	Handle = (HWND)GetHWND();
 	::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
+#endif
 
 
-	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
+	/*if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
 		strImportOption = "-import:sep";
 		splitInstances = NOT_SPLIT;
 	}
 	else {
 		strImportOption = "-import:nosep";
 		splitInstances = SPLIT;
-	}
+	}*/
+	
+
+#ifndef WIN32
+		strImportOption = "-import:sep";
+		splitInstances = NOT_SPLIT;
+#else
+		strImportOption = "-import:nosep";
+		splitInstances = SPLIT;
+#endif
+
+#ifndef WIN32
+	strImportOption = "-import:sep";
+	splitInstances = NOT_SPLIT;
+#else
+	strImportOption = "-import:nosep";
+	splitInstances = SPLIT;
+#endif
 	
 	globalPackages = getPackages();
 	globalInstalledMods = getInstallString();