WebSVN – spk – Diff – /libspk/src/Packages.cpp

 	if ( !gameSaveDir.Exists(dir) )
 		gameSaveDir.Create(dir);
 	gameSaveDir.cd(dir);
 	// backup the saves
-	CyStringList *dirs = saveDir.DirList();
+	CyStringList *files = saveDir.DirList();
-	if ( dirs )
+	if ( files )
+	{
-		for ( SStringList *node = dirs->Head(); node; node = node->next )
+		for ( SStringList *node = files->Head(); node; node = node->next )
+		{
 			CFileIO File(saveDir.File(node->str));
 			if ( !File.CheckFileExtension("sav") )
 				continue;
 			// remove the file if already exists
 			// copy the file into the games save dir for backup
 			File.copy(gameSaveDir.File(File.GetFilename()).ToString(), true);
+		}
-		delete dirs;
+		delete files;
+	}
+}
 void CPackages::RestoreSaves(bool vanilla)
 	// get dir to restore from
 	CyString dir = (vanilla) ? "Vanilla" : "Modified";
 	CDirIO restoreDir(m_sCurrentDir + "/PluginManager/Saves/" + dir);
 	CDirIO toDir(this->GetSaveDirectory());
+	//if we are in vanilla mode, we should remove the saves (so we only have vanilla saves
+	if ( vanilla ) {
+		CyStringList *files = toDir.DirList();
+		if ( files ) {
+			for ( SStringList *node = files->Head(); node; node = node->next )
+			{
+				CFileIO saveFile(toDir.File(node->str));
+				if ( saveFile.extension().Compare("sav") ) {
+					saveFile.remove();
+				}
+			}
+			delete files;
+		}
+	}
+	// now we copy of the backed up save games
 	CyStringList *dirs = restoreDir.DirList();
 	if ( dirs )
+	{
 		for ( SStringList *node = dirs->Head(); node; node = node->next )
+		{

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 85 → 86