Merge branch 'lcs' into lcs-dev

This commit is contained in:
Nikolay Korolev
2021-01-18 22:20:27 +03:00
20 changed files with 784 additions and 686 deletions

View File

@ -27,7 +27,7 @@ uint32 CRunningScript::CollectLocateParameters(uint32* pIp, bool b3D)
uint8 type = CTheScripts::Read1ByteFromScript(&ip);
if (type >= ARGUMENT_LOCAL) {
ip--;
id = (uint32)GetPointerToScriptVariable(&ip, 0);
id = (uint32)(uintptr)GetPointerToScriptVariable(&ip, 0);
}
CollectParameters(pIp, b3D ? 7 : 5, &(ScriptParams[1]));
return id;