Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #35 from Dss0/dss0_fixes

Browse Source 
Fixes to image decryption check, the game crashing with mods loaded and the latest steam update causing the game to crash
This commit is contained in:
RektInator 2020-07-24 22:04:28 +02:00 committed by GitHub
commit 5294bc424a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Components/Modules/Zones.cpp
View File

@ -2908,23 +2908,14 @@ namespace Components
// check if file should be skipped
auto skipFile = false;
if (!strncmp(&file[strlen(file) - 4], ".iwi", 4))
{
if (readSize > 3 && !memcmp(&fileBuffer[0], "IWi", 3))
{
skipFile = true;
}
}
else if (strstr(file, "weapons"))
if (strlen(file) > 5 && ((strncmp(&file[strlen(file) - 4], ".iwi", 4) != 0)))
{
skipFile = true;
}
else
else if (readSize >= 3 && (!memcmp(&fileBuffer[0], "IWi", 3)))
{
if (readSize > 8 && *reinterpret_cast<std::uint32_t*>(&fileBuffer[4]) == 0xe9c9c447)
{
skipFile = true;
}
skipFile = true;
}
// if the header seems encrypted...
@ -3511,4 +3502,4 @@ namespace Components
}
}
#pragma optimize( "", on )
#pragma optimize( "", on )

4
src/Steam/Proxy.cpp
View File

@ -175,11 +175,11 @@ namespace Steam
size_t expectedParams = Proxy::ClientUser.paramSize("SpawnProcess");
if (expectedParams == 40) // Release
{
Proxy::ClientUser.invoke<bool>("SpawnProcess", ourPath, cmdline.data(), 0, ourDirectory, gameID.bits, mod.data(), Proxy::AppId, 0, 0);
Proxy::ClientUser.invoke<bool>("SpawnProcess", ourPath, cmdline.data(), ourDirectory, gameID.bits, mod.data(), Proxy::AppId, 0, 0);
}
else if (expectedParams == 36) // Beta
{
Proxy::ClientUser.invoke<bool>("SpawnProcess", ourPath, cmdline.data(), 0, ourDirectory, gameID.bits, mod.data(), 0, 0);
Proxy::ClientUser.invoke<bool>("SpawnProcess", ourPath, cmdline.data(), ourDirectory, gameID.bits, mod.data(), Proxy::AppId, 0, 0);
}
else if (expectedParams == 48) // Legacy, expects VAC blob
{