mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-03 20:13:56 -07:00
moved carddraw from game to player; qt 4.4 compilation fix; minor behaviour change
This commit is contained in:
parent
557aed2ed7
commit
0d84de2384
8 changed files with 315 additions and 260 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef GAME_H
|
||||
#define GAME_H
|
||||
|
||||
#include <QHash>
|
||||
#include "playerlist.h"
|
||||
|
||||
class ServerPlayer;
|
||||
|
|
@ -23,7 +24,7 @@ private:
|
|||
QMenu *actionsMenu, *sayMenu, *cardMenu, *moveMenu;
|
||||
QAction *aTap, *aUntap, *aDoesntUntap, *aFlip, *aAddCounter, *aRemoveCounter, *aSetCounters,
|
||||
*aMoveToTopLibrary, *aMoveToBottomLibrary, *aMoveToGraveyard, *aMoveToExile,
|
||||
*aNextPhase, *aNextTurn, *aUntapAll, *aDecLife, *aIncLife, *aSetLife, *aShuffle, *aDraw, *aDrawCards, *aRollDice, *aCreateToken;
|
||||
*aNextPhase, *aNextTurn, *aUntapAll, *aDecLife, *aIncLife, *aSetLife, *aRollDice, *aCreateToken;
|
||||
DlgStartGame *dlgStartGame;
|
||||
|
||||
CardDatabase *db;
|
||||
|
|
@ -44,9 +45,6 @@ private slots:
|
|||
void actIncLife();
|
||||
void actDecLife();
|
||||
void actSetLife();
|
||||
void actShuffle();
|
||||
void actDrawCard();
|
||||
void actDrawCards();
|
||||
void actRollDice();
|
||||
void actCreateToken();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue