mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-04 04:23:55 -07:00
[Game][Arrows] Don't request deletion on inbound arrow deletion signal again but react to it locally (#6927)
* [Game][Arrows] Deleting arrows has no acknowledgement command so we have to delete locally as well. Took 22 minutes * Fix properly. Took 15 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
09d817770e
commit
8751f0605d
4 changed files with 11 additions and 1 deletions
|
|
@ -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,6 +405,13 @@ 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)) {
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue