Skip to content
Snippets Groups Projects
Commit e0730596 authored by Yukita Mayako's avatar Yukita Mayako
Browse files

Some cleaning up~

parent db6890ab
No related branches found
No related tags found
No related merge requests found
...@@ -270,6 +270,7 @@ void SV_ResetServer(void); ...@@ -270,6 +270,7 @@ void SV_ResetServer(void);
void CL_AddSplitscreenPlayer(void); void CL_AddSplitscreenPlayer(void);
void CL_RemoveSplitscreenPlayer(void); void CL_RemoveSplitscreenPlayer(void);
void CL_Reset(void); void CL_Reset(void);
void D_SaveBan(void); // in the middle of frikking nowhere
void CL_ClearPlayer(INT32 playernum); void CL_ClearPlayer(INT32 playernum);
void CL_UpdateServerList(boolean internetsearch, INT32 room); void CL_UpdateServerList(boolean internetsearch, INT32 room);
// is there a game running // is there a game running
......
...@@ -21,6 +21,7 @@ enum { ...@@ -21,6 +21,7 @@ enum {
DISCONNECT_UNKNOWN = 0, DISCONNECT_UNKNOWN = 0,
DISCONNECT_SHUTDOWN, DISCONNECT_SHUTDOWN,
DISCONNECT_FULL, DISCONNECT_FULL,
DISCONNECT_VERSION,
CLIENT_ASKMSINFO = 0, CLIENT_ASKMSINFO = 0,
CLIENT_JOIN, CLIENT_JOIN,
...@@ -55,7 +56,12 @@ static void ServerHandlePacket(UINT8 node, DataWrap data) ...@@ -55,7 +56,12 @@ static void ServerHandlePacket(UINT8 node, DataWrap data)
UINT16 version = data->ReadUINT16(data); UINT16 version = data->ReadUINT16(data);
UINT16 subversion = data->ReadUINT16(data); UINT16 subversion = data->ReadUINT16(data);
if (version != VERSION || subversion != SUBVERSION) if (version != VERSION || subversion != SUBVERSION)
{
CONS_Printf("NETWORK: Version mismatch!?\n"); CONS_Printf("NETWORK: Version mismatch!?\n");
nodeleaving[node] = true;
enet_peer_disconnect(nodetopeer[node], DISCONNECT_VERSION);
break;
}
char *name = data->ReadStringn(data, MAXPLAYERNAME); char *name = data->ReadStringn(data, MAXPLAYERNAME);
CONS_Printf("NETWORK: Player '%s' joining...\n", name); CONS_Printf("NETWORK: Player '%s' joining...\n", name);
net_playercount++; net_playercount++;
...@@ -193,15 +199,6 @@ void Net_AckTicker(void) ...@@ -193,15 +199,6 @@ void Net_AckTicker(void)
} }
} }
boolean Net_AllAckReceived(void)
{
return true;
}
void D_SetDoomcom(void)
{
}
void D_NetOpen(void) void D_NetOpen(void)
{ {
ENetAddress address = { ENET_HOST_ANY, 5029 }; ENetAddress address = { ENET_HOST_ANY, 5029 };
...@@ -301,7 +298,7 @@ void D_CloseConnection(void) ...@@ -301,7 +298,7 @@ void D_CloseConnection(void)
if (ClientHost) if (ClientHost)
{ {
enet_peer_disconnect(nodetopeer[servernode], 0); enet_peer_disconnect(nodetopeer[servernode], DISCONNECT_SHUTDOWN);
while (enet_host_service(ServerHost, &e, 3000) > 0) while (enet_host_service(ServerHost, &e, 3000) > 0)
{ {
if (e.type == ENET_EVENT_TYPE_DISCONNECT) if (e.type == ENET_EVENT_TYPE_DISCONNECT)
......
...@@ -10,9 +10,6 @@ extern boolean nodeingame[MAXNETNODES]; // set false as nodes leave game ...@@ -10,9 +10,6 @@ extern boolean nodeingame[MAXNETNODES]; // set false as nodes leave game
boolean Net_GetNetStat(void); boolean Net_GetNetStat(void);
void Net_AckTicker(void); void Net_AckTicker(void);
boolean Net_AllAckReceived(void);
void D_SetDoomcom(void);
void D_SaveBan(void);
boolean D_CheckNetGame(void); boolean D_CheckNetGame(void);
void D_CloseConnection(void); void D_CloseConnection(void);
void Net_CloseConnection(INT32 node); void Net_CloseConnection(INT32 node);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment