celisej567/source-engine
1
0
Fork 0
mirror of https://github.com/celisej567/source-engine.git synced 2026-01-05 22:09:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into windows

Browse Source
This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
parent edbe1baceb a53fff833f
commit 90cd6e0e15
3089 changed files with 38642 additions and 844823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/net_ws.cpp
View File

@@ -417,7 +417,7 @@ bool NET_StringToAdr ( const char *s, netadr_t *a)
CNetChan *NET_FindNetChannel(int socket, netadr_t &adr)
{
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
int numChannels = s_NetChannels.Count();
@@ -798,7 +798,7 @@ INetChannel *NET_CreateNetChannel(int socket, netadr_t *adr, const char * name,
// create new channel
chan = new CNetChan();
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
s_NetChannels.AddToTail( chan );
}
@@ -817,7 +817,7 @@ void NET_RemoveNetChannel(INetChannel *netchan, bool bDeleteNetChan)
return;
}
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
if ( s_NetChannels.Find( static_cast<CNetChan*>(netchan) ) == s_NetChannels.InvalidIndex() )
{
DevMsg(1, "NET_CloseNetChannel: unknown channel.\n");
@@ -1389,7 +1389,7 @@ bool NET_GetLoopPacket ( netpacket_t * packet )
if ( loop->data != loop->defbuffer )
{
delete loop->data;
delete[] loop->data;
loop->data = loop->defbuffer;
}
@@ -1677,7 +1677,7 @@ netpacket_t *NET_GetPacket (int sock, byte *scratch )
void NET_ProcessPending( void )
{
AUTO_LOCK( s_PendingSockets );
AUTO_LOCK_FM( s_PendingSockets );
for ( int i=0; i<s_PendingSockets.Count();i++ )
{
pendingsocket_t * psock = &s_PendingSockets[i];
@@ -1712,7 +1712,7 @@ void NET_ProcessPending( void )
if ( cmd == STREAM_CMD_ACKN )
{
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
for ( int j = 0; j < s_NetChannels.Count(); j++ )
{
CNetChan * chan = s_NetChannels[j];
@@ -1792,7 +1792,7 @@ void NET_ProcessListen(int sock)
psock.addr.SetFromSockadr( &sa );
psock.time = net_time;
AUTO_LOCK( s_PendingSockets );
AUTO_LOCK_FM( s_PendingSockets );
s_PendingSockets.AddToTail( psock );
// tell client to send challenge number to identify
@@ -1823,7 +1823,7 @@ void NET_ProcessSocket( int sock, IConnectionlessPacketHandler *handler )
// Scope for the auto_lock
{
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
// get streaming data from channel sockets
int numChannels = s_NetChannels.Count();
@@ -2553,7 +2553,7 @@ void NET_CloseAllSockets (void)
}
// shut down all pending sockets
AUTO_LOCK( s_PendingSockets );
AUTO_LOCK_FM( s_PendingSockets );
for(int j=0; j<s_PendingSockets.Count();j++ )
{
NET_CloseSocket( s_PendingSockets[j].newsock );
@@ -2836,7 +2836,7 @@ void NET_LogServerStatus( void )
return;
}
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
int numChannels = s_NetChannels.Count();
if ( numChannels == 0 )
@@ -3376,7 +3376,7 @@ CON_COMMAND( net_channels, "Shows net channel info" )
return;
}
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
for ( int i = 0; i < numChannels; i++ )
{
NET_PrintChannelStatus( s_NetChannels[i] );
@@ -3391,7 +3391,7 @@ CON_COMMAND( net_start, "Inits multiplayer network sockets" )
CON_COMMAND( net_status, "Shows current network status" )
{
AUTO_LOCK( s_NetChannels );
AUTO_LOCK_FM( s_NetChannels );
int numChannels = s_NetChannels.Count();
ConMsg("Net status for host %s:\n",