From 703ff7905c5413e40de055aa30146fd778b98ffc Mon Sep 17 00:00:00 2001 From: Zach H Date: Tue, 29 Dec 2015 23:40:20 -0500 Subject: [PATCH 1/2] token coordinates --- cockatrice/src/player.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 135b4056..1f3b8856 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1136,6 +1136,9 @@ void Player::actCreateRelatedCard() // get the target card name QAction *action = static_cast(sender()); CardInfo *cardInfo = db->getCard(action->text()); + + // get the target token's location + QPoint gridPoint = QPoint(-1, table->clampValidTableRow(2 - cardInfo->getTableRow())); // create the token for the related card Command_CreateToken cmd; @@ -1146,6 +1149,9 @@ void Player::actCreateRelatedCard() cmd.set_annotation(settingsCache->getAnnotateTokens() ? cardInfo->getText().toStdString() : QString().toStdString()); cmd.set_destroy_on_zone_change(true); cmd.set_target_zone(sourceCard->getZone()->getName().toStdString()); + cmd.set_x(gridPoint.x()); + cmd.set_y(gridPoint.y()); + if(!cardInfo->getIsToken()) cmd.set_target_card_id(sourceCard->getId()); From f568a4e865beed1b68ae64aa6e124fd19734ebf6 Mon Sep 17 00:00:00 2001 From: Zach H Date: Wed, 30 Dec 2015 11:51:53 -0500 Subject: [PATCH 2/2] todo --- cockatrice/src/player.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 1f3b8856..8d54aa1b 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1138,6 +1138,7 @@ void Player::actCreateRelatedCard() CardInfo *cardInfo = db->getCard(action->text()); // get the target token's location + // TODO: Define this QPoint into its own function along with the one below QPoint gridPoint = QPoint(-1, table->clampValidTableRow(2 - cardInfo->getTableRow())); // create the token for the related card