Skip to content

Commit 3942eea

Browse files
author
nitrocaster
committed
Hide MultipackerSender/MultipacketReceiver methods.
1 parent a0d570a commit 3942eea

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

src/xrNetServer/NET_Common.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ MultipacketSender
4545
MultipacketSender();
4646
virtual ~MultipacketSender() {}
4747

48+
protected:
4849
void SendPacket( const void* packet_data, u32 packet_sz, u32 flags, u32 timeout );
4950
void FlushSendBuffer( u32 timeout );
50-
51-
52-
protected:
53-
5451
virtual void _SendTo_LL( const void* data, u32 size, u32 flags, u32 timeout ) =0;
5552

5653

@@ -85,11 +82,8 @@ MultipacketReciever
8582

8683
virtual ~MultipacketReciever() {}
8784

88-
void RecievePacket( const void* packet_data, u32 packet_sz, u32 param=0 );
89-
90-
9185
protected:
92-
86+
void RecievePacket( const void* packet_data, u32 packet_sz, u32 param=0 );
9387
virtual void _Recieve( const void* data, u32 data_size, u32 param ) =0;
9488
};
9589

src/xrNetServer/NET_Server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ void IPureServer::Flush_Clients_Buffers ()
582582
{
583583
static void FlushBuffer(IClient* client)
584584
{
585-
client->MultipacketSender::FlushSendBuffer(0);
585+
client->FlushSendBuffer(0);
586586
}
587587
};
588588

@@ -596,7 +596,7 @@ void IPureServer::SendTo_Buf(ClientID id, void* data, u32 size, u32 dwFlags, u32
596596
IClient* tmp_client = net_players.GetFoundClient(
597597
ClientIdSearchPredicate(id));
598598
VERIFY(tmp_client);
599-
tmp_client->MultipacketSender::SendPacket(data, size, dwFlags, dwTimeout);
599+
tmp_client->SendPacket(data, size, dwFlags, dwTimeout);
600600
}
601601

602602

src/xrNetServer/NET_Server.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ IClient : public MultipacketSender
7878

7979
IPureServer* server;
8080

81+
public:
82+
using MultipacketSender::SendPacket;
83+
using MultipacketSender::FlushSendBuffer;
84+
8185
private:
8286

8387
virtual void _SendTo_LL( const void* data, u32 size, u32 flags, u32 timeout );

0 commit comments

Comments
 (0)