Changeset 27702

Timestamp:

Jun 14, 2023, 4:58:37 PM (14 months ago)

Author:

phosit

Message:

Remove FSM conditions.
FSM conditions aren't used. So this removes dead code.

Accepted By: @wraitii

Differential Revision: ​https://code.wildfiregames.com/D4959

Location:

ps/trunk/source/network

Files:

• FSM.cpp (modified) (4 diffs)
• FSM.h (modified) (6 diffs)

ps/trunk/source/network/FSM.cpp

@@ -44 +44 @@
 {
     m_Actions.clear();
-    m_Conditions.clear();
 }
 
@@ -58 +57 @@
 }
 
-void CFsmTransition::RegisterCondition(void* pCondition, void* pContext)
-{
-    CallbackFunction callback;
-
-    // Add condition at the end of conditions list
-    callback.pFunction = pCondition;
-    callback.pContext = pContext;
-
-    m_Conditions.push_back(callback);
-}
-
 void CFsmTransition::SetEvent(CFsmEvent* pEvent)
 {
@@ -77 +65 @@
 {
     m_NextState = nextState;
-}
-
-bool CFsmTransition::ApplyConditions() const
-{
-    bool eval = true;
-
-    CallbackList::const_iterator it = m_Conditions.begin();
-    for (; it != m_Conditions.end(); ++it)
-    {
-        if (it->pFunction)
-        {
-            // Evaluate condition
-            Condition* condition = reinterpret_cast<Condition*>(it->pFunction);
-            eval &= condition(it->pContext);
-        }
-    }
-
-    return eval;
 }
 
@@ -286 +256 @@
     }
 
-    // Valid transition?
-    if (!pTransition->ApplyConditions())
-        return false;
-
     // Save the default state transition (actions might call SetNextState
     // to override this)

ps/trunk/source/network/FSM.h

@@ -31 +31 @@
 class CFsm;
 
-using Condition = bool(void* pContext);
 using Action = bool(void* pContext, const CFsmEvent* pEvent);
 
@@ -77 +76 @@
 
 /**
- * An association of event, condition, action and next state.
+ * An association of event, action and next state.
  */
 class CFsmTransition
@@ -95 +94 @@
 
     /**
-     * Registers a condition which will be evaluated when the transition occurs.
-     * @param pCondition the predicate which will be executed.
-     * @param pContext data passed to the predicate.
-     */
-    void RegisterCondition(void* pCondition, void* pContext);
-
-    /**
      * Set event for which transition will occur.
      */
@@ -128 +120 @@
         return m_Actions;
     }
-
-    const CallbackList& GetConditions() const
-    {
-        return m_Conditions;
-    }
-
-    /**
-     * Evaluates conditions for the transition.
-     * @return whether all the conditions are true.
-     */
-    bool ApplyConditions() const;
 
     /**
@@ -152 +133 @@
     CFsmEvent* m_Event;
     CallbackList m_Actions;
-    CallbackList m_Conditions;
 };
 
@@ -181 +161 @@
 
     /**
-     * Clear event, action and condition lists and reset state machine.
+     * Clear event, action lists and reset state machine.
      */
     void Shutdown();