jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 09:33:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

arrows can target players now

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-06-27 17:56:09 +02:00
parent cbf201ed9b
commit 61b82bd6f9
25 changed files with 802 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/player.h
View file

@ -17,6 +17,7 @@ class ArrowItem;
class CardZone;
class TableZone;
class HandZone;
class PlayerTarget;
class ServerInfo_Player;
class ServerInfo_Arrow;
class ServerInfo_Counter;
@ -49,7 +50,7 @@ signals:
void logSay(Player *player, QString message);
void logShuffle(Player *player);
void logRollDie(Player *player, int sides, int roll);
void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard);
void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool _playerTarget);
void logCreateToken(Player *player, QString cardName, QString pt);
void logDrawCards(Player *player, int number);
void logMoveCard(Player *player, QString cardName, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
@ -90,7 +91,6 @@ public slots:
void actCardCounterTrigger();
private slots:
void updateBgPixmap();
void updateBoundingRect();
void rearrangeZones();
@ -104,9 +104,6 @@ private:
*aUntapAll, *aRollDie, *aCreateToken, *aCreateAnotherToken,
*aCardMenu;
typedef void (Player::*CardMenuHandler)(CardItem *card);
QHash<QAction *, CardMenuHandler> cardMenuHandlers;
int defaultNumberTopCards;
QString lastTokenName, lastTokenColor, lastTokenPT, lastTokenAnnotation;
bool lastTokenDestroy;
@ -119,6 +116,7 @@ private:
QMap<QString, CardZone *> zones;
TableZone *table;
HandZone *hand;
PlayerTarget *playerTarget;
void setCardAttrHelper(CardItem *card, const QString &aname, const QString &avalue, bool allCards);
@ -164,9 +162,10 @@ public:
void clearCounters();
ArrowItem *addArrow(ServerInfo_Arrow *arrow);
ArrowItem *addArrow(int arrowId, CardItem *startCard, CardItem *targetCard, const QColor &color);
ArrowItem *addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color);
void delArrow(int arrowId);
void clearArrows();
PlayerTarget *getPlayerTarget() const { return playerTarget; }
Client *client;
Player(const QString &_name, int _id, bool _local, Client *_client, TabGame *_parent);