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

Address comments.

Browse source 
Took 17 minutes

Took 9 seconds


Took 1 minute
This commit is contained in:
Lukas Brübach 2026-05-21 06:25:41 +02:00
parent dd1936b94e
commit 997daa9c45
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -409,7 +409,7 @@ void GameScene::onArrowCreateRequested(ArrowData data)
void GameScene::onArrowDeleteRequested(int arrowId) void GameScene::onArrowDeleteRequested(int arrowId)
{ {
if (auto *arrow = arrowRegistry.value(arrowId)) { if (auto *arrow = arrowRegistry.value(arrowId)) {
arrow->delArrow(); emit requestArrowDeletion(arrowId);
} }
} }
@ -426,7 +426,7 @@ void GameScene::onCardZoneChanged(CardItem *card, bool sameZone)
} }
} }
for (auto *arrow : toDelete) { for (auto *arrow : toDelete) {
arrow->delArrow(); emit requestArrowDeletion(arrow->getId());
} }
} }
@ -434,7 +434,7 @@ 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) {
arrow->delArrow(); emit requestArrowDeletion(arrow->getId());
} }
} }
} }

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

@ -216,6 +216,7 @@ signals:
void sigStartRubberBand(const QPointF &selectionOrigin); void sigStartRubberBand(const QPointF &selectionOrigin);
void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount); void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount);
void sigStopRubberBand(); void sigStopRubberBand();
void requestArrowDeletion(int arrowId);
}; };
#endif #endif

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

@ -119,7 +119,9 @@ void PlayerEventHandler::eventCreateArrow(const Event_CreateArrow &event)
emit player->arrowCreateRequested(data); emit player->arrowCreateRequested(data);
if (startPlayer && targetPlayer) { const bool validForLogging = !startCardName.isEmpty() && (data.isPlayerTargeted() || !targetCardName.isEmpty());
if (startPlayer && targetPlayer && validForLogging) {
emit logCreateArrow(player, startPlayer, startCardName, targetPlayer, targetCardName, data.isPlayerTargeted()); emit logCreateArrow(player, startPlayer, startCardName, targetPlayer, targetCardName, data.isPlayerTargeted());
} }
} }

4
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -962,8 +962,6 @@ void TabGame::createMenuItems()
connect(aReverseTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleReverseTurn); connect(aReverseTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleReverseTurn);
aRemoveLocalArrows = new QAction(this); aRemoveLocalArrows = new QAction(this);
connect(aRemoveLocalArrows, &QAction::triggered, this, &TabGame::actRemoveLocalArrows); connect(aRemoveLocalArrows, &QAction::triggered, this, &TabGame::actRemoveLocalArrows);
connect(this, &TabGame::arrowDeletionRequested, game->getGameEventHandler(),
&GameEventHandler::handleArrowDeletion);
aRotateViewCW = new QAction(this); aRotateViewCW = new QAction(this);
connect(aRotateViewCW, &QAction::triggered, this, &TabGame::actRotateViewCW); connect(aRotateViewCW, &QAction::triggered, this, &TabGame::actRotateViewCW);
aRotateViewCCW = new QAction(this); aRotateViewCCW = new QAction(this);
@ -1147,6 +1145,8 @@ void TabGame::createPlayAreaWidget(bool bReplay)
scene = new GameScene(phasesToolbar, this); scene = new GameScene(phasesToolbar, this);
connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange); connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange);
connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange); connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange);
connect(scene, &GameScene::requestArrowDeletion, game->getGameEventHandler(),
&GameEventHandler::handleArrowDeletion);
gameView = new GameView(scene); gameView = new GameView(scene);
auto gamePlayAreaVBox = new QVBoxLayout; auto gamePlayAreaVBox = new QVBoxLayout;

1
cockatrice/src/interface/widgets/tabs/tab_game.h
View file

@ -137,7 +137,6 @@ signals:
void gameLeft(); void gameLeft();
void chatMessageSent(QString chatMessage); void chatMessageSent(QString chatMessage);
void turnAdvanced(); void turnAdvanced();
void arrowDeletionRequested(int arrowId);
private slots: private slots:
void adminLockChanged(bool lock); void adminLockChanged(bool lock);