aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1033 from poixen/token_pt_fix

Browse source 
Only use local db if no pt is provided
This commit is contained in:
Zach 2015-04-27 15:58:41 -04:00
commit 1ca561dec5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/player.cpp
View file

@ -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();