--- a/src/proto2/NetworkNode.cc Thu Nov 20 19:25:56 2008 +0000
+++ b/src/proto2/NetworkNode.cc Thu Nov 20 20:27:12 2008 +0000
@@ -1,7 +1,9 @@
+
+#include <cassert>
#include "NetworkNode.hh"
-NetworkNode::NetworkNode (NetworkSession &session, NetworkTCPTransport *tcp, NetworkUDP &udp, const NetworkAddress &address) :
+NetworkNode::NetworkNode (NetworkSession &session, NetworkTCPTransport *tcp, NetworkUDP *udp, const NetworkAddress &address) :
session(session), tcp(tcp), udp(udp), address(address) {
// connect signals
@@ -13,7 +15,7 @@
delete tcp;
}
-void on_disconnect (void) {
+void NetworkNode::on_disconnect (void) {
// tell session
session.handle_disconnect(this);
@@ -24,7 +26,7 @@
delete this;
}
-void NetworkNode::send (NetworkChannelID channel_id, const NetworkPacket &pkt, bool reliable = true) {
+void NetworkNode::send (NetworkChannelID channel_id, const NetworkPacket &pkt, bool reliable) {
assert(channel_id > 0);
// add our header
@@ -39,7 +41,7 @@
tcp->write_packet(pkt2);
} else {
- udp.sendto(pkt2, address);
+ udp->sendto(pkt2, address);
}
}