Fix setPedOnFire(ped, false) doesn't cancel TASK_SIMPLE_PLAYER_ON_FIRE #3930
Conversation
| @@ -2594,7 +2594,7 @@ bool CStaticFunctionDefinitions::SetPedOnFire(CClientEntity& Entity, bool bOnFir | |||
| { | |||
| if (IS_PED(&Entity)) | |||
| { | |||
| if (!Entity.IsLocalEntity()) | |||
| if (!Entity.IsLocalEntity() && &Entity != GetLocalPlayer()) | |||
There was a problem hiding this comment.
Why? This function should work with local peds too.
There was a problem hiding this comment.
This is agreed with botder and dutchman
There was a problem hiding this comment.
Can you explain? Why should not local peds use this function?
| @@ -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) | |||
There was a problem hiding this comment.
setPedOnFire(ped, false) doesn't return false if the ped wasn't on fire
| CTask* task = taskManager->GetTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM); | ||
| if (task && task->GetTaskType() == TASK_SIMPLE_PLAYER_ON_FIRE) | ||
| taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM); |
There was a problem hiding this comment.
Can you call RemoveTaskSecondary without task checks? If you are unable to do so, please add RemoveSecondaryTaskIfExists in CTaskManager
There was a problem hiding this comment.
I don't understand what's wrong with this check?
There was a problem hiding this comment.
This code can be reusable and has its own logical scope. So you can extract a method here for better readability
if (taskManager)
taskManager->RemoveTaskSecondaryIfExists(TASK_SECONDARY_PARTIAL_ANIM, TASK_SIMPLE_PLAYER_ON_FIRE);Or overload the RemoveTaskSecondary method:
if (taskManager)
taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM, TASK_SIMPLE_PLAYER_ON_FIRE);
Fixed #3249