mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-21 18:02:14 -07:00
Refactor UUID to be providerId and change QString comparisons with empty string to isEmpty().
This commit is contained in:
parent
472186b4a0
commit
a958a126a5
24 changed files with 125 additions and 112 deletions
|
|
@ -27,8 +27,13 @@
|
|||
|
||||
#include <QVariant>
|
||||
|
||||
Server_Card::Server_Card(QString _name, QString _uuid, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
|
||||
: zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), name(_name), uuid(_uuid), tapped(false),
|
||||
Server_Card::Server_Card(QString _name,
|
||||
QString _provider_id,
|
||||
int _id,
|
||||
int _coord_x,
|
||||
int _coord_y,
|
||||
Server_CardZone *_zone)
|
||||
: zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), name(_name), provider_id(_provider_id), tapped(false),
|
||||
attacking(false), facedown(false), color(), ptString(), annotation(), destroyOnZoneChange(false),
|
||||
doesntUntap(false), parentCard(0), stashedCard(nullptr)
|
||||
{
|
||||
|
|
@ -130,7 +135,7 @@ void Server_Card::getInfo(ServerInfo_Card *info)
|
|||
QString displayedName = facedown ? QString() : name;
|
||||
|
||||
info->set_id(id);
|
||||
info->set_uuid(uuid.toStdString());
|
||||
info->set_provider_id(provider_id.toStdString());
|
||||
info->set_name(displayedName.toStdString());
|
||||
info->set_x(coord_x);
|
||||
info->set_y(coord_y);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue