From 57e3e48eb558b73077c2b5b4e531ee1cd75b0fbf Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 11 Apr 2011 02:11:10 +0200 Subject: - second cleanup: move game/round points inside array - order is defined by Color::order[] used by server and client (gui too) --- pacman-c++/server.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pacman-c++/server.cpp') diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp index 144043b..4715ec6 100644 --- a/pacman-c++/server.cpp +++ b/pacman-c++/server.cpp @@ -89,7 +89,7 @@ Transmission::map_t Server::calculateUpdates() return map; } -QSharedPointer< ProtoBuf::MapUpdate > Server::createUpdatePacket(Transmission::map_t map) +QSharedPointer Server::createUpdatePacket(Transmission::map_t map) { QSharedPointer updatePacket = QSharedPointer(new ProtoBuf::MapUpdate); @@ -99,12 +99,13 @@ QSharedPointer< ProtoBuf::MapUpdate > Server::createUpdatePacket(Transmission::m for (unsigned int y = 0; y < Constants::map_size.height; ++y) updatePacket->add_field(map[x][y]); } - updatePacket->set_round_points_red(m_actors.value(Color::red)->getRoundPoints()); - updatePacket->set_game_points_red(m_actors.value(Color::red)->getGamePoints()); - updatePacket->set_round_points_green(m_actors.value(Color::green)->getRoundPoints()); - updatePacket->set_game_points_green(m_actors.value(Color::green)->getGamePoints()); - updatePacket->set_round_points_blue(m_actors.value(Color::blue)->getRoundPoints()); - updatePacket->set_game_points_blue(m_actors.value(Color::blue)->getGamePoints()); + + for(unsigned i = 0; Color::order[i] != Color::none; ++i) + { + updatePacket->add_round_points(m_actors.value(Color::order[i])->getRoundPoints()); + updatePacket->add_game_points(m_actors.value(Color::order[i])->getGamePoints()); + } + //qDebug() << "field sz "<< updatePacket->field_size(); return updatePacket; } -- cgit v1.2.3