Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit a297f9ef134e · 2025-08-20T19:15:02.000Z
04b8ee6 Small tweak for CLuaUtilDefs::Split
diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp
@@ -227,7 +227,7 @@ int CLuaUtilDefs::Split(lua_State* luaVM)
             lua_pushstring(luaVM, szToken);
             lua_settable(luaVM, -3);
 
-            szToken = strtok(NULL, strDelimiter);
+            szToken = strtok(nullptr, strDelimiter.c_str());
         }
 
         // Delete the text

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ int CLuaUtilDefs::Split(lua_State* luaVM)`
`227`	`227`	`lua_pushstring(luaVM, szToken);`
`228`	`228`	`lua_settable(luaVM, -3);`
`229`	`229`
`230`		`- szToken = strtok(NULL, strDelimiter);`
	`230`	`+ szToken = strtok(nullptr, strDelimiter.c_str());`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`// Delete the text`