TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix lookup issue on TCPObject. Also sync with working code.

Browse source
This commit is contained in:
James Urquhart 2016-10-28 18:31:47 +01:00
parent 458bc27ea4
commit 5b1bb6547a
4 changed files with 145 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/app/mainLoop.cpp
View file

@ -320,7 +320,7 @@ void StandardMainLoop::init()
Sampler::init();
// Hook in for UDP notification
Net::smPacketReceive.notify(GNet, &NetInterface::processPacketReceiveEvent);
Net::getPacketReceiveEvent().notify(GNet, &NetInterface::processPacketReceiveEvent);
#ifdef TORQUE_DEBUG_GUARD
Memory::flagCurrentAllocs( Memory::FLAG_Static );

12
Engine/source/app/net/tcpObject.cpp
View file

@ -215,9 +215,9 @@ TCPObject::TCPObject()
if(gTCPCount == 1)
{
Net::smConnectionAccept.notify(processConnectedAcceptEvent);
Net::smConnectionReceive.notify(processConnectedReceiveEvent);
Net::smConnectionNotify.notify(processConnectedNotifyEvent);
Net::getConnectionAcceptedEvent().notify(processConnectedAcceptEvent);
Net::getConnectionReceiveEvent().notify(processConnectedReceiveEvent);
Net::getConnectionNotifyEvent().notify(processConnectedNotifyEvent);
}
}
@ -230,9 +230,9 @@ TCPObject::~TCPObject()
if(gTCPCount == 0)
{
Net::smConnectionAccept.remove(processConnectedAcceptEvent);
Net::smConnectionReceive.remove(processConnectedReceiveEvent);
Net::smConnectionNotify.remove(processConnectedNotifyEvent);
Net::getConnectionAcceptedEvent().remove(processConnectedAcceptEvent);
Net::getConnectionReceiveEvent().remove(processConnectedReceiveEvent);
Net::getConnectionNotifyEvent().remove(processConnectedNotifyEvent);
}
}