mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-23 10:52:16 -07:00
rename variables
This commit is contained in:
parent
c9d5d5609c
commit
db360857cb
2 changed files with 7 additions and 7 deletions
|
|
@ -1341,19 +1341,19 @@ void Player::actMoveTopCardsUntil()
|
||||||
{
|
{
|
||||||
stopMoveTopCardsUntil();
|
stopMoveTopCardsUntil();
|
||||||
|
|
||||||
DlgMoveTopCardsUntil dlg(game, previousMovingCardsUntilExpr, previousMovingCardsUntilNumberOfHits);
|
DlgMoveTopCardsUntil dlg(game, movingCardsUntilExpr, movingCardsUntilNumberOfHits);
|
||||||
if (!dlg.exec()) {
|
if (!dlg.exec()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
previousMovingCardsUntilExpr = dlg.getExpr();
|
movingCardsUntilExpr = dlg.getExpr();
|
||||||
previousMovingCardsUntilNumberOfHits = dlg.getNumberOfHits();
|
movingCardsUntilNumberOfHits = dlg.getNumberOfHits();
|
||||||
|
|
||||||
if (zones.value("deck")->getCards().empty()) {
|
if (zones.value("deck")->getCards().empty()) {
|
||||||
stopMoveTopCardsUntil();
|
stopMoveTopCardsUntil();
|
||||||
} else {
|
} else {
|
||||||
movingCardsUntilFilter = FilterString(previousMovingCardsUntilExpr);
|
movingCardsUntilFilter = FilterString(movingCardsUntilExpr);
|
||||||
movingCardsUntilCounter = previousMovingCardsUntilNumberOfHits;
|
movingCardsUntilCounter = movingCardsUntilNumberOfHits;
|
||||||
movingCardsUntil = true;
|
movingCardsUntil = true;
|
||||||
actMoveTopCardToPlay();
|
actMoveTopCardToPlay();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -268,8 +268,8 @@ private:
|
||||||
|
|
||||||
bool movingCardsUntil;
|
bool movingCardsUntil;
|
||||||
QTimer *moveTopCardTimer;
|
QTimer *moveTopCardTimer;
|
||||||
QString previousMovingCardsUntilExpr = {};
|
QString movingCardsUntilExpr = {};
|
||||||
int previousMovingCardsUntilNumberOfHits = 1;
|
int movingCardsUntilNumberOfHits = 1;
|
||||||
FilterString movingCardsUntilFilter;
|
FilterString movingCardsUntilFilter;
|
||||||
int movingCardsUntilCounter = 0;
|
int movingCardsUntilCounter = 0;
|
||||||
void stopMoveTopCardsUntil();
|
void stopMoveTopCardsUntil();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue