From 25de2421802891f98bb9eba5320c8725b7f01489 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Wed, 26 Jan 2011 13:44:02 +0100 Subject: [PATCH] controller change bug fix --- common/server_player.cpp | 4 ++-- servatrice/src/servatrice.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/server_player.cpp b/common/server_player.cpp index 82ac831a..d479edce 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -330,8 +330,8 @@ ResponseCode Server_Player::moveCard(CommandContainer *cont, Server_CardZone *st publicCardName = card->getName(); int oldCardId = card->getId(); - if (faceDown) - card->setId(newCardId()); + if (faceDown || (targetzone->getPlayer() != startzone->getPlayer())) + card->setId(targetzone->getPlayer()->newCardId()); card->setFaceDown(faceDown); // The player does not get to see which card he moved if it moves between two parts of hidden zones which diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index f7fbac19..05f7106f 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -225,4 +225,4 @@ void Servatrice::statusUpdate() execSqlQuery(query); } -const QString Servatrice::versionString = "Servatrice 0.20110124"; +const QString Servatrice::versionString = "Servatrice 0.20110126";