Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
779a400d
Commit
779a400d
authored
Feb 21, 2015
by
Gavin Bises
Browse files
Fix #331
parent
65412800
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/player.cpp
View file @
779a400d
...
...
@@ -1581,18 +1581,19 @@ void Player::playCard(CardItem *c, bool faceDown, bool tapped)
cardToMove
->
set_card_id
(
c
->
getId
());
CardInfo
*
ci
=
c
->
getInfo
();
if
((
!
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
==
3
)
||
if
(
!
faceDown
&&
((
!
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
==
3
)
||
((
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
!=
0
)
&&
c
->
getZone
()
->
getName
().
toStdString
()
!=
"stack"
))
{
c
->
getZone
()
->
getName
().
toStdString
()
!=
"stack"
))
)
{
cmd
.
set_target_zone
(
"stack"
);
cmd
.
set_x
(
0
);
cmd
.
set_y
(
0
);
}
else
{
QPoint
gridPoint
=
QPoint
(
-
1
,
2
-
ci
->
getTableRow
());
int
tableRow
=
faceDown
?
2
:
ci
->
getTableRow
();
QPoint
gridPoint
=
QPoint
(
-
1
,
2
-
tableRow
);
cardToMove
->
set_face_down
(
faceDown
);
cardToMove
->
set_pt
(
ci
->
getPowTough
().
toStdString
());
cardToMove
->
set_tapped
(
tapped
);
if
(
ci
->
getT
ableRow
()
!=
3
)
if
(
t
ableRow
!=
3
)
cmd
.
set_target_zone
(
"table"
);
cmd
.
set_x
(
gridPoint
.
x
());
cmd
.
set_y
(
gridPoint
.
y
());
...
...
@@ -2146,7 +2147,7 @@ void Player::actHide()
void
Player
::
actPlayFacedown
()
{
playCard
(
game
->
getActiveCard
(),
true
,
game
->
getActiveCard
()
->
getInfo
()
->
getCipt
()
);
playCard
(
game
->
getActiveCard
(),
true
,
false
);
}
void
Player
::
updateCardMenu
(
CardItem
*
card
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment