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
277aba79
Commit
277aba79
authored
Oct 02, 2014
by
Gavin Bisesi
Browse files
Merge pull request #336 from poixen/master
Tokens use PT levels from cards.xml if available
parents
48817ed2
e3a94ecc
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/player.cpp
View file @
277aba79
...
...
@@ -1092,8 +1092,12 @@ void Player::eventCreateToken(const Event_CreateToken &event)
return
;
CardItem
*
card
=
new
CardItem
(
this
,
QString
::
fromStdString
(
event
.
card_name
()),
event
.
card_id
());
// use db PT if not provided in event
if
(
!
QString
::
fromStdString
(
event
.
pt
()).
isEmpty
())
card
->
setPT
(
QString
::
fromStdString
(
event
.
pt
()));
else
card
->
setPT
(
db
->
getCard
(
QString
::
fromStdString
(
event
.
card_name
()))
->
getPowTough
());
card
->
setColor
(
QString
::
fromStdString
(
event
.
color
()));
card
->
setPT
(
QString
::
fromStdString
(
event
.
pt
()));
card
->
setAnnotation
(
QString
::
fromStdString
(
event
.
annotation
()));
card
->
setDestroyOnZoneChange
(
event
.
destroy_on_zone_change
());
...
...
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