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

Fix properly.

Browse source 
Took 15 minutes
This commit is contained in:
Lukas Brübach 2026-05-22 09:52:57 +02:00
parent e182cec00a
commit c049b9f4df
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,7 @@ void GameScene::addPlayer(PlayerLogic *player)
rearrange(); rearrange();
}); });
connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::onArrowDeleted);
connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::onArrowCreateRequested); connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::onArrowCreateRequested);
connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::onArrowDeleteRequested); connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::onArrowDeleteRequested);
connect(player, &PlayerLogic::arrowsCleared, this, connect(player, &PlayerLogic::arrowsCleared, this,
@ -404,11 +405,17 @@ void GameScene::onArrowCreateRequested(const ArrowData &data)
connect(arrow, &QObject::destroyed, this, [this, id = data.id]() { arrowRegistry.remove(id); }); connect(arrow, &QObject::destroyed, this, [this, id = data.id]() { arrowRegistry.remove(id); });
} }
void GameScene::onArrowDeleted(int arrowId)
{
if (arrowRegistry.contains(arrowId)) {
arrowRegistry.take(arrowId)->delArrow();
}
}
void GameScene::onArrowDeleteRequested(int arrowId) void GameScene::onArrowDeleteRequested(int arrowId)
{ {
if (arrowRegistry.contains(arrowId)) { if (arrowRegistry.contains(arrowId)) {
emit requestArrowDeletion(arrowId); emit requestArrowDeletion(arrowId);
arrowRegistry.take(arrowId)->delArrow();
} }
} }
@ -426,7 +433,6 @@ void GameScene::onCardZoneChanged(CardItem *card, bool sameZone)
} }
for (auto *arrow : toDelete) { for (auto *arrow : toDelete) {
emit requestArrowDeletion(arrow->getId()); emit requestArrowDeletion(arrow->getId());
arrowRegistry.take(arrow->getId())->delArrow();
} }
} }
@ -435,7 +441,6 @@ void GameScene::clearArrowsForPlayer(int playerId)
for (auto *arrow : arrowRegistry.values()) { for (auto *arrow : arrowRegistry.values()) {
if (arrow->getPlayer()->getPlayerInfo()->getId() == playerId) { if (arrow->getPlayer()->getPlayerInfo()->getId() == playerId) {
emit requestArrowDeletion(arrow->getId()); emit requestArrowDeletion(arrow->getId());
arrowRegistry.take(arrow->getId())->delArrow();
} }
} }
} }

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

@ -202,6 +202,7 @@ public slots:
QTransform getViewportTransform() const; QTransform getViewportTransform() const;
void onArrowCreateRequested(const ArrowData &data); void onArrowCreateRequested(const ArrowData &data);
void onArrowDeleted(int arrowId);
void onArrowDeleteRequested(int arrowId); void onArrowDeleteRequested(int arrowId);
void onCardZoneChanged(CardItem *card, bool sameZone); void onCardZoneChanged(CardItem *card, bool sameZone);
void clearArrowsForPlayer(int playerId); void clearArrowsForPlayer(int playerId);

2
cockatrice/src/game/player/player_event_handler.cpp
View file

@ -128,7 +128,7 @@ void PlayerEventHandler::eventCreateArrow(const Event_CreateArrow &event)
void PlayerEventHandler::eventDeleteArrow(const Event_DeleteArrow &event) void PlayerEventHandler::eventDeleteArrow(const Event_DeleteArrow &event)
{ {
emit player->arrowDeleteRequested(event.arrow_id()); emit player->arrowDeleted(event.arrow_id());
} }
void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event) void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event)

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

@ -80,6 +80,7 @@ signals:
void resetTopCardMenuActions(); void resetTopCardMenuActions();
void arrowCreateRequested(ArrowData data); void arrowCreateRequested(ArrowData data);
void arrowDeleteRequested(int arrowId); void arrowDeleteRequested(int arrowId);
void arrowDeleted(int arrowId);
void arrowsCleared(); // fires on clear() and processPlayerInfo void arrowsCleared(); // fires on clear() and processPlayerInfo
public slots: public slots: