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

[Game][Arrows] ArrowItem should not send deletion game commands by itself (#6932)

Browse source 
Took 13 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-05-23 02:20:41 +02:00 • committed by GitHub
parent d2164c3f08
commit 98c00c55ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/game/board/arrow_item.cpp
View file

@ -38,11 +38,11 @@ ArrowItem::ArrowItem(PlayerLogic *_player,
if (startItem) { if (startItem) {
connect(startItem, &ArrowTarget::scenePositionChanged, this, doUpdate); connect(startItem, &ArrowTarget::scenePositionChanged, this, doUpdate);
connect(startItem, &QObject::destroyed, this, &ArrowItem::delArrow); connect(startItem, &QObject::destroyed, this, &ArrowItem::onTargetDestroyed);
} }
if (targetItem) { if (targetItem) {
connect(targetItem, &ArrowTarget::scenePositionChanged, this, doUpdate); connect(targetItem, &ArrowTarget::scenePositionChanged, this, doUpdate);
connect(targetItem, &QObject::destroyed, this, &ArrowItem::delArrow); connect(targetItem, &QObject::destroyed, this, &ArrowItem::onTargetDestroyed);
} }
if (startItem && targetItem) { if (startItem && targetItem) {
@ -50,6 +50,11 @@ ArrowItem::ArrowItem(PlayerLogic *_player,
} }
} }
void ArrowItem::onTargetDestroyed()
{
emit requestDeletion(id);
}
void ArrowItem::delArrow() void ArrowItem::delArrow()
{ {
if (targetItem) { if (targetItem) {
@ -151,9 +156,7 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
event->accept(); event->accept();
if (event->button() == Qt::RightButton) { if (event->button() == Qt::RightButton) {
Command_DeleteArrow cmd; emit requestDeletion(id);
cmd.set_arrow_id(id);
player->getPlayerActions()->sendGameCommand(cmd);
} }
} }

4
cockatrice/src/game/board/arrow_item.h
View file

@ -21,6 +21,9 @@ class ArrowItem : public QObject, public QGraphicsItem
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QGraphicsItem) Q_INTERFACES(QGraphicsItem)
signals:
void requestDeletion(int id);
private: private:
QPainterPath path; QPainterPath path;
@ -37,6 +40,7 @@ protected:
public: public:
ArrowItem(PlayerLogic *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color); ArrowItem(PlayerLogic *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color);
void onTargetDestroyed();
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
[[nodiscard]] QRectF boundingRect() const override [[nodiscard]] QRectF boundingRect() const override

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

@ -402,7 +402,7 @@ void GameScene::onArrowCreateRequested(const ArrowData &data)
auto *arrow = new ArrowItem(startView->getPlayer(), data.id, startCard, targetItem, data.color); auto *arrow = new ArrowItem(startView->getPlayer(), data.id, startCard, targetItem, data.color);
addItem(arrow); addItem(arrow);
arrowRegistry.insert(data.id, arrow); arrowRegistry.insert(data.id, arrow);
connect(arrow, &QObject::destroyed, this, [this, id = data.id]() { arrowRegistry.remove(id); }); connect(arrow, &ArrowItem::requestDeletion, this, &GameScene::onArrowDeleteRequested);
} }
void GameScene::onArrowDeleted(int arrowId) void GameScene::onArrowDeleted(int arrowId)