Fix clang 13 compilation problems (#5791)
* Fix clang 13 compilation problems Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda which replaces missing `Draw2dLabel` functionality ( added TODO marker there ) Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * apply review suggestions Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix type in assert message Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
@@ -1263,8 +1263,7 @@ ILINE void FS_CLOSEDIR_NOERR(FS_DIR_TYPE pDir)
|
||||
const bool GetFilenameNoCase
|
||||
(
|
||||
const char* file,
|
||||
char* pAdjustedFilename,
|
||||
const bool cCreateNew
|
||||
char* pAdjustedFilename
|
||||
)
|
||||
{
|
||||
assert(file);
|
||||
@@ -1281,29 +1280,19 @@ const bool GetFilenameNoCase
|
||||
}
|
||||
}
|
||||
|
||||
char* slash;
|
||||
const char* dirname;
|
||||
char* name;
|
||||
|
||||
if ((pAdjustedFilename) == (char*)-1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
slash = strrchr(pAdjustedFilename, '/');
|
||||
#if !defined(LINUX) && !defined(APPLE) && !defined(DEFINE_SKIP_WILDCARD_CHECK) // fix the parent path anyhow.
|
||||
char* slash = strrchr(pAdjustedFilename, '/');
|
||||
char* name = pAdjustedFilename;
|
||||
if (slash)
|
||||
{
|
||||
dirname = pAdjustedFilename;
|
||||
name = slash + 1;
|
||||
*slash = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
dirname = ".";
|
||||
name = pAdjustedFilename;
|
||||
}
|
||||
|
||||
#if !defined(LINUX) && !defined(APPLE) && !defined(DEFINE_SKIP_WILDCARD_CHECK) // fix the parent path anyhow.
|
||||
// Check for wildcards. We'll always return true if the specified filename is
|
||||
// a wildcard pattern.
|
||||
if (strchr(name, '*') || strchr(name, '?'))
|
||||
@@ -1314,13 +1303,13 @@ const bool GetFilenameNoCase
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Scan for the file.
|
||||
if (slash)
|
||||
{
|
||||
*slash = '/';
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#if FIX_FILENAME_CASE
|
||||
char* path = pAdjustedFilename;
|
||||
|
||||
Reference in New Issue
Block a user