Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-01-19 06:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Adding files to MPQ no longer removes (listfile) and (attributes) when not enough space in the hash table

Browse Source 
+ Fixes in deletion of files from MPQs v 4.0
This commit is contained in:
Ladislav
2013-11-18 12:35:21 +01:00
parent 1f2305cc35
commit 870acd5827
12 changed files with 141 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/SFileAddFile.cpp
View File

@@ -386,7 +386,7 @@ int SFileAddFile_Init(
if(nError == ERROR_SUCCESS)
{
// Find the position where the file will be stored
FindFreeMpqSpace(ha, &hf->MpqFilePos);
hf->MpqFilePos = FindFreeMpqSpace(ha);
hf->RawFilePos = ha->MpqPos + hf->MpqFilePos;
hf->bIsWriteHandle = true;
@@ -418,15 +418,19 @@ int SFileAddFile_Init(
}
else
{
// If the file exists and "replace existing" is not set, fail it
if((dwFlags & MPQ_FILE_REPLACEEXISTING) == 0)
nError = ERROR_ALREADY_EXISTS;
// If the file entry already contains a file
// and it is a pseudo-name, replace it
if(nError == ERROR_SUCCESS)
// Only if the file really exists
if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
{
AllocateFileName(pFileEntry, szFileName);
// If the file exists and "replace existing" is not set, fail it
if((dwFlags & MPQ_FILE_REPLACEEXISTING) == 0)
nError = ERROR_ALREADY_EXISTS;
// If the file entry already contains a file
// and it is a pseudo-name, replace it
if(nError == ERROR_SUCCESS)
{
AllocateFileName(pFileEntry, szFileName);
}
}
}
}