aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove cards being looked at from the count on drawing (#4671)

Browse source
This commit is contained in:
ebbit1q 2022-10-17 22:35:54 +02:00 committed by GitHub
parent 90f187e885
commit a7232513a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/server_cardzone.h
View file

@ -68,7 +68,7 @@ public:
} }
void setCardsBeingLookedAt(int _cardsBeingLookedAt) void setCardsBeingLookedAt(int _cardsBeingLookedAt)
{ {
cardsBeingLookedAt = _cardsBeingLookedAt; cardsBeingLookedAt = qMax(0, _cardsBeingLookedAt);
} }
bool isCardAtPosLookedAt(int pos) const; bool isCardAtPosLookedAt(int pos) const;
bool hasCoords() const bool hasCoords() const

4
common/server_player.cpp
View file

@ -337,7 +337,11 @@ Response::ResponseCode Server_Player::drawCards(GameEventStorage &ges, int numbe
ges.enqueueGameEvent(eventPrivate, playerId, GameEventStorageItem::SendToPrivate, playerId); ges.enqueueGameEvent(eventPrivate, playerId, GameEventStorageItem::SendToPrivate, playerId);
ges.enqueueGameEvent(eventOthers, playerId, GameEventStorageItem::SendToOthers); ges.enqueueGameEvent(eventOthers, playerId, GameEventStorageItem::SendToOthers);
if (number > 0) {
revealTopCardIfNeeded(deckZone, ges); revealTopCardIfNeeded(deckZone, ges);
int currentKnownCards = deckZone->getCardsBeingLookedAt();
deckZone->setCardsBeingLookedAt(currentKnownCards - number);
}
return Response::RespOk; return Response::RespOk;
} }