From c748d029500e99a87d81296093fb2d2ebceedc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= <ipkiss@gmail.com>
Date: Wed, 24 Oct 2012 00:31:21 +0200
Subject: [PATCH] Saved games: use the real player ID, not a modified one

---
 game/xml_writer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/game/xml_writer.cpp b/game/xml_writer.cpp
index ead1bf3..aee0abf 100644
--- a/game/xml_writer.cpp
+++ b/game/xml_writer.cpp
@@ -178,7 +178,7 @@ void XmlWriter::write(const Game &iGame, const string &iFileName)
     for (unsigned int i = 0; i < iGame.getNPlayers(); ++i)
     {
         const Player &player = iGame.getPlayer(i);
-        out << indent << "<Player id=\"" << player.getId() + 1 << "\">" << endl;
+        out << indent << "<Player id=\"" << player.getId() << "\">" << endl;
         addIndent(indent);
         out << indent << "<Name>" << toUtf8(player.getName()) << "</Name>" << endl;
         out << indent << "<Type>" << (player.isHuman() ? "human" : "computer") << "</Type>" << endl;
@@ -230,7 +230,7 @@ void XmlWriter::write(const Game &iGame, const string &iFileName)
             else if (dynamic_cast<const PlayerRackCmd*>(cmd))
             {
                 const PlayerRackCmd *rackCmd = static_cast<const PlayerRackCmd*>(cmd);
-                unsigned int id = rackCmd->getPlayer().getId() + 1;
+                unsigned int id = rackCmd->getPlayer().getId();
                 out << indent << "<PlayerRack playerId=\"" << id << "\">"
                     << toUtf8(rackCmd->getRack().toString())
                     << "</PlayerRack>" << endl;
@@ -238,7 +238,7 @@ void XmlWriter::write(const Game &iGame, const string &iFileName)
             else if (dynamic_cast<const PlayerMoveCmd*>(cmd))
             {
                 const PlayerMoveCmd *moveCmd = static_cast<const PlayerMoveCmd*>(cmd);
-                unsigned int id = moveCmd->getPlayer().getId() + 1;
+                unsigned int id = moveCmd->getPlayer().getId();
                 out << indent;
                 writeMove(out, moveCmd->getMove(), "PlayerMove", id);
                 out << endl;
@@ -246,7 +246,7 @@ void XmlWriter::write(const Game &iGame, const string &iFileName)
             else if (dynamic_cast<const GameMoveCmd*>(cmd))
             {
                 const GameMoveCmd *moveCmd = static_cast<const GameMoveCmd*>(cmd);
-                unsigned int id = moveCmd->getPlayerId() + 1;
+                unsigned int id = moveCmd->getPlayerId();
                 out << indent;
                 writeMove(out, moveCmd->getMove(), "GameMove", id);
                 out << endl;
@@ -262,7 +262,7 @@ void XmlWriter::write(const Game &iGame, const string &iFileName)
             else if (dynamic_cast<const PlayerEventCmd*>(cmd))
             {
                 const PlayerEventCmd *eventCmd = static_cast<const PlayerEventCmd*>(cmd);
-                unsigned int id = eventCmd->getPlayer().getId() + 1;
+                unsigned int id = eventCmd->getPlayer().getId();
                 int value = eventCmd->getPoints();
                 // Warnings
                 if (eventCmd->getEventType() == PlayerEventCmd::WARNING)