jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-08 09:03:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clear arrows locally in special circumstances i.e. teardown.

Browse source 
Took 28 minutes
This commit is contained in:
Lukas Brübach 2026-06-07 15:40:12 +02:00
parent 6c57258c66
commit 9953f88b26
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/game/game_scene.cpp
View file

@ -96,8 +96,8 @@ void GameScene::addPlayer(PlayerLogic *player)
connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::deleteArrow); connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::deleteArrow);
connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::addArrow); connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::addArrow);
connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::requestArrowDeletion); connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::requestArrowDeletion);
connect(player, &PlayerLogic::arrowsCleared, this, connect(player, &PlayerLogic::arrowsClearedLocally, this,
[this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayer(id); }); [this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayerLocally(id); });
connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged); connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged);
@ -441,6 +441,13 @@ void GameScene::clearArrowsForPlayer(int playerId)
} }
} }
void GameScene::clearArrowsForPlayerLocally(int playerId)
{
for (int arrowId : arrowRegistry.idsForPlayer(playerId)) {
arrowRegistry.take(playerId, arrowId)->delArrow();
}
}
// ---------- Hover Handling ---------- // ---------- Hover Handling ----------
void GameScene::updateHover(const QPointF &scenePos) void GameScene::updateHover(const QPointF &scenePos)

1
cockatrice/src/game/game_scene.h
View file

@ -206,6 +206,7 @@ public slots:
void addArrow(QSharedPointer<ArrowData> data); void addArrow(QSharedPointer<ArrowData> data);
void deleteArrow(int playerId, int arrowId); void deleteArrow(int playerId, int arrowId);
void clearArrowsForPlayer(int playerId); void clearArrowsForPlayer(int playerId);
void clearArrowsForPlayerLocally(int playerId);
/// Queues up arrow deletion but doesn't directly modify the scene /// Queues up arrow deletion but doesn't directly modify the scene
void requestArrowDeletion(int playerId, int arrowId); void requestArrowDeletion(int playerId, int arrowId);

4
cockatrice/src/game/player/player_logic.cpp
View file

@ -74,7 +74,7 @@ PlayerLogic::~PlayerLogic()
void PlayerLogic::clear() void PlayerLogic::clear()
{ {
emit arrowsCleared(); emit arrowsClearedLocally();
QMapIterator<QString, CardZoneLogic *> i(zones); QMapIterator<QString, CardZoneLogic *> i(zones);
while (i.hasNext()) { while (i.hasNext()) {
@ -115,7 +115,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
/* HandZone */ /* HandZone */
ZoneNames::HAND}; ZoneNames::HAND};
clearCounters(); clearCounters();
emit arrowsCleared(); emit arrowsClearedLocally();
QMutableMapIterator<QString, CardZoneLogic *> zoneIt(zones); QMutableMapIterator<QString, CardZoneLogic *> zoneIt(zones);
while (zoneIt.hasNext()) { while (zoneIt.hasNext()) {

2
cockatrice/src/game/player/player_logic.h
View file

@ -81,7 +81,7 @@ signals:
void arrowCreateRequested(QSharedPointer<ArrowData> data); void arrowCreateRequested(QSharedPointer<ArrowData> data);
void arrowDeleteRequested(int creatorId, int arrowId); void arrowDeleteRequested(int creatorId, int arrowId);
void arrowDeleted(int creatorId, int arrowId); void arrowDeleted(int creatorId, int arrowId);
void arrowsCleared(); // fires on clear() and processPlayerInfo void arrowsClearedLocally(); // fires on clear() and processPlayerInfo
public slots: public slots:
void setActive(bool _active); void setActive(bool _active);