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
1ca561de
Commit
1ca561de
authored
Apr 27, 2015
by
Zach
Browse files
Merge pull request #1033 from poixen/token_pt_fix
Only use local db if no pt is provided
parents
c5ac3701
6fd5c4dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/player.cpp
View file @
1ca561de
...
@@ -1003,7 +1003,8 @@ void Player::actCreateToken()
...
@@ -1003,7 +1003,8 @@ void Player::actCreateToken()
lastTokenPT
=
dlg
.
getPT
();
lastTokenPT
=
dlg
.
getPT
();
if
(
CardInfo
*
correctedCard
=
db
->
getCardBySimpleName
(
lastTokenName
,
false
))
{
if
(
CardInfo
*
correctedCard
=
db
->
getCardBySimpleName
(
lastTokenName
,
false
))
{
lastTokenName
=
correctedCard
->
getName
();
lastTokenName
=
correctedCard
->
getName
();
lastTokenPT
=
correctedCard
->
getPowTough
();
if
(
lastTokenPT
.
isEmpty
())
lastTokenPT
=
correctedCard
->
getPowTough
();
}
}
lastTokenColor
=
dlg
.
getColor
();
lastTokenColor
=
dlg
.
getColor
();
lastTokenAnnotation
=
dlg
.
getAnnotation
();
lastTokenAnnotation
=
dlg
.
getAnnotation
();
...
...
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