Skip to content

ignorefirestate improvement #4189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Client/game_sa/CGameSA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,9 @@ void CGameSA::SetIgnoreFireStateEnabled(bool isEnabled)
MemSet((void*)0x64F3DB, 0x90, 14); // CCarEnterExit::IsPlayerToQuitCarEnter

MemSet((void*)0x685A7F, 0x90, 14); // CTaskSimplePlayerOnFoot::ProcessPlayerWeapon

MemSet((void*)0x53A899, 0x90, 5); // CFire::ProcessFire
MemSet((void*)0x53A990, 0x90, 5); // CFire::ProcessFire
}
else
{
Expand All @@ -899,6 +902,9 @@ void CGameSA::SetIgnoreFireStateEnabled(bool isEnabled)
MemCpy((void*)0x64F3DB, "\x8B\x85\x90\x04\x00\x00\x85\xC0\x0F\x85\x1B\x01\x00\x00", 14);

MemCpy((void*)0x685A7F, "\x8B\x86\x30\x07\x00\x00\x85\xC0\x0F\x85\x1D\x01\x00\x00", 14);

MemCpy((void*)0x53A899, "\xE8\x82\xF7\x0C\x00", 5);
MemCpy((void*)0x53A990, "\xE8\x8B\xF6\x0C\x00", 5);
}

m_isIgnoreFireStateEnabled = isEnabled;
Expand Down
2 changes: 1 addition & 1 deletion Shared/sdk/net/SyncStructures.h
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@ struct SWorldSpecialPropertiesStateSync : public ISyncStructure
isOK &= bitStream.ReadBits(reinterpret_cast<char*>(&data6), BITCOUNT6);
else
data6.ignoreFireState = false;

if (bitStream.Can(eBitStreamVersion::WorldSpecialProperty_FlyingComponents))
isOK &= bitStream.ReadBits(reinterpret_cast<char*>(&data7), BITCOUNT7);
else
Expand Down
Loading