Skip to content

Fix setPedOnFire(ped, false) doesn't cancel TASK_SIMPLE_PLAYER_ON_FIRE #3930

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.

Sign up for GitHub

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 5 commits into from
Feb 7, 2025
Merged

Fix setPedOnFire(ped, false) doesn't cancel TASK_SIMPLE_PLAYER_ON_FIRE #3930

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c00cdcd
Fix bug
FileEX Jan 6, 2025
ec5a337
Review
FileEX Jan 11, 2025
7fed8ed
Fix bug
FileEX Jan 29, 2025
e882c0e
Update Client/game_sa/CFireSA.cpp
FileEX Jan 29, 2025
9f8a995
Merge branch 'master' into bugfix/fire_task
botder Feb 7, 2025
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
14 changes: 10 additions & 4 deletions Client/game_sa/CPedSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ void CPedSA::SetBleeding(bool bBleeding)
bool CPedSA::SetOnFire(bool onFire)
{
CPedSAInterface* pInterface = GetPedInterface();
if (onFire == !!pInterface->pFireOnPed)
if (onFire && pInterface->pFireOnPed)
return false;

auto* fireManager = static_cast<CFireManagerSA*>(pGame->GetFireManager());
Expand All @@ -877,10 +877,16 @@ bool CPedSA::SetOnFire(bool onFire)
else
{
CFire* fire = fireManager->GetFire(static_cast<CFireSAInterface*>(pInterface->pFireOnPed));
if (!fire)
return false;
if (fire)
fire->Extinguish();

fire->Extinguish();
CTaskManager* taskManager = m_pPedIntelligence->GetTaskManager();
if (taskManager)
{
CTask* task = taskManager->GetTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM);
if (task && task->GetTaskType() == TASK_SIMPLE_PLAYER_ON_FIRE)
taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM);
}
}

return true;
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2594,7 +2594,7 @@ bool CStaticFunctionDefinitions::SetPedOnFire(CClientEntity& Entity, bool bOnFir
{
if (IS_PED(&Entity))
{
if (!Entity.IsLocalEntity())
if (!Entity.IsLocalEntity() && &Entity != GetLocalPlayer())
return false;

CClientPed& Ped = static_cast<CClientPed&>(Entity);
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2520,7 +2520,7 @@ bool CLuaElementDefs::SetLowLodElement(lua_State* luaVM, CClientEntity* pEntity,

bool CLuaElementDefs::SetElementOnFire(CClientEntity* entity, bool onFire) noexcept
{
if (!entity->IsLocalEntity())
if (!entity->IsLocalEntity() && entity != CStaticFunctionDefinitions::GetLocalPlayer())
return false;

return entity->SetOnFire(onFire);
Expand Down
Loading