event name change

This commit is contained in:
ehouse 2005-09-09 03:15:06 +00:00
parent 6474320381
commit 8ac4c21e9f
3 changed files with 6 additions and 6 deletions

View file

@ -298,7 +298,7 @@ void
CookieRef::pushHeartbeatEvent( HostID id, int socket )
{
CRefEvent evt;
evt.type = XW_EVENT_HEARTMSG;
evt.type = XW_EVENT_HEARTRCVD;
evt.u.heart.id = id;
evt.u.heart.socket = socket;
m_eventQueue.push_back( evt );

View file

@ -101,9 +101,9 @@ StateTable g_stateTable[] = {
{ XW_ST_ALLCONNECTED, XW_EVENT_CONNTIMER, XW_ACTION_NONE, XW_ST_ALLCONNECTED },
/* Heartbeat arrived */
{ XW_ST_CONNECTING, XW_EVENT_HEARTMSG, XW_ACTION_NOTEHEART, XW_ST_CONNECTING },
{ XW_ST_ALLCONNECTED, XW_EVENT_HEARTMSG, XW_ACTION_NOTEHEART, XW_ST_ALLCONNECTED },
{ XW_ST_MISSING, XW_EVENT_HEARTMSG, XW_ACTION_NOTEHEART, XW_ST_MISSING },
{ XW_ST_CONNECTING, XW_EVENT_HEARTRCVD, XW_ACTION_NOTEHEART, XW_ST_CONNECTING },
{ XW_ST_ALLCONNECTED, XW_EVENT_HEARTRCVD, XW_ACTION_NOTEHEART, XW_ST_ALLCONNECTED },
{ XW_ST_MISSING, XW_EVENT_HEARTRCVD, XW_ACTION_NOTEHEART, XW_ST_MISSING },
/* I think we need a state XW_ST_SOMEMISSING. The game can't be played,
but we're open to XWRELAY_RECONNECT (but not to XWRELAY_CONNECT) */
@ -175,7 +175,7 @@ eventString( XW_RELAY_EVENT evt )
CASESTR(XW_EVENT_RECONNECTMSG);
CASESTR(XW_EVENT_DISCONNECTMSG);
CASESTR(XW_EVENT_FORWARDMSG);
CASESTR(XW_EVENT_HEARTMSG);
CASESTR(XW_EVENT_HEARTRCVD);
CASESTR(XW_EVENT_CONNTIMER);
CASESTR(XW_EVENT_HEARTFAILED);
CASESTR(XW_EVENT_DESTOK);

View file

@ -76,7 +76,7 @@ typedef enum {
,XW_EVENT_FORWARDMSG /* A message needs forwarding */
,XW_EVENT_HEARTMSG /* A heartbeat message arrived */
,XW_EVENT_HEARTRCVD /* A heartbeat message arrived */
,XW_EVENT_CONNTIMER /* timer for did we get all players hooked
up */