Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -390,9 +390,8 @@ void CXMLPatcher::DumpFiles(
    {
        CryLog("Dumping before and after data files for '%s'", pInXMLFileName);

-        const char* pOrigFileName;
-
-        if (pOrigFileName = strrchr(pInXMLFileName, '/'))
+        const char* pOrigFileName = strrchr(pInXMLFileName, '/');
+        if (pOrigFileName)
        {
            pOrigFileName++;