mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-13 03:33:48 +00:00
something went squiffy in the last set of merges
This commit is contained in:
parent
878fbdb609
commit
a7cb22b877
2 changed files with 12 additions and 12 deletions
|
|
@ -492,10 +492,10 @@ template<class T> T ReservedSocketList<T>::resolve(NetSocket socketToResolve)
|
|||
return entry.used ? entry.value : -1;
|
||||
}
|
||||
|
||||
static ConnectionNotifyEvent* smConnectionNotify = NULL;
|
||||
static ConnectionAcceptedEvent* smConnectionAccept = NULL;
|
||||
static ConnectionReceiveEvent* smConnectionReceive = NULL;
|
||||
static PacketReceiveEvent* smPacketReceive = NULL;
|
||||
ConnectionNotifyEvent* Net::smConnectionNotify = NULL;
|
||||
ConnectionAcceptedEvent* Net::smConnectionAccept = NULL;
|
||||
ConnectionReceiveEvent* Net::smConnectionReceive = NULL;
|
||||
PacketReceiveEvent* Net::smPacketReceive = NULL;
|
||||
|
||||
ConnectionNotifyEvent& Net::getConnectionNotifyEvent()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue