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

correctly send the ReadyStart command on unload

Browse source
This commit is contained in:
RickyRister 2025-01-15 23:00:13 -08:00
parent 016331d1e2
commit 4a07b9b8b5
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cockatrice/src/game/deckview/deck_view_container.cpp
View file

@ -136,7 +136,7 @@ void DeckViewContainer::switchToDeckSelectView()
readyStartButton->setState(false); readyStartButton->setState(false);
sideboardLockButton->setState(false); sideboardLockButton->setState(false);
setReadyStart(false); sendReadyStartCommand(false);
} }
void DeckViewContainer::switchToDeckLoadedView() void DeckViewContainer::switchToDeckLoadedView()
@ -255,9 +255,7 @@ void DeckViewContainer::deckSelectFinished(const Response &r)
void DeckViewContainer::readyStart() void DeckViewContainer::readyStart()
{ {
Command_ReadyStart cmd; sendReadyStartCommand(!readyStartButton->getState());
cmd.set_ready(!readyStartButton->getState());
parentGame->sendGameCommand(cmd, playerId);
} }
void DeckViewContainer::forceStart() void DeckViewContainer::forceStart()
@ -285,6 +283,22 @@ void DeckViewContainer::sideboardPlanChanged()
parentGame->sendGameCommand(cmd, playerId); parentGame->sendGameCommand(cmd, playerId);
} }
/**
* Sends the basic ReadyStart command.
*/
void DeckViewContainer::sendReadyStartCommand(bool ready)
{
Command_ReadyStart cmd;
cmd.set_ready(ready);
parentGame->sendGameCommand(cmd, playerId);
}
/**
* Updates the buttons to make the client-side ready state match the given state.
*
* Notably, this method only updates the client and *does not* send a ReadyStart command to the server.
* This method is intended to be called upon receiving the response from a ReadyStart command.
*/
void DeckViewContainer::setReadyStart(bool ready) void DeckViewContainer::setReadyStart(bool ready)
{ {
readyStartButton->setState(ready); readyStartButton->setState(ready);
@ -293,15 +307,11 @@ void DeckViewContainer::setReadyStart(bool ready)
} }
/** /**
* Sets the ready start to true, then sends the ready command so the server responds to the update * Sends a ReadyStart command with ready=true to the server
*/ */
void DeckViewContainer::readyAndUpdate() void DeckViewContainer::readyAndUpdate()
{ {
setReadyStart(true); sendReadyStartCommand(true);
Command_ReadyStart cmd;
cmd.set_ready(true);
parentGame->sendGameCommand(cmd, playerId);
} }
void DeckViewContainer::setSideboardLocked(bool locked) void DeckViewContainer::setSideboardLocked(bool locked)

2
cockatrice/src/game/deckview/deck_view_container.h
View file

@ -50,6 +50,8 @@ private:
VisualDeckStorageWidget *visualDeckStorageWidget; VisualDeckStorageWidget *visualDeckStorageWidget;
TabGame *parentGame; TabGame *parentGame;
int playerId; int playerId;
void sendReadyStartCommand(bool ready);
private slots: private slots:
void switchToDeckSelectView(); void switchToDeckSelectView();
void switchToDeckLoadedView(); void switchToDeckLoadedView();