From 3538ef8a153c3c5dc4ff1a4dd8dd0664afb08d5c Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 12 Nov 2018 02:04:32 +0100 Subject: [PATCH] - add destination node to NetOutputPacket constructor --- src/network/i_net.h | 2 +- src/network/netclient.cpp | 6 ++---- src/network/netserver.cpp | 12 ++++-------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/network/i_net.h b/src/network/i_net.h index 88295fe08c..b0753f28b3 100644 --- a/src/network/i_net.h +++ b/src/network/i_net.h @@ -10,7 +10,7 @@ class NetOutputPacket { public: - NetOutputPacket() : stream(buffer + 1, MAX_MSGLEN - 1) { buffer[0] = 0; } + NetOutputPacket(int node) : node(node), stream(buffer + 1, MAX_MSGLEN - 1) { buffer[0] = 0; } int node = 0; ByteOutputStream stream; diff --git a/src/network/netclient.cpp b/src/network/netclient.cpp index b66cd01cf9..657ac7c2d6 100644 --- a/src/network/netclient.cpp +++ b/src/network/netclient.cpp @@ -78,8 +78,7 @@ NetClient::NetClient(FString server) mServerNode = mComm->Connect(server); mStatus = NodeStatus::InPreGame; - NetOutputPacket packet; - packet.node = mServerNode; + NetOutputPacket packet(mServerNode); NetCommand cmd ( NetPacketType::ConnectRequest ); cmd.addString("ZDoom Connect Request"); @@ -178,8 +177,7 @@ void NetClient::EndCurrentTic() int targettic = (mSendTic + mServerTicDelta); - NetOutputPacket packet; - packet.node = mServerNode; + NetOutputPacket packet(mServerNode); NetCommand cmd ( NetPacketType::Tic ); cmd.addByte (targettic); // target gametic diff --git a/src/network/netserver.cpp b/src/network/netserver.cpp index 149829adda..3225255084 100644 --- a/src/network/netserver.cpp +++ b/src/network/netserver.cpp @@ -135,8 +135,7 @@ void NetServer::EndCurrentTic() { if (mNodes[i].Status == NodeStatus::InGame) { - NetOutputPacket packet; - packet.node = i; + NetOutputPacket packet(i); NetCommand cmd ( NetPacketType::Tic); cmd.addByte ( gametic ); @@ -287,8 +286,7 @@ void NetServer::OnConnectRequest(NetNode &node, ByteInputStream &stream) playeringame[node.Player] = true; players[node.Player].settings_controller = false; - NetOutputPacket response; - response.node = node.NodeIndex; + NetOutputPacket response(node.NodeIndex); NetCommand cmd ( NetPacketType::ConnectResponse ); cmd.addByte ( 1 ); // Protocol version @@ -303,8 +301,7 @@ void NetServer::OnConnectRequest(NetNode &node, ByteInputStream &stream) { node.Status = NodeStatus::Closed; - NetOutputPacket response; - response.node = node.NodeIndex; + NetOutputPacket response(node.NodeIndex); NetCommand cmd ( NetPacketType::ConnectResponse ); cmd.addByte ( 1 ); // Protocol version @@ -373,8 +370,7 @@ void NetServer::CmdSpawnPlayer(ByteOutputStream &stream, int player) void NetServer::FullUpdate(NetNode &node) { - NetOutputPacket packet; - packet.node = node.NodeIndex; + NetOutputPacket packet(node.NodeIndex); // Inform the client about all players already in the game. for ( int i = 0; i < MAXPLAYERNAME; ++i )