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 468 by gumby, Sat Oct 10 02:49:27 2009 UTC vs.
Revision 469 by gumby, Tue Oct 20 22:55:16 2009 UTC

#	Line 195 | Line 195 | int globalizeData(void)
195		}
196		logfile << "Exporting and moving...\n\n";
197		int total_steps =  8 + 2 * num_levels;
198	+
199		for(int i = 0; i < 15; i++)
200		{
201
#	Line 210 | Line 211 | int globalizeData(void)
211		system((strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat").c_str());
212		create_directory( "VanillaDats/level" + levels[i] + "_Final" );
213		create_directory( "VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final" );
214	+
215	+	//Moves the AKEV and other files into a safe directory so that level specific textures are not globalized...
216	+	if ( strcmp(levels[i].c_str(), "0") ){
217	+	create_directory( "../GameDataFolder/level" + levels[i] + "_Final/AKEV" );
218	+	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final/AKEV ../GameDataFolder/level" + levels[i] + "_Final/AKEV*.oni").c_str());
219	+
220	+	}
221
222		directory_iterator end_iter;
223		for ( directory_iterator dir_itr( "../GameDataFolder/level" + levels[i] + "_Final" ); dir_itr != end_iter; ++dir_itr )
#	Line 305 | Line 313 | int globalizeData(void)
313
314
315		}
316	+
317		logfile << "\tCleaning up TXMPs...\n";
318		system( (strOniSplit + " -move:delete " + Textures.string() + " ../GameDataFolder/level" + levels[i] + "_Final/TXMP*.oni").c_str());
319	+
320	+
321	+	if ( strcmp(levels[i].c_str(), "0") ){
322	+	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] + "_Final/AKEV/AKEV*.oni").c_str());
323	+	remove(  "../GameDataFolder/level" + levels[i] + "_Final/AKEV" );
324	+	}
325	+
326		parts_done++;
327
328		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
#	Line 344 | Line 360 | int globalizeData(void)
360		logfile << "\nMoving level0_Characters\n";
361		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": moving level0_Characters" );
362		copy((path)"../GameDataFolder/level0_Characters", (path)("VanillaDats/level0_Final"));
363	+	GDFPaths.push_back( Characters );
364	+	for(int i = 0; i < GDFPaths.size(); i++)
365	+	{
366	+	directory_iterator end_iter;
367	+	for ( directory_iterator dir_itr( GDFPaths[i] ); dir_itr != end_iter; ++dir_itr )
368	+	{
369	+	try
370	+	{
371	+
372	+
373	+	rename(dir_itr->path(), "../GameDataFolder/level0_Final/" + dir_itr->path().filename() );
374	+	}
375	+	catch(exception &ex) {
376	+
377	+	}
378	+	}
379	+	}
380		/*
381		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) ));
382		system((strOniSplit + " " + strImportOption + " " + Characters.string() + " " + VanillaCharacters.string()).c_str());
#	Line 366 | Line 399 | int globalizeData(void)
399		setProgressBar( 1000 );
400
401		if(exists("../../persist.dat")) if(!exists("../persist.dat"))
402	+
403	+	//TODO: Concactate level0 Dirs.
404	+
405		copy("../../persist.dat","..");
406		if(exists("../../key_config.txt"))if(!exists("../key_config.txt"))
407		copy("../../key_config.txt","..");

Diff Legend

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