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
e3a94ecc
Commit
e3a94ecc
authored
Oct 01, 2014
by
Matt Lowe
Browse files
Token PT is now set to DB values if not defined in event.
parent
a80ccd88
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/player.cpp
View file @
e3a94ecc
...
@@ -1092,13 +1092,12 @@ void Player::eventCreateToken(const Event_CreateToken &event)
...
@@ -1092,13 +1092,12 @@ void Player::eventCreateToken(const Event_CreateToken &event)
return
;
return
;
CardItem
*
card
=
new
CardItem
(
this
,
QString
::
fromStdString
(
event
.
card_name
()),
event
.
card_id
());
CardItem
*
card
=
new
CardItem
(
this
,
QString
::
fromStdString
(
event
.
card_name
()),
event
.
card_id
());
card
->
setColor
(
QString
::
fromStdString
(
event
.
color
()));
// use db PT if not provided in event
if
(
!
QString
::
fromStdString
(
event
.
pt
()).
isEmpty
())
// use db p/t if not provided in event
if
(
QString
::
fromStdString
(
event
.
pt
()).
isEmpty
())
card
->
setPT
(
db
->
getCard
(
QString
::
fromStdString
(
event
.
card_name
()))
->
getPowTough
());
else
card
->
setPT
(
QString
::
fromStdString
(
event
.
pt
()));
card
->
setPT
(
QString
::
fromStdString
(
event
.
pt
()));
else
card
->
setPT
(
db
->
getCard
(
QString
::
fromStdString
(
event
.
card_name
()))
->
getPowTough
());
card
->
setColor
(
QString
::
fromStdString
(
event
.
color
()));
card
->
setAnnotation
(
QString
::
fromStdString
(
event
.
annotation
()));
card
->
setAnnotation
(
QString
::
fromStdString
(
event
.
annotation
()));
card
->
setDestroyOnZoneChange
(
event
.
destroy_on_zone_change
());
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