Subversion Repositories spk

Rev

Rev 221 | Rev 223 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 221 Rev 222
Line 6113... Line 6113...
6113 
		if (restoreDir.exists())
 6113 
		if (restoreDir.exists())
6114 
		{
 6114 
		{
6115 
			//if we are in vanilla mode, we should remove the saves (so we only have vanilla saves
 6115 
			//if we are in vanilla mode, we should remove the saves (so we only have vanilla saves
6116 
			/*
 6116 
			/*
6117 
			if (vanilla) {
 6117 
			if (vanilla) {
- 
 
 6118
6118 
				CyStringList *files = toDir.DirList();
 6119 
				Utils::WStringList *files = toDir.DirList();
6119 
				if (files) {
 6120 
				if (files) {
6120 
					for (SStringList *node = files->Head(); node; node = node->next)
 6121 
					for (SStringList *node = files->Head(); node; node = node->next)
6121 
					{
 6122 
					{
6122 
						CFileIO saveFile(toDir.File(node->str));
 6123 
						CFileIO saveFile(toDir.File(node->str));
6123 
						if (saveFile.extension().Compare("sav")) {
 6124 
						if (saveFile.extension().Compare("sav")) {
Line 8511... Line 8512...
8511 
		* Text Files: Join all text entries into a single file (excluding page 17)
 8512 
		* Text Files: Join all text entries into a single file (excluding page 17)
8512 
		* Weapons: TBullets and TLaser (grab matching entrys from text files and adjust ids)
 8513 
		* Weapons: TBullets and TLaser (grab matching entrys from text files and adjust ids)
8513 
	*/
 8514 
	*/
8514 
	// new merge the conflicting files
 8515 
	// new merge the conflicting files
8515 
	// first the text files
 8516 
	// first the text files
8516 
//	CyStringList *text = this->MergeTextFiles(conflicts, mod1, mod2);
 8517 
//	Utils::WStringList *text = this->MergeTextFiles(conflicts, mod1, mod2);
8517 
//	delete text;
 8518 
//	delete text;
8518 
 
 8519 
 
8519 
	// write the cat file when we're done
 8520 
	// write the cat file when we're done
8520 
	if ( !newCat.WriteCatFile() )
 8521 
	if ( !newCat.WriteCatFile() )
8521 
		return false;
 8522 
		return false;