diff options
Diffstat (limited to 'src/netlem_state_machine.c')
| -rw-r--r-- | src/netlem_state_machine.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/netlem_state_machine.c b/src/netlem_state_machine.c index b9b7433..f6bb4bc 100644 --- a/src/netlem_state_machine.c +++ b/src/netlem_state_machine.c @@ -10,12 +10,12 @@ extern int startLoadLevel(); -state_t _getOrChangeState(state_t s, TCPsocket sockClient) { +state_t _getOrChangeState(state_t newState, TCPsocket sockClient) { const event_t evReady = {0,0,0,eReady,0,0,NULL,NULL}; static state_t state=eLaunching; int result; - switch(s) { + switch(newState) { case eNull: break; case eMultiLoading: @@ -26,7 +26,8 @@ state_t _getOrChangeState(state_t s, TCPsocket sockClient) { return eNull; } - state=s; + state=newState; + logs2(LOG_INFO, "changing state", "eMultiLoading"); break; case eMultiWaitLoading: //TODO : check current state before switching @@ -35,15 +36,17 @@ state_t _getOrChangeState(state_t s, TCPsocket sockClient) { result=sendEvent(sockClient, &evReady); if (result!=0) return eNull; - state=s; + state=newState; + logs2(LOG_INFO, "changing state", "eMultiWaitLoading"); break; case eMultiGame: //TODO : check current state before switching - logs(LOG_INFO, "Game started !"); - state=s; + state=newState; + logs2(LOG_INFO, "changing state", "eMultiGame"); break; case eEnd: - state=s; + state=newState; + logs2(LOG_INFO, "changing state", "eEnd"); break; default: @@ -58,11 +61,11 @@ state_t getState() { return _getOrChangeState(eNull, NULL); } -state_t changeState(state_t s) { - return _getOrChangeState(s, NULL); +state_t changeState(state_t newState) { + return _getOrChangeState(newState, NULL); } -state_t changeStateAndNotify(state_t s, TCPsocket sockClient) { - return _getOrChangeState(s, sockClient); +state_t changeStateAndNotify(state_t newState, TCPsocket sockClient) { + return _getOrChangeState(newState, sockClient); } |