Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-02-04 21:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

CheckWildCard renamed to SFileCheckWildCard to prevent conflict with CascLib

Browse Source
This commit is contained in:
Ladislav Zezula
2020-03-25 16:39:13 +01:00
parent 468292a0c4
commit b60bc45088
6 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SFileFindFile.cpp
View File

@@ -39,7 +39,7 @@ static TMPQSearch * IsValidSearchHandle(HANDLE hFind)
return NULL;
}
bool CheckWildCard(const char * szString, const char * szWildCard)
bool SFileCheckWildCard(const char * szString, const char * szWildCard)
{
const char * szWildCardPtr;
@@ -71,7 +71,7 @@ bool CheckWildCard(const char * szString, const char * szWildCard)
if(AsciiToUpperTable[szWildCardPtr[0]] == AsciiToUpperTable[szString[0]])
{
if(CheckWildCard(szString, szWildCardPtr))
if(SFileCheckWildCard(szString, szWildCardPtr))
return true;
}
}
@@ -253,7 +253,7 @@ static bool DoMPQSearch_FileEntry(
if(szFileName != NULL)
{
// Check the file name against the wildcard
if(CheckWildCard(szFileName + nPrefixLength, hs->szSearchMask))
if(SFileCheckWildCard(szFileName + nPrefixLength, hs->szSearchMask))
{
// Fill the found entry. hash entry and block index are taken from the base MPQ
lpFindFileData->dwHashIndex = HASH_ENTRY_FREE;