aboutsummaryrefslogtreecommitdiff
path: root/src/SFileFindFile.cpp
diff options
context:
space:
mode:
authorLadislav Zezula <zezula@volny.cz>2020-03-25 16:39:13 +0100
committerLadislav Zezula <zezula@volny.cz>2020-03-25 16:39:13 +0100
commitb60bc45088ffa77b00dffca928f99159cbcebd2f (patch)
tree971de9407c7cabcf09d1992ee7f8a084e5c3949a /src/SFileFindFile.cpp
parent468292a0c4f0febef52337ba1f2d9e3f76ccac63 (diff)
CheckWildCard renamed to SFileCheckWildCard to prevent conflict with CascLib
Diffstat (limited to 'src/SFileFindFile.cpp')
-rw-r--r--src/SFileFindFile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/SFileFindFile.cpp b/src/SFileFindFile.cpp
index 68e769d..9ff6ca1 100644
--- a/src/SFileFindFile.cpp
+++ b/src/SFileFindFile.cpp
@@ -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;