ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/main_window.cpp

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 400 by gumby, Mon Jul 6 23:53:24 2009 UTC vs.
Revision 410 by gumby, Wed Jul 8 17:20:07 2009 UTC

#	Line 121 | Line 121 | int globalizeData(void)
121		path TRAM = Animations / "level0_TRAM";
122
123		vector<path> GDFPaths;
124	<	GDFPaths.push_back(Characters);
124	>	//GDFPaths.push_back(Characters);
125		GDFPaths.push_back(Particles);
126		GDFPaths.push_back(Textures);
127		GDFPaths.push_back(Sounds);
#	Line 139 | Line 139 | int globalizeData(void)
139
140		vector<path> VanillaPaths;
141
142	<	VanillaPaths.push_back(VanillaCharacters);
142	>	//VanillaPaths.push_back(VanillaCharacters);
143		VanillaPaths.push_back(VanillaParticles);
144		VanillaPaths.push_back(VanillaTextures);
145		VanillaPaths.push_back(VanillaSounds);
#	Line 229 | Line 229 | int globalizeData(void)
229		else remove(dir_itr->path());
230		}
231		else if (dir_itr->path().filename().substr(0,4) == "TRAC"
232	<	|| dir_itr->path().filename().substr(0,4) == "ONVL") {
232	>	) {
233		cout <<dir_itr->path().filename() << "\n";
234		if(!exists( TRAC / dir_itr->filename())) rename(dir_itr->path(), TRAC / dir_itr->filename());
235		else remove(dir_itr->path());
#	Line 249 | Line 249 | int globalizeData(void)
249		else if (dir_itr->path().filename().substr(0,4) == "ONCC"
250		|| dir_itr->path().filename().substr(0,4) == "TRBS"
251		|| dir_itr->path().filename().substr(0,4) == "ONCV"
252	+	|| dir_itr->path().filename().substr(0,4) == "ONVL"
253		|| dir_itr->path().filename().substr(0,4) == "TRMA"
254		|| dir_itr->path().filename().substr(0,4) == "TRSC"
255		|| dir_itr->path().filename().substr(0,4) == "TRAS") {
#	Line 289 | Line 290 | int globalizeData(void)
290		if(!exists( "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
291		else remove(dir_itr->path());
292		}
293	+
294		if (exists(dir_itr->path())) {
295
296		}
#	Line 318 | Line 320 | int globalizeData(void)
320		logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
321		+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
322		string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
323	<	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log");
323	>	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni");
324		system(sys_str.c_str() );
325		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
326		parts_done++;
327		}
328	<	create_directory( VanillaCharacters.parent_path() );
328	>	//create_directory( VanillaCharacters.parent_path() );
329		create_directory( VanillaParticles.parent_path() );
330		create_directory( VanillaTextures.parent_path() );
331		create_directory( VanillaSounds.parent_path() );
#	Line 336 | Line 338 | int globalizeData(void)
338		parts_done++;
339		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
340		}
341	+	logfile << "\nMoving level0_Characters\n";
342	+	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": moving level0_Characters" );
343	+	copy((path)"../GameDataFolder/level0_Characters", (path)("VanillaDats/level0_Final"));
344		/*
345		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) ));
346		system((strOniSplit + " " + strImportOption + " " + Characters.string() + " " + VanillaCharacters.string()).c_str());
#	Line 357 | Line 362 | int globalizeData(void)
362		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
363		setProgressBar( 1000 );
364
365	<	copy("../../persist.dat","..");
366	<	copy("../../key_config.txt","..");
365	>	if(!exists("../persist.dat"))
366	>	copy("../../persist.dat","..");
367	>	if(!exists("../key_config.txt"))
368	>	copy("../../key_config.txt","..");
369
370		#ifndef WIN32
371		/* 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).
#	Line 1139 | Line 1146 | void MainWindow::CreateControls()
1146		// Connect events and objects
1147		Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1148		////@end MainWindow content construction
1149	<
1149	>	#ifdef WIN32
1150		Handle = (HWND)GetHWND();
1151		::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
1152	+	#endif
1153
1154
1155	<	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1155	>	/*if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1156		strImportOption = "-import:sep";
1157		splitInstances = NOT_SPLIT;
1158		}
1159		else {
1160		strImportOption = "-import:nosep";
1161		splitInstances = SPLIT;
1162	<	}
1162	>	}*/
1163	>
1164	>
1165	>	#ifndef WIN32
1166	>	strImportOption = "-import:sep";
1167	>	splitInstances = NOT_SPLIT;
1168	>	#else
1169	>	strImportOption = "-import:nosep";
1170	>	splitInstances = SPLIT;
1171	>	#endif
1172	>
1173	>	#ifndef WIN32
1174	>	strImportOption = "-import:sep";
1175	>	splitInstances = NOT_SPLIT;
1176	>	#else
1177	>	strImportOption = "-import:nosep";
1178	>	splitInstances = SPLIT;
1179	>	#endif
1180
1181		globalPackages = getPackages();
1182		globalInstalledMods = getInstallString();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)