1 files changed, 7 insertions, 10 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index b1877ad..51dcc24 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -153,8 +153,8 @@ void Server::waitForClientConnections()
   // server must stay alive as long as sockets (qt parent mem mechanism)
   tcpSrv->listen(QHostAddress::Any, Constants::Networking::port);
 
+  ProtoBuf::WhoAmI packet;
 #define SINGLE
-
 #ifdef SINGLE
   for (unsigned int  i = 0; i < 1; ++i)
   {
@@ -172,8 +172,6 @@ void Server::waitForClientConnections()
     Color::Color color = Color::order[i];
     m_clientConnections[color] = socket;
     /* notify player of color */
-    //TODO: allocate + reuse packet
-    ProtoBuf::WhoAmI packet;
     packet.set_color(color);
     Util::sendPacket(packet, socket);
 
@@ -183,21 +181,21 @@ void Server::waitForClientConnections()
 
 void Server::sendUpdate(Transmission::map_t map)
 {
-  ProtoBuf::MapUpdate packet;
+  m_updatepacket.Clear();
 
   for (unsigned int x = 0; x < Constants::map_size.width; ++x)
   {
     for (unsigned int y = 0; y < Constants::map_size.height; ++y)
-      packet.add_field(map[x][y]);
+      m_updatepacket.add_field(map[x][y]);
   }
 
   for(unsigned i = 0; Color::order[i] != Color::none; ++i)
   {
-    packet.add_round_points(m_actors.value(Color::order[i])->getRoundPoints());
-    packet.add_game_points(m_actors.value(Color::order[i])->getGamePoints());
+    m_updatepacket.add_round_points(m_actors.value(Color::order[i])->getRoundPoints());
+    m_updatepacket.add_game_points(m_actors.value(Color::order[i])->getGamePoints());
   }
 
-  QSharedPointer<QByteArray> data = Util::createPacket(packet);
+  QSharedPointer<QByteArray> data = Util::createPacket(m_updatepacket);
   foreach(QTcpSocket *socket, m_clientConnections)
   {
     if (!Util::sendPacket(data.data(), socket))
@@ -210,6 +208,7 @@ void Server::sendUpdate(Transmission::map_t map)
 
 void Server::keyPressUpdate()
 {
+  ProtoBuf::KeyPressUpdate packet;
   QMapIterator<Color::Color, QTcpSocket *> i(m_clientConnections);
   while (i.hasNext())
   {
@@ -220,8 +219,6 @@ void Server::keyPressUpdate()
     while (socket->bytesAvailable() > (qint64)sizeof(qint64))
     {
       QSharedPointer<QByteArray> data = Util::receivePacket(socket);
-      //TODO: allocate + reuse packet
-      ProtoBuf::KeyPressUpdate packet;
       bool worked = packet.ParseFromArray(data->data(), data->size());
       Q_ASSERT(worked);
       Q_UNUSED(worked);