mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-28 17:43:54 -07:00
Fix compile errors.
Took 54 minutes Took 14 seconds
This commit is contained in:
parent
7d6d625ed4
commit
96b331746b
2 changed files with 3 additions and 4 deletions
|
|
@ -284,7 +284,7 @@ void TabGame::finishTutorialInitialization()
|
||||||
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
|
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
|
||||||
->getPlayerEventHandler();
|
->getPlayerEventHandler();
|
||||||
diceRollStep.signalName = SIGNAL(logRollDie(Player *, int, const QList<uint> &));
|
diceRollStep.signalName = SIGNAL(logRollDie(Player *, int, const QList<uint> &));
|
||||||
diceRollStep.validator = [this] { return true; };
|
diceRollStep.validator = [] { return true; };
|
||||||
diceRollStep.validationHint = tr("Roll a dice using any of these methods.");
|
diceRollStep.validationHint = tr("Roll a dice using any of these methods.");
|
||||||
|
|
||||||
gamePlaySequence.addStep(diceRollStep);
|
gamePlaySequence.addStep(diceRollStep);
|
||||||
|
|
|
||||||
|
|
@ -170,17 +170,16 @@ private slots:
|
||||||
void processPlayerLeave(PlayerLogic *leavingPlayer);
|
void processPlayerLeave(PlayerLogic *leavingPlayer);
|
||||||
void actResetLayout();
|
void actResetLayout();
|
||||||
|
|
||||||
void hideEvent(QHideEvent *event) override;
|
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void closeEvent(QCloseEvent *event) override;
|
void closeEvent(QCloseEvent *event) override;
|
||||||
|
void showEvent(QShowEvent *event) override;
|
||||||
|
void hideEvent(QHideEvent *event) override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TabGame(TabSupervisor *_tabSupervisor,
|
TabGame(TabSupervisor *_tabSupervisor,
|
||||||
QList<AbstractClient *> &_clients,
|
QList<AbstractClient *> &_clients,
|
||||||
const Event_GameJoined &event,
|
const Event_GameJoined &event,
|
||||||
const QMap<int, QString> &_roomGameTypes);
|
const QMap<int, QString> &_roomGameTypes);
|
||||||
void showEvent(QShowEvent *event);
|
|
||||||
void finishTutorialInitialization();
|
void finishTutorialInitialization();
|
||||||
void connectToGameState();
|
void connectToGameState();
|
||||||
void connectToPlayerManager();
|
void connectToPlayerManager();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue