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

additional null checks & parsing (#2506)

Browse source 
* additional null checks & parsing
This commit is contained in:
Zach H 2017-03-18 18:48:23 -04:00 committed by GitHub
parent 127a91147c
commit fb194db766
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/player.cpp
View file

@ -1063,6 +1063,9 @@ void Player::actCreateToken()
void Player::actCreateAnotherToken() void Player::actCreateAnotherToken()
{ {
if (lastTokenName.isEmpty())
return;
Command_CreateToken cmd; Command_CreateToken cmd;
cmd.set_zone("table"); cmd.set_zone("table");
cmd.set_card_name(lastTokenName.toStdString()); cmd.set_card_name(lastTokenName.toStdString());
@ -1212,7 +1215,13 @@ QString Player::dbNameFromTokenDisplayName(const QString &tokenName) {
if (index != -1) if (index != -1)
{ {
return tokenNamePattern.capturedTexts()[1]; return tokenNamePattern.capturedTexts()[1];
} else { }
else if (tokenName.indexOf(tr("Token: ")) != -1)
{
return tokenName.mid(tr("Token: ").length());
}
else
{
return tokenName; return tokenName;
} }
} }
@ -2535,6 +2544,9 @@ void Player::processSceneSizeChange(int newPlayerWidth)
void Player::setLastToken(CardInfo *cardInfo) void Player::setLastToken(CardInfo *cardInfo)
{ {
if (cardInfo == nullptr)
return;
lastTokenName = cardInfo->getName(); lastTokenName = cardInfo->getName();
lastTokenColor = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().first().toLower(); lastTokenColor = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().first().toLower();
lastTokenPT = cardInfo->getPowTough(); lastTokenPT = cardInfo->getPowTough();