diff -r f5c86420facd -r 2dbf40661580 src/Network/Object.cc --- a/src/Network/Object.cc Thu Dec 04 21:10:41 2008 +0000 +++ b/src/Network/Object.cc Thu Dec 04 21:59:23 2008 +0000 @@ -13,7 +13,7 @@ slot_message = session.sig_chan_message(channel_id).connect(this, &NetworkObjectController::on_message); } -void NetworkObjectController::on_message (NetworkPacket &pkt, NetworkNode *node) { +void NetworkObjectController::on_message (NetworkPacketInput &pkt, NetworkNode *node) { uint32_t obj_id = pkt.read_uint32(); uint16_t msg_id = pkt.read_uint16(); @@ -40,7 +40,7 @@ return ++id_pool; } -void NetworkObject_ServerController::handle_create (NetworkObjectID obj_id, NetworkMessageID msg_id, NetworkPacket &pkt, NetworkNode *node) { +void NetworkObject_ServerController::handle_create (NetworkObjectID obj_id, NetworkMessageID msg_id, NetworkPacketInput &pkt, NetworkNode *node) { (void) obj_id; (void) msg_id; (void) pkt; @@ -59,7 +59,7 @@ } -void NetworkObject_ClientController::handle_create (NetworkObjectID obj_id, NetworkMessageID msg_id, NetworkPacket &pkt, NetworkNode *node) { +void NetworkObject_ClientController::handle_create (NetworkObjectID obj_id, NetworkMessageID msg_id, NetworkPacketInput &pkt, NetworkNode *node) { // we only communicate with the server assert(node == server); @@ -81,7 +81,7 @@ controller.objects[obj_id] = this; } -void NetworkObject::buildPacket (NetworkPacket &pkt, NetworkMessageID msg_id, const NetworkPacket &payload) { +void NetworkObject::buildPacket (NetworkPacketOutput &pkt, NetworkMessageID msg_id, const NetworkPacketBuffer &payload) { pkt.write_uint32(obj_id); pkt.write_uint16(msg_id); pkt.write_packet(payload); @@ -99,11 +99,11 @@ } -void NetworkObject_Server::handle_packet (NetworkNode *node, NetworkMessageID msg_id, NetworkPacket &pkt) { +void NetworkObject_Server::handle_packet (NetworkNode *node, NetworkMessageID msg_id, NetworkPacketInput &pkt) { _map_sig_message[msg_id](node, pkt); } -void NetworkObject_Server::send_to (NetworkNode *dst, NetworkMessageID msg_id, const NetworkPacket &pkt, bool reliable) { +void NetworkObject_Server::send_to (NetworkNode *dst, NetworkMessageID msg_id, const NetworkPacketBuffer &pkt, bool reliable) { NetworkPacket pkt_out; buildPacket(pkt_out, msg_id, pkt); @@ -111,11 +111,11 @@ dst->send(controller.channel_id, pkt_out, reliable); } -void NetworkObject_Server::send_all (NetworkMessageID msg_id, const NetworkPacket &pkt, bool reliable) { +void NetworkObject_Server::send_all (NetworkMessageID msg_id, const NetworkPacketBuffer &pkt, bool reliable) { send_all_except(msg_id, pkt, NULL, reliable); } -void NetworkObject_Server::send_all_except (NetworkMessageID msg_id, const NetworkPacket &pkt, NetworkNode *black_sheep, bool reliable) { +void NetworkObject_Server::send_all_except (NetworkMessageID msg_id, const NetworkPacketBuffer &pkt, NetworkNode *black_sheep, bool reliable) { NetworkPacket pkt_out; buildPacket(pkt_out, msg_id, pkt); @@ -132,13 +132,13 @@ // nothing } -void NetworkObject_Client::handle_packet (NetworkNode *node, NetworkMessageID msg_id, NetworkPacket &pkt) { +void NetworkObject_Client::handle_packet (NetworkNode *node, NetworkMessageID msg_id, NetworkPacketInput &pkt) { assert(node == controller.server); _map_sig_message[msg_id](pkt); } -void NetworkObject_Client::send (NetworkMessageID msg_id, const NetworkPacket &pkt, bool reliable) { +void NetworkObject_Client::send (NetworkMessageID msg_id, const NetworkPacketBuffer &pkt, bool reliable) { NetworkPacket pkt_out; buildPacket(pkt_out, msg_id, pkt);