- Timestamp:
- Oct 10, 2018, 3:06:55 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
/code/branches/Masterserver_FS18 (added) merged: 11816,11829,11842,11856,11858,11880,11889,11905,11907,11910,11929-11930,11937,11962-11963,11973,11983,11990
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/libraries/network/ClientConnection.cc
r11071 r12027 105 105 { 106 106 // manually add server to list of peers 107 /*incomingEvent inEvent = */Connection::preprocessConnectEvent(event);108 // addPeer(inEvent.peerID); 107 Connection::preprocessConnectEvent(event); 108 109 109 // start communication thread 110 110 this->established_=true; … … 155 155 assert( this->server_ ); 156 156 assert( packet ); 157 // return Connection::addPacket( packet, NETWORK_PEER_ID_SERVER, channelID );158 157 // HACK: actually there should be a way to do this using addPacket and the correct peerID 159 158 return Connection::broadcastPacket(packet, channelID); … … 168 167 this->established_=false; 169 168 orxout(internal_error, context::network) << "Received disconnect Packet from Server!" << endl; 170 169 // server closed the connection 171 170 this->stopCommunicationThread(); 172 171 this->connectionClosed();
Note: See TracChangeset
for help on using the changeset viewer.