From 0abd1fb2993db3a4b4a079ad1e8fa5bd3a6a24f9 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Fri, 2 Jan 2015 17:10:19 +0100
Subject: [PATCH] Rework patch for "move to.." menu; fix "P/T"-related menus

---
 cockatrice/src/player.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index 42521802..bec18bd4 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -1900,12 +1900,16 @@ void Player::cardMenuAction()
             default: ;
         }
     }
-    game->sendGameCommand(prepareGameCommand(commandList), getId());
+    if(local)
+        sendGameCommand(prepareGameCommand(commandList));
+    else
+        game->sendGameCommand(prepareGameCommand(commandList));
 }
 
 void Player::actIncPT(int deltaP, int deltaT)
 {
     QString ptString = "+" + QString::number(deltaP) + "/+" + QString::number(deltaT);
+    int playerid = id;
     
     QList< const ::google::protobuf::Message * > commandList;
     QListIterator<QGraphicsItem *> j(scene()->selectedItems());
@@ -1917,13 +1921,19 @@ void Player::actIncPT(int deltaP, int deltaT)
         cmd->set_attribute(AttrPT);
         cmd->set_attr_value(ptString.toStdString());
         commandList.append(cmd);
+
+        if(local)
+            playerid=card->getZone()->getPlayer()->getId();
     }
-    sendGameCommand(prepareGameCommand(commandList));
+
+    game->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
 void Player::actSetPT()
 {
     QString oldPT;
+    int playerid = id;
+
     QListIterator<QGraphicsItem *> i(scene()->selectedItems());
     while (i.hasNext()) {
         CardItem *card = static_cast<CardItem *>(i.next());
@@ -1949,8 +1959,12 @@ void Player::actSetPT()
         cmd->set_attribute(AttrPT);
         cmd->set_attr_value(pt.toStdString());
         commandList.append(cmd);
+
+        if(local)
+            playerid=card->getZone()->getPlayer()->getId();
     }
-    sendGameCommand(prepareGameCommand(commandList));
+
+    game->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
 void Player::actDrawArrow()