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
f199e207
Commit
f199e207
authored
Jul 07, 2015
by
Zach
Browse files
Merge pull request #1216 from ZeldaZach/fix_morphs
Fix Morphs from Sharing Information
parents
955cc392
cf09aecc
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carditem.cpp
View file @
f199e207
...
@@ -110,7 +110,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
...
@@ -110,7 +110,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QStringList
ptDbSplit
=
db
->
getCard
(
name
)
->
getPowTough
().
split
(
"/"
);
QStringList
ptDbSplit
=
db
->
getCard
(
name
)
->
getPowTough
().
split
(
"/"
);
QStringList
ptSplit
=
pt
.
split
(
"/"
);
QStringList
ptSplit
=
pt
.
split
(
"/"
);
if
(
ptDbSplit
.
at
(
0
)
!=
ptSplit
.
at
(
0
)
||
ptDbSplit
.
at
(
1
)
!=
ptSplit
.
at
(
1
))
if
(
getFaceDown
()
||
ptDbSplit
.
at
(
0
)
!=
ptSplit
.
at
(
0
)
||
ptDbSplit
.
at
(
1
)
!=
ptSplit
.
at
(
1
))
painter
->
setPen
(
QColor
(
255
,
150
,
0
));
painter
->
setPen
(
QColor
(
255
,
150
,
0
));
else
else
painter
->
setPen
(
Qt
::
white
);
painter
->
setPen
(
Qt
::
white
);
...
...
common/server_card.cpp
View file @
f199e207
...
@@ -126,14 +126,17 @@ void Server_Card::getInfo(ServerInfo_Card *info)
...
@@ -126,14 +126,17 @@ void Server_Card::getInfo(ServerInfo_Card *info)
info
->
set_name
(
displayedName
.
toStdString
());
info
->
set_name
(
displayedName
.
toStdString
());
info
->
set_x
(
coord_x
);
info
->
set_x
(
coord_x
);
info
->
set_y
(
coord_y
);
info
->
set_y
(
coord_y
);
QString
ptStr
=
getPT
();
if
(
facedown
)
if
(
facedown
)
{
info
->
set_face_down
(
true
);
info
->
set_face_down
(
true
);
ptStr
=
getPT
();
}
info
->
set_tapped
(
tapped
);
info
->
set_tapped
(
tapped
);
if
(
attacking
)
if
(
attacking
)
info
->
set_attacking
(
true
);
info
->
set_attacking
(
true
);
if
(
!
color
.
isEmpty
())
if
(
!
color
.
isEmpty
())
info
->
set_color
(
color
.
toStdString
());
info
->
set_color
(
color
.
toStdString
());
const
QString
ptStr
=
getPT
();
if
(
!
ptStr
.
isEmpty
())
if
(
!
ptStr
.
isEmpty
())
info
->
set_pt
(
ptStr
.
toStdString
());
info
->
set_pt
(
ptStr
.
toStdString
());
if
(
!
annotation
.
isEmpty
())
if
(
!
annotation
.
isEmpty
())
...
@@ -156,4 +159,4 @@ void Server_Card::getInfo(ServerInfo_Card *info)
...
@@ -156,4 +159,4 @@ void Server_Card::getInfo(ServerInfo_Card *info)
info
->
set_attach_zone
(
parentCard
->
getZone
()
->
getName
().
toStdString
());
info
->
set_attach_zone
(
parentCard
->
getZone
()
->
getName
().
toStdString
());
info
->
set_attach_card_id
(
parentCard
->
getId
());
info
->
set_attach_card_id
(
parentCard
->
getId
());
}
}
}
}
\ No newline at end of file
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