From 34ae512d913f9c50eebef806957f3766c4e8dbb5 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 26 Jan 2016 21:32:16 +0100 Subject: [PATCH] NetPlayServer: Make pad data unpacking nicer to read --- Source/Core/Core/NetPlayServer.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 49bc559d06..bb449c4c76 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -500,7 +500,16 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player) PadMapping map = 0; GCPadStatus pad; - packet >> map >> pad.button >> pad.analogA >> pad.analogB >> pad.stickX >> pad.stickY >> pad.substickX >> pad.substickY >> pad.triggerLeft >> pad.triggerRight; + packet >> map + >> pad.button + >> pad.analogA + >> pad.analogB + >> pad.stickX + >> pad.stickY + >> pad.substickX + >> pad.substickY + >> pad.triggerLeft + >> pad.triggerRight; // If the data is not from the correct player, // then disconnect them. @@ -512,7 +521,16 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player) // Relay to clients sf::Packet spac; spac << (MessageId)NP_MSG_PAD_DATA; - spac << map << pad.button << pad.analogA << pad.analogB << pad.stickX << pad.stickY << pad.substickX << pad.substickY << pad.triggerLeft << pad.triggerRight; + spac << map + << pad.button + << pad.analogA + << pad.analogB + << pad.stickX + << pad.stickY + << pad.substickX + << pad.substickY + << pad.triggerLeft + << pad.triggerRight; SendToClients(spac, player.pid); }