davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-18 16:16:35 +09:00
Code Issues Releases Activity

Fixed intermediate status messages not being outputted using StatusChanged messages

Browse Source
This commit is contained in:
Michael Lidgren
2015-06-04 21:36:19 +02:00
parent 9878bb3f01
commit a4240c914b
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Lidgren.Network/NetConnection.cs
View File

@@ -20,8 +20,9 @@ namespace Lidgren.Network
internal NetPeer m_peer; internal NetPeer m_peer;
internal NetPeerConfiguration m_peerConfiguration; internal NetPeerConfiguration m_peerConfiguration;
internal NetConnectionStatus m_status; internal NetConnectionStatus m_status; // actual status
internal NetConnectionStatus m_visibleStatus; internal NetConnectionStatus m_outputtedStatus; // status that has been sent as StatusChanged message
internal NetConnectionStatus m_visibleStatus; // status visible by querying the Status property
internal NetEndPoint m_remoteEndPoint; internal NetEndPoint m_remoteEndPoint;
internal NetSenderChannelBase[] m_sendChannels; internal NetSenderChannelBase[] m_sendChannels;
internal NetReceiverChannelBase[] m_receiveChannels; internal NetReceiverChannelBase[] m_receiveChannels;
@@ -87,6 +88,7 @@ namespace Lidgren.Network
m_peer = peer; m_peer = peer;
m_peerConfiguration = m_peer.Configuration; m_peerConfiguration = m_peer.Configuration;
m_status = NetConnectionStatus.None; m_status = NetConnectionStatus.None;
m_outputtedStatus = NetConnectionStatus.None;
m_visibleStatus = NetConnectionStatus.None; m_visibleStatus = NetConnectionStatus.None;
m_remoteEndPoint = remoteEndPoint; m_remoteEndPoint = remoteEndPoint;
m_sendChannels = new NetSenderChannelBase[NetConstants.NumTotalChannels]; m_sendChannels = new NetSenderChannelBase[NetConstants.NumTotalChannels];
@@ -115,9 +117,6 @@ namespace Lidgren.Network
{ {
// user or library thread // user or library thread
if (status == m_status)
return;
m_status = status; m_status = status;
if (reason == null) if (reason == null)
reason = string.Empty; reason = string.Empty;
@@ -130,16 +129,21 @@ namespace Lidgren.Network
if (m_peerConfiguration.IsMessageTypeEnabled(NetIncomingMessageType.StatusChanged)) if (m_peerConfiguration.IsMessageTypeEnabled(NetIncomingMessageType.StatusChanged))
{ {
NetIncomingMessage info = m_peer.CreateIncomingMessage(NetIncomingMessageType.StatusChanged, 4 + reason.Length + (reason.Length > 126 ? 2 : 1)); if (m_outputtedStatus != status)
info.m_senderConnection = this; {
info.m_senderEndPoint = m_remoteEndPoint; NetIncomingMessage info = m_peer.CreateIncomingMessage(NetIncomingMessageType.StatusChanged, 4 + reason.Length + (reason.Length > 126 ? 2 : 1));
info.Write((byte)m_status); info.m_senderConnection = this;
info.Write(reason); info.m_senderEndPoint = m_remoteEndPoint;
m_peer.ReleaseMessage(info); info.Write((byte)m_status);
info.Write(reason);
m_peer.ReleaseMessage(info);
m_outputtedStatus = status;
}
} }
else else
{ {
// app dont want those messages, update visible status immediately // app dont want those messages, update visible status immediately
m_outputtedStatus = m_status;
m_visibleStatus = m_status; m_visibleStatus = m_status;
} }
} }