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

 		return fo.ChangeFileExtension ( "pbd" );
 	return f;
+}
-bool CCatFile::AppendFile ( CyString filename, CyString to, bool pck, bool bXor )
+bool CCatFile::AppendFile ( CyString filename, CyString to, bool pck, bool bXor, CyString *sChangeTo)
+{
 	if ( (!m_bCreate) && (!m_fCatFile.Exists ()) )
 		return false;
 	if ( !m_sAddonDir.Empty() && CCatFile::IsAddonDir(to) ) {
 	if ( !id )
 		return false;
 	fclose ( id );
 	// then check if the file already exists
+	/*
 	if ( !m_lFiles.empty() )
+	{
 		SInCatFile *f = FindData ( to );
 		if ( f )
+		{
 			if ( !RemoveFile ( f ) )
 				return false;
+		}
-	}
+	}*/
+	// change the file extension and remove the file again
+	if ( pck && CheckExtensionPck(filename) ) {
+		to = PckChangeExtension ( to );
+	}
+	if ( sChangeTo ) {
+		*sChangeTo = to;
+	}
+	if ( !m_lFiles.empty() ) {
+		SInCatFile *checkf = FindData ( to );
+		if ( checkf ) {
+			if ( !RemoveFile ( checkf ) ) return false;
+		}
+	}
 	bool append = false;
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
 	f->lOffset = this->GetEndOffset();
 	bool dofile = true;
-	if ( pck && CheckExtensionPck(filename) )
-	{
-		to = PckChangeExtension ( to );
-		if ( !m_lFiles.empty() )
-		{
-			SInCatFile *checkf = FindData ( to );
-			if ( checkf )
-			{
-				if ( !RemoveFile ( checkf ) )
-					return false;
-			}
-		}
-	}
 	if ( !m_lFiles.size() )
 		m_fDatFile.WipeFile();
 //	if ( CheckPackedExtension(to) && !CheckPackedExtension(filename) )

Subversion Repositories spk