thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 08:47:17 +01:00
Code Releases Activity

Change the order of custom Checkpoint events to happen before performing the action.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2021-09-12 16:02:46 +03:00
parent dfee411de5
commit e60e2958f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/Entity/Checkpoint.cpp
View File

@ -157,16 +157,16 @@ void CCheckpoint::SetWorld(int32_t world)
{ {
return; return;
} }
// Avoid property unwind from a recursive call
_Func->SetCheckPointWorld(m_ID, world);
// Avoid infinite recursive event loops // Avoid infinite recursive event loops
if (!(m_CircularLocks & CHECKPOINTCL_EMIT_CHECKPOINT_WORLD)) else if (!(m_CircularLocks & CHECKPOINTCL_EMIT_CHECKPOINT_WORLD))
{ {
// Prevent this event from triggering while executed // Prevent this event from triggering while executed
BitGuardU32 bg(m_CircularLocks, CHECKPOINTCL_EMIT_CHECKPOINT_WORLD); BitGuardU32 bg(m_CircularLocks, CHECKPOINTCL_EMIT_CHECKPOINT_WORLD);
// Now forward the event call // Now forward the event call
Core::Get().EmitCheckpointWorld(m_ID, current, world); Core::Get().EmitCheckpointWorld(m_ID, current, world);
} }
// Avoid property unwind from a recursive call
_Func->SetCheckPointWorld(m_ID, world);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -257,8 +257,6 @@ void CCheckpoint::SetRadius(float radius)
Validate(); Validate();
// Grab the current value for this property // Grab the current value for this property
const float current = _Func->GetCheckPointRadius(m_ID); const float current = _Func->GetCheckPointRadius(m_ID);
// Avoid property unwind from a recursive call
_Func->SetCheckPointRadius(m_ID, radius);
// Avoid infinite recursive event loops // Avoid infinite recursive event loops
if (!(m_CircularLocks & CHECKPOINTCL_EMIT_CHECKPOINT_RADIUS)) if (!(m_CircularLocks & CHECKPOINTCL_EMIT_CHECKPOINT_RADIUS))
{ {
@ -267,6 +265,8 @@ void CCheckpoint::SetRadius(float radius)
// Now forward the event call // Now forward the event call
Core::Get().EmitCheckpointRadius(m_ID, current, radius); Core::Get().EmitCheckpointRadius(m_ID, current, radius);
} }
// Avoid property unwind from a recursive call
_Func->SetCheckPointRadius(m_ID, radius);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------