Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit d7937447d9bf · 2025-08-12T22:29:35.000Z
0c1e286 Fix bug in arguments of CResource::DisplayInfo call
diff --git a/Server/mods/deathmatch/logic/CResource.cpp b/Server/mods/deathmatch/logic/CResource.cpp
@@ -1276,8 +1276,8 @@ void CResource::DisplayInfo()            // duplicated for HTML
         {
             if (pIncludedResources->IsBadVersion())
             {
-                CLogger::LogPrintf("  %s .. BAD VERSION (not between %d and %d)\n", pIncludedResources->GetMinimumVersion(),
-                                   pIncludedResources->GetMaximumVersion());
+                CLogger::LogPrintf("  %s .. BAD VERSION (not between %d and %d)\n", pIncludedResources->GetName().c_str(),
+                                   pIncludedResources->GetMinimumVersion(), pIncludedResources->GetMaximumVersion());
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -1276,8 +1276,8 @@ void CResource::DisplayInfo() // duplicated for HTML`
`1276`	`1276`	`{`
`1277`	`1277`	`if (pIncludedResources->IsBadVersion())`
`1278`	`1278`	`{`
`1279`		`- CLogger::LogPrintf(" %s .. BAD VERSION (not between %d and %d)\n", pIncludedResources->GetMinimumVersion(),`
`1280`		`- pIncludedResources->GetMaximumVersion());`
	`1279`	`+ CLogger::LogPrintf(" %s .. BAD VERSION (not between %d and %d)\n", pIncludedResources->GetName().c_str(),`
	`1280`	`+ pIncludedResources->GetMinimumVersion(), pIncludedResources->GetMaximumVersion());`
`1281`	`1281`	`}`
`1282`	`1282`	`else`
`1283`	`1283`	`{`