Vantha/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Default many of CFsm's special functions and remove virtual specifires

Browse Source 
Differential Revision: https://code.wildfiregames.com/D5249
This was SVN commit r28053.
This commit is contained in:
phosit 2024-03-21 17:43:34 +00:00
parent 78652aa92c
commit a4f91e43ae
2 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/network/FSM.cpp
View File

@ -30,34 +30,6 @@ CFsmEvent::~CFsmEvent()
m_Param = nullptr;
}
CFsm::CFsm()
{
m_Done = false;
m_FirstState = FSM_INVALID_STATE;
m_CurrState = FSM_INVALID_STATE;
m_NextState = FSM_INVALID_STATE;
}
CFsm::~CFsm()
{
Shutdown();
}
void CFsm::Setup()
{
// Does nothing by default
}
void CFsm::Shutdown()
{
m_Transitions.clear();
m_Done = false;
m_FirstState = FSM_INVALID_STATE;
m_CurrState = FSM_INVALID_STATE;
m_NextState = FSM_INVALID_STATE;
}
void CFsm::AddTransition(unsigned int state, unsigned int eventType, unsigned int nextState,
Action* pAction /* = nullptr */, void* pContext /* = nullptr*/)
{
@ -108,6 +80,5 @@ bool CFsm::Update(unsigned int eventType, void* pEventParam)
bool CFsm::IsDone() const
{
// By default the internal flag m_Done is tested
return m_Done;
}

27
source/network/FSM.h
View File

@ -81,23 +81,7 @@ private:
*/
class CFsm
{
NONCOPYABLE(CFsm);
public:
CFsm();
virtual ~CFsm();
/**
* Constructs the state machine. This method must be overriden so that
* connections are constructed for the particular state machine implemented.
*/
virtual void Setup();
/**
* Clear event, transition lists and reset state machine.
*/
void Shutdown();
/**
* Adds a new transistion to the state machine.
*/
@ -136,9 +120,8 @@ public:
/**
* Tests whether the state machine has finished its work.
* @note This is state machine specific.
*/
virtual bool IsDone() const;
bool IsDone() const;
private:
struct TransitionKey
@ -177,10 +160,10 @@ private:
*/
bool IsFirstTime() const;
bool m_Done;
unsigned int m_FirstState;
unsigned int m_CurrState;
unsigned int m_NextState;
bool m_Done{false};
unsigned int m_FirstState{FSM_INVALID_STATE};
unsigned int m_CurrState{FSM_INVALID_STATE};
unsigned int m_NextState{FSM_INVALID_STATE};
TransitionMap m_Transitions;
};