jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved token loading

Browse source
This commit is contained in:
Fabio Bas 2017-04-29 20:01:57 +02:00 • committed by Zach H
parent 339945e089
commit 36f6907fa3
10 changed files with 79 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/server_player.cpp
View file

@ -170,9 +170,9 @@ void Server_Player::setupZones()
for (int i = 0; i < listRoot->size(); ++i) {
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
Server_CardZone *z;
if (currentZone->getName() == "main")
if (currentZone->getName() == DECK_ZONE_MAIN)
z = deckZone;
else if (currentZone->getName() == "side")
else if (currentZone->getName() == DECK_ZONE_SIDE)
z = sbZone;
else
continue;
@ -193,15 +193,15 @@ void Server_Player::setupZones()
const QString targetZone = QString::fromStdString(m.target_zone());
Server_CardZone *start, *target;
if (startZone == "main")
if (startZone == DECK_ZONE_MAIN)
start = deckZone;
else if (startZone == "side")
else if (startZone == DECK_ZONE_SIDE)
start = sbZone;
else
continue;
if (targetZone == "main")
if (targetZone == DECK_ZONE_MAIN)
target = deckZone;
else if (targetZone == "side")
else if (targetZone == DECK_ZONE_SIDE)
target = sbZone;
else
continue;