jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-05 21:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reintroduce clearCardsToDelete check.

Browse source 
Took 3 minutes
This commit is contained in:
Lukas Brübach 2026-06-07 16:12:05 +02:00
parent 4e2af0697c
commit 9be9b0c05a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/game/player/player_dialogs.cpp
View file

@ -253,7 +253,7 @@ void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT)
oldPT, &ok); oldPT, &ok);
emit requestDialogSemaphore(false); emit requestDialogSemaphore(false);
if (!ok) { // player->clearCardsToDelete() || if (!ok || player->getLogic()->clearCardsToDelete()) {
return; return;
} }
@ -270,7 +270,7 @@ void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation)
dialog->setTextValue(oldAnnotation); dialog->setTextValue(oldAnnotation);
bool ok = dialog->exec(); bool ok = dialog->exec();
emit requestDialogSemaphore(false); emit requestDialogSemaphore(false);
if (!ok) { // player->clearCardsToDelete() || if (!ok || player->getLogic()->clearCardsToDelete()) {
return; return;
} }
QString annotation = dialog->textValue().left(MAX_NAME_LENGTH); QString annotation = dialog->textValue().left(MAX_NAME_LENGTH);
@ -288,7 +288,7 @@ void PlayerDialogs::onSetCardCounterDialogRequested(int counterId, const QString
int ok = dialog.exec(); int ok = dialog.exec();
emit requestDialogSemaphore(false); emit requestDialogSemaphore(false);
if (!ok) { // player->clearCardsToDelete() || if (!ok || player->getLogic()->clearCardsToDelete()) {
return; return;
} }
playerActions->actSetCardCounter(player->getGameScene()->selectedCards(), counterId, dialog.textValue()); playerActions->actSetCardCounter(player->getGameScene()->selectedCards(), counterId, dialog.textValue());